From b80c560e87a6335b68832ed979fc0bff2b7c3df2 Mon Sep 17 00:00:00 2001
From: esacpe <esacpe1023>
Date: Wed, 17 Jul 2024 21:00:42 +0800
Subject: [PATCH] 1

---
 .idea/compiler.xml                            |   69 +
 .idea/encodings.xml                           |   22 +
 ...__ch_qos_logback_logback_classic_1_2_3.xml |   13 +
 ...ven__ch_qos_logback_logback_core_1_2_3.xml |   13 +
 .../Maven__cn_hutool_hutool_all_5_7_20.xml    |   13 +
 ..._alibaba_nacos_discovery_2_1_0_RELEASE.xml |   13 +
 ..._alibaba_nacos_discovery_2_0_3_RELEASE.xml |   13 +
 ..._alibaba_nacos_discovery_2_2_4_RELEASE.xml |   13 +
 .../Maven__com_alibaba_druid_1_1_10.xml       |   13 +
 ...ibaba_druid_spring_boot_starter_1_1_10.xml |   13 +
 .../Maven__com_alibaba_fastjson_1_2_47.xml    |   13 +
 .../Maven__com_alibaba_fastjson_1_2_83.xml    |   13 +
 ...ven__com_alibaba_nacos_nacos_api_1_1_1.xml |   13 +
 ...ven__com_alibaba_nacos_nacos_api_1_3_3.xml |   13 +
 ...ven__com_alibaba_nacos_nacos_api_1_4_1.xml |   13 +
 ...__com_alibaba_nacos_nacos_client_1_1_1.xml |   13 +
 ...__com_alibaba_nacos_nacos_client_1_3_3.xml |   13 +
 ...__com_alibaba_nacos_nacos_client_1_4_1.xml |   13 +
 ...__com_alibaba_nacos_nacos_common_1_1_1.xml |   13 +
 ...__com_alibaba_nacos_nacos_common_1_3_3.xml |   13 +
 ...__com_alibaba_nacos_nacos_common_1_4_1.xml |   13 +
 ...a_spring_spring_context_support_1_0_10.xml |   13 +
 ...baba_transmittable_thread_local_2_11_5.xml |   13 +
 .../Maven__com_auth0_java_jwt_3_8_1.xml       |   13 +
 ...c_datasource_spring_boot_starter_3_4_1.xml |   13 +
 ...Maven__com_baomidou_mybatis_plus_3_4_3.xml |   13 +
 ...baomidou_mybatis_plus_annotation_3_4_3.xml |   13 +
 ...omidou_mybatis_plus_boot_starter_3_4_3.xml |   13 +
 ...__com_baomidou_mybatis_plus_core_3_4_3.xml |   13 +
 ..._baomidou_mybatis_plus_extension_3_4_3.xml |   13 +
 .../Maven__com_belerweb_pinyin4j_2_5_0.xml    |   13 +
 ...earch_thirdparty_simple_xml_safe_2_7_1.xml |   13 +
 .../Maven__com_fasterxml_classmate_1_5_1.xml  |   13 +
 ...ackson_core_jackson_annotations_2_11_1.xml |   13 +
 ...erxml_jackson_core_jackson_core_2_11_1.xml |   13 +
 ...l_jackson_core_jackson_databind_2_11_1.xml |   13 +
 ..._datatype_jackson_datatype_jdk8_2_11_1.xml |   13 +
 ...atatype_jackson_datatype_jsr310_2_11_1.xml |   13 +
 ..._jackson_module_parameter_names_2_11_1.xml |   13 +
 ...hub_caspar_chen_swagger_ui_layer_1_1_3.xml |   13 +
 ...__com_github_jsqlparser_jsqlparser_4_2.xml |   13 +
 ...com_github_pagehelper_pagehelper_5_3_0.xml |   13 +
 ...aven__com_github_penggle_kaptcha_2_3_2.xml |   13 +
 ...en__com_github_virtuald_curvesapi_1_04.xml |   13 +
 ...en__com_github_virtuald_curvesapi_1_06.xml |   13 +
 ..._com_google_code_findbugs_jsr305_3_0_2.xml |   13 +
 ...rorprone_error_prone_annotations_2_3_4.xml |   13 +
 ...__com_google_guava_failureaccess_1_0_1.xml |   13 +
 ...Maven__com_google_guava_guava_29_0_jre.xml |   13 +
 ...9_0_empty_to_avoid_conflict_with_guava.xml |   13 +
 ...m_google_j2objc_j2objc_annotations_1_3.xml |   13 +
 ...oglecode_json_simple_json_simple_1_1_1.xml |   13 +
 ...hikvision_ga_artemis_http_client_1_1_3.xml |   13 +
 ...n__com_jayway_jsonpath_json_path_2_4_0.xml |   13 +
 .../Maven__com_jhlabs_filters_2_0_235_1.xml   |   13 +
 ...sty_common_base_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...y_common_config_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...sty_common_core_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...common_log_base_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...ommon_magic_api_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...ty_common_redis_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...ty_common_token_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...tion_log_aspect_starter_1_0_0_SNAPSHOT.xml |   13 +
 ...m_netflix_archaius_archaius_core_0_7_6.xml |   13 +
 ...n__com_netflix_feign_feign_core_8_14_4.xml |   13 +
 ...__com_netflix_feign_feign_slf4j_8_14_4.xml |   13 +
 ...om_netflix_hystrix_hystrix_core_1_5_18.xml |   13 +
 ...lix_commons_netflix_commons_util_0_3_0.xml |   13 +
 ...tflix_commons_netflix_statistics_0_1_1.xml |   13 +
 ...Maven__com_netflix_ribbon_ribbon_2_3_0.xml |   13 +
 ...__com_netflix_ribbon_ribbon_core_2_3_0.xml |   13 +
 ...netflix_ribbon_ribbon_httpclient_2_3_0.xml |   13 +
 ...tflix_ribbon_ribbon_loadbalancer_2_3_0.xml |   13 +
 ..._netflix_ribbon_ribbon_transport_2_3_0.xml |   13 +
 ...__com_netflix_servo_servo_core_0_12_21.xml |   13 +
 .../Maven__com_oracle_ojdbc6_11_2_0_3.xml     |   13 +
 ...en__com_squareup_okhttp3_okhttp_3_14_6.xml |   13 +
 .../Maven__com_squareup_okio_okio_1_17_2.xml  |   13 +
 ..._contribs_jersey_apache_client4_1_19_1.xml |   13 +
 ...n__com_sun_jersey_jersey_client_1_19_1.xml |   13 +
 ...ven__com_sun_jersey_jersey_core_1_19_1.xml |   13 +
 ...om_thoughtworks_xstream_xstream_1_4_20.xml |   13 +
 ...ogle_android_json_0_0_20131108_vaadin1.xml |   13 +
 .../Maven__com_vividsolutions_jts_1_13.xml    |   13 +
 .../Maven__com_zaxxer_HikariCP_3_4_2.xml      |   13 +
 .../Maven__com_zaxxer_SparseBitSet_1_2.xml    |   13 +
 ...mons_beanutils_commons_beanutils_1_9_4.xml |   13 +
 ...aven__commons_codec_commons_codec_1_13.xml |   13 +
 ..._collections_commons_collections_3_2_2.xml |   13 +
 ...onfiguration_commons_configuration_1_8.xml |   13 +
 ...mons_fileupload_commons_fileupload_1_4.xml |   13 +
 ...mons_httpclient_commons_httpclient_3_0.xml |   13 +
 .../Maven__commons_io_commons_io_1_3_2.xml    |   13 +
 .../Maven__commons_io_commons_io_2_2.xml      |   13 +
 .../Maven__commons_lang_commons_lang_2_6.xml  |   13 +
 ..._commons_logging_commons_logging_1_0_4.xml |   13 +
 ...n__commons_logging_commons_logging_1_2.xml |   13 +
 ...centric_spring_boot_admin_client_2_2_0.xml |   13 +
 ...spring_boot_admin_starter_client_2_2_0.xml |   13 +
 ...io_github_openfeign_feign_core_10_10_1.xml |   13 +
 ...github_openfeign_feign_hystrix_10_10_1.xml |   13 +
 ...o_github_openfeign_feign_slf4j_10_10_1.xml |   13 +
 ...github_openfeign_form_feign_form_3_8_0.xml |   13 +
 ...openfeign_form_feign_form_spring_3_8_0.xml |   13 +
 ..._io_lettuce_lettuce_core_5_2_1_RELEASE.xml |   13 +
 ...n__io_micrometer_micrometer_core_1_5_3.xml |   13 +
 .../libraries/Maven__io_minio_minio_8_0_3.xml |   13 +
 ...en__io_netty_netty_buffer_4_1_51_Final.xml |   13 +
 ...ven__io_netty_netty_codec_4_1_51_Final.xml |   13 +
 ...o_netty_netty_codec_http2_4_1_51_Final.xml |   13 +
 ...io_netty_netty_codec_http_4_1_51_Final.xml |   13 +
 ...o_netty_netty_codec_socks_4_1_51_Final.xml |   13 +
 ...en__io_netty_netty_common_4_1_51_Final.xml |   13 +
 ...n__io_netty_netty_handler_4_1_51_Final.xml |   13 +
 ...netty_netty_handler_proxy_4_1_51_Final.xml |   13 +
 ...__io_netty_netty_resolver_4_1_51_Final.xml |   13 +
 ..._io_netty_netty_transport_4_1_51_Final.xml |   13 +
 ...native_epoll_linux_x86_64_4_1_51_Final.xml |   13 +
 ...nsport_native_unix_common_4_1_51_Final.xml |   13 +
 ...tor_addons_reactor_extra_3_3_3_RELEASE.xml |   13 +
 ...tor_netty_reactor_netty_0_9_10_RELEASE.xml |   13 +
 ...jectreactor_reactor_core_3_3_8_RELEASE.xml |   13 +
 ...aven__io_prometheus_simpleclient_0_5_0.xml |   13 +
 .../Maven__io_reactivex_rxjava_1_3_8.xml      |   13 +
 .../Maven__io_reactivex_rxnetty_0_4_9.xml     |   13 +
 ...n__io_reactivex_rxnetty_contexts_0_4_9.xml |   13 +
 ...aven__io_reactivex_rxnetty_servo_0_4_9.xml |   13 +
 ...ven__io_springfox_springfox_core_2_8_0.xml |   13 +
 ...n__io_springfox_springfox_schema_2_8_0.xml |   13 +
 ...aven__io_springfox_springfox_spi_2_8_0.xml |   13 +
 ...o_springfox_springfox_spring_web_2_8_0.xml |   13 +
 ..._io_springfox_springfox_swagger2_2_8_0.xml |   13 +
 ...ringfox_springfox_swagger_common_2_8_0.xml |   13 +
 ...o_springfox_springfox_swagger_ui_2_8_0.xml |   13 +
 ..._io_swagger_swagger_annotations_1_5_14.xml |   13 +
 ...aven__io_swagger_swagger_models_1_5_14.xml |   13 +
 ...ctivation_jakarta_activation_api_1_2_1.xml |   13 +
 ...nnotation_jakarta_annotation_api_1_3_5.xml |   13 +
 ...alidation_jakarta_validation_api_2_0_2.xml |   13 +
 ...ta_xml_bind_jakarta_xml_bind_api_2_3_2.xml |   13 +
 ...Maven__javax_activation_activation_1_1.xml |   13 +
 .../Maven__javax_inject_javax_inject_1.xml    |   13 +
 .../libraries/Maven__javax_mail_mail_1_4.xml  |   13 +
 ..._javax_servlet_javax_servlet_api_4_0_1.xml |   13 +
 .../Maven__javax_ws_rs_jsr311_api_1_1_1.xml   |   13 +
 .idea/libraries/Maven__jaxen_jaxen_1_2_0.xml  |   13 +
 .idea/libraries/Maven__jdom_jdom_1_0.xml      |   13 +
 .idea/libraries/Maven__junit_junit_4_12.xml   |   13 +
 ...ven__mysql_mysql_connector_java_8_0_16.xml |   13 +
 ...Maven__net_bytebuddy_byte_buddy_1_10_6.xml |   13 +
 ..._net_bytebuddy_byte_buddy_agent_1_10_6.xml |   13 +
 ...Maven__net_minidev_accessors_smart_1_2.xml |   13 +
 .../Maven__net_minidev_json_smart_2_3.xml     |   13 +
 ...en__net_sf_ehcache_ehcache_core_2_6_11.xml |   13 +
 ...pache_commons_commons_collections4_4_1.xml |   13 +
 ...pache_commons_commons_collections4_4_4.xml |   13 +
 ...g_apache_commons_commons_compress_1_19.xml |   13 +
 ...__org_apache_commons_commons_lang3_3_7.xml |   13 +
 ...__org_apache_commons_commons_lang3_3_9.xml |   13 +
 ...org_apache_commons_commons_math3_3_6_1.xml |   13 +
 ...n__org_apache_commons_commons_text_1_6.xml |   13 +
 ...e_httpcomponents_httpasyncclient_4_1_4.xml |   13 +
 ...pache_httpcomponents_httpclient_4_5_10.xml |   13 +
 ..._apache_httpcomponents_httpcore_4_4_13.xml |   13 +
 ...che_httpcomponents_httpcore_nio_4_4_13.xml |   13 +
 ..._apache_logging_log4j_log4j_api_2_13_3.xml |   13 +
 ...he_logging_log4j_log4j_to_slf4j_2_12_1.xml |   13 +
 .../Maven__org_apache_poi_poi_3_17.xml        |   13 +
 .../Maven__org_apache_poi_poi_4_1_2.xml       |   13 +
 .../Maven__org_apache_poi_poi_ooxml_3_17.xml  |   13 +
 .../Maven__org_apache_poi_poi_ooxml_4_1_2.xml |   13 +
 ..._org_apache_poi_poi_ooxml_schemas_3_17.xml |   13 +
 ...org_apache_poi_poi_ooxml_schemas_4_1_2.xml |   13 +
 ...en__org_apache_shiro_shiro_cache_1_8_0.xml |   13 +
 ...g_apache_shiro_shiro_config_core_1_8_0.xml |   13 +
 ...g_apache_shiro_shiro_config_ogdl_1_8_0.xml |   13 +
 ...ven__org_apache_shiro_shiro_core_1_8_0.xml |   13 +
 ...apache_shiro_shiro_crypto_cipher_1_8_0.xml |   13 +
 ...g_apache_shiro_shiro_crypto_core_1_8_0.xml |   13 +
 ...g_apache_shiro_shiro_crypto_hash_1_8_0.xml |   13 +
 ...__org_apache_shiro_shiro_ehcache_1_8_0.xml |   13 +
 ...en__org_apache_shiro_shiro_event_1_8_0.xml |   13 +
 ...ven__org_apache_shiro_shiro_lang_1_8_0.xml |   13 +
 ..._tomcat_embed_tomcat_embed_core_9_0_30.xml |   13 +
 ...he_tomcat_embed_tomcat_embed_el_9_0_30.xml |   13 +
 ...at_embed_tomcat_embed_websocket_9_0_30.xml |   13 +
 ...ache_velocity_velocity_engine_core_2_3.xml |   13 +
 ...n__org_apache_ws_commons_XmlSchema_1_1.xml |   13 +
 ...en__org_apache_xmlbeans_xmlbeans_2_6_0.xml |   13 +
 ...en__org_apache_xmlbeans_xmlbeans_3_1_0.xml |   13 +
 ..._org_apiguardian_apiguardian_api_1_1_0.xml |   13 +
 ...Maven__org_aspectj_aspectjweaver_1_9_5.xml |   13 +
 ...Maven__org_assertj_assertj_core_3_13_2.xml |   13 +
 ...__org_bouncycastle_bcpkix_jdk15on_1_64.xml |   13 +
 ...__org_bouncycastle_bcprov_jdk15on_1_64.xml |   13 +
 ...g_checkerframework_checker_qual_2_11_1.xml |   13 +
 ...__org_codehaus_woodstox_wstx_asl_3_2_0.xml |   13 +
 ...n__org_codehaus_xfire_xfire_core_1_2_6.xml |   13 +
 .../Maven__org_glassfish_jakarta_el_3_0_3.xml |   13 +
 .../Maven__org_hamcrest_hamcrest_2_1.xml      |   13 +
 ...n__org_hdrhistogram_HdrHistogram_2_1_9.xml |   13 +
 ...dator_hibernate_validator_6_0_18_Final.xml |   13 +
 ...ven__org_javassist_javassist_3_21_0_GA.xml |   13 +
 ...boss_logging_jboss_logging_3_4_1_Final.xml |   13 +
 .../Maven__org_jolokia_jolokia_core_1_6_2.xml |   13 +
 ..._org_junit_jupiter_junit_jupiter_5_6_2.xml |   13 +
 ..._junit_jupiter_junit_jupiter_api_5_6_2.xml |   13 +
 ...nit_jupiter_junit_jupiter_engine_5_6_2.xml |   13 +
 ...nit_jupiter_junit_jupiter_params_5_6_2.xml |   13 +
 ..._platform_junit_platform_commons_1_6_2.xml |   13 +
 ...t_platform_junit_platform_engine_1_6_2.xml |   13 +
 ...nit_vintage_junit_vintage_engine_5_6_2.xml |   13 +
 ...n__org_latencyutils_LatencyUtils_2_0_3.xml |   13 +
 ...__org_locationtech_jts_jts_core_1_18_0.xml |   13 +
 ...n__org_mapstruct_mapstruct_1_2_0_Final.xml |   13 +
 .../Maven__org_mockito_mockito_core_3_1_0.xml |   13 +
 ...rg_mockito_mockito_junit_jupiter_3_1_0.xml |   13 +
 .../Maven__org_mongodb_bson_3_11_2.xml        |   13 +
 ...ven__org_mongodb_mongodb_driver_3_11_2.xml |   13 +
 ...org_mongodb_mongodb_driver_core_3_11_2.xml |   13 +
 .../Maven__org_mybatis_mybatis_3_5_7.xml      |   13 +
 ...aven__org_mybatis_mybatis_spring_2_0_6.xml |   13 +
 ...ybatis_spring_boot_autoconfigure_2_2_0.xml |   13 +
 ...boot_mybatis_spring_boot_starter_2_2_0.xml |   13 +
 .../Maven__org_objenesis_objenesis_2_6.xml    |   13 +
 ...Maven__org_opentest4j_opentest4j_1_2_0.xml |   13 +
 .../Maven__org_ow2_asm_asm_5_0_4.xml          |   13 +
 ...aven__org_postgresql_postgresql_42_2_9.xml |   13 +
 ...aven__org_projectlombok_lombok_1_16_18.xml |   13 +
 ...aven__org_projectlombok_lombok_1_18_10.xml |   13 +
 ...reactivestreams_reactive_streams_1_0_3.xml |   13 +
 ...en__org_reflections_reflections_0_9_11.xml |   13 +
 ...aven__org_skyscreamer_jsonassert_1_5_0.xml |   13 +
 .../Maven__org_slf4j_jul_to_slf4j_1_7_30.xml  |   13 +
 .../Maven__org_slf4j_slf4j_api_1_7_30.xml     |   13 +
 ...amework_boot_spring_boot_2_2_4_RELEASE.xml |   13 +
 ...oot_spring_boot_actuator_2_2_4_RELEASE.xml |   13 +
 ...t_actuator_autoconfigure_2_2_4_RELEASE.xml |   13 +
 ...pring_boot_autoconfigure_2_2_4_RELEASE.xml |   13 +
 ...boot_spring_boot_starter_2_2_4_RELEASE.xml |   13 +
 ...ng_boot_starter_actuator_2_2_4_RELEASE.xml |   13 +
 ..._spring_boot_starter_aop_2_2_4_RELEASE.xml |   13 +
 ...oot_starter_data_mongodb_2_2_4_RELEASE.xml |   13 +
 ..._boot_starter_data_redis_2_2_4_RELEASE.xml |   13 +
 ...spring_boot_starter_jdbc_2_2_4_RELEASE.xml |   13 +
 ...spring_boot_starter_json_2_2_4_RELEASE.xml |   13 +
 ...ing_boot_starter_logging_2_2_4_RELEASE.xml |   13 +
 ...ot_starter_reactor_netty_2_2_4_RELEASE.xml |   13 +
 ...spring_boot_starter_test_2_2_4_RELEASE.xml |   13 +
 ...ring_boot_starter_tomcat_2_2_4_RELEASE.xml |   13 +
 ..._boot_starter_validation_2_2_4_RELEASE.xml |   13 +
 ..._spring_boot_starter_web_2_2_4_RELEASE.xml |   13 +
 ...ing_boot_starter_webflux_2_2_4_RELEASE.xml |   13 +
 ...g_boot_starter_websocket_2_2_4_RELEASE.xml |   13 +
 ...rk_boot_spring_boot_test_2_2_4_RELEASE.xml |   13 +
 ..._boot_test_autoconfigure_2_2_4_RELEASE.xml |   13 +
 ...oud_spring_cloud_commons_2_2_5_RELEASE.xml |   13 +
 ...oud_spring_cloud_context_2_2_5_RELEASE.xml |   13 +
 ...pring_cloud_gateway_core_2_2_5_RELEASE.xml |   13 +
 ...g_cloud_netflix_archaius_2_2_5_RELEASE.xml |   13 +
 ...ing_cloud_netflix_ribbon_2_2_5_RELEASE.xml |   13 +
 ...ing_cloud_openfeign_core_2_2_5_RELEASE.xml |   13 +
 ...oud_spring_cloud_starter_2_2_5_RELEASE.xml |   13 +
 ...ng_cloud_starter_gateway_2_2_5_RELEASE.xml |   13 +
 ...starter_netflix_archaius_2_2_5_RELEASE.xml |   13 +
 ...d_starter_netflix_ribbon_2_2_5_RELEASE.xml |   13 +
 ..._cloud_starter_openfeign_2_2_5_RELEASE.xml |   13 +
 ...data_spring_data_commons_2_3_2_RELEASE.xml |   13 +
 ...ata_spring_data_keyvalue_2_3_2_RELEASE.xml |   13 +
 ...data_spring_data_mongodb_3_0_2_RELEASE.xml |   13 +
 ...k_data_spring_data_redis_2_3_2_RELEASE.xml |   13 +
 ..._spring_integration_core_5_3_2_RELEASE.xml |   13 +
 ...on_spring_integration_ip_5_3_2_RELEASE.xml |   13 +
 ...lugin_spring_plugin_core_1_2_0_RELEASE.xml |   13 +
 ...n_spring_plugin_metadata_1_2_0_RELEASE.xml |   13 +
 ...ework_retry_spring_retry_1_2_5_RELEASE.xml |   13 +
 ...y_spring_security_crypto_5_3_3_RELEASE.xml |   13 +
 ...rity_spring_security_rsa_1_0_9_RELEASE.xml |   13 +
 ...ringframework_spring_aop_5_2_8_RELEASE.xml |   13 +
 ...ngframework_spring_beans_5_2_8_RELEASE.xml |   13 +
 ...framework_spring_context_5_2_8_RELEASE.xml |   13 +
 ...k_spring_context_support_5_2_8_RELEASE.xml |   13 +
 ...ingframework_spring_core_5_2_8_RELEASE.xml |   13 +
 ...mework_spring_expression_5_2_8_RELEASE.xml |   13 +
 ...ringframework_spring_jcl_5_2_8_RELEASE.xml |   13 +
 ...ingframework_spring_jdbc_5_2_8_RELEASE.xml |   13 +
 ...amework_spring_messaging_5_2_8_RELEASE.xml |   13 +
 ...ringframework_spring_oxm_5_2_8_RELEASE.xml |   13 +
 ...ingframework_spring_test_5_2_8_RELEASE.xml |   13 +
 ...pringframework_spring_tx_5_2_8_RELEASE.xml |   13 +
 ...ringframework_spring_web_5_2_8_RELEASE.xml |   13 +
 ...framework_spring_webflux_5_2_8_RELEASE.xml |   13 +
 ...gframework_spring_webmvc_5_2_8_RELEASE.xml |   13 +
 ...amework_spring_websocket_5_2_8_RELEASE.xml |   13 +
 .../Maven__org_ssssssss_magic_api_2_0_1.xml   |   13 +
 ...sssssss_magic_api_plugin_swagger_2_0_1.xml |   13 +
 ...ss_magic_api_spring_boot_starter_2_0_1.xml |   13 +
 ...Maven__org_ssssssss_magic_editor_2_0_1.xml |   13 +
 ...Maven__org_ssssssss_magic_script_1_8_5.xml |   13 +
 ...onoss_cloud_nio_multipart_parser_1_1_0.xml |   13 +
 ...hronoss_cloud_nio_stream_storage_1_1_3.xml |   13 +
 .../Maven__org_xmlunit_xmlunit_core_2_6_3.xml |   13 +
 .../Maven__org_yaml_snakeyaml_1_25.xml        |   13 +
 .../libraries/Maven__stax_stax_api_1_0_1.xml  |   13 +
 .idea/misc.xml                                |   11 +
 .idea/modules.xml                             |   25 +
 .idea/workspace.xml                           |  312 ++
 feign-client-api/feign-client-api.iml         |   12 +
 .../mosty-base-feign-sdk.iml                  |  195 ++
 feign-client-api/mosty-base-feign-sdk/pom.xml |   67 +
 .../com/mosty/base/enums/BKCSTypeEnum.java    |   39 +
 .../com/mosty/base/enums/BKDbTypeEnum.java    |   44 +
 .../java/com/mosty/base/enums/BkTypeEnum.java |   38 +
 .../com/mosty/base/enums/PlateClassEnum.java  |   66 +
 .../base/feign/FeignAutoConfiguration.java    |   17 +
 .../base/feign/config/OpenFeignLogConfig.java |   36 +
 .../base/feign/config/WxMessageConverter.java |   17 +
 .../SysDeptRemoteServiceFallback.java         |  179 ++
 .../handle/AbstractGeometryTypeHandler.java   |   92 +
 .../feign/handle/LineStringTypeHandler.java   |   12 +
 .../base/feign/handle/PointTypeHandler.java   |   12 +
 .../base/feign/handle/PolygonTypeHandler.java |   11 +
 .../feign/service/MostyBaseFeignService.java  |  138 +
 .../feign/service/MostyHczxFeignService.java  |   32 +
 .../feign/service/MostyJcglFeignService.java  |   92 +
 .../service/MostyLzotherFeignService.java     |   39 +
 .../feign/service/MostyQwzxFeignService.java  |   57 +
 .../feign/service/MostyRwzxFeignService.java  |   38 +
 .../feign/service/MostyRzzxFeignService.java  |   24 +
 .../feign/service/MostySjzxFeignService.java  |   91 +
 .../service/MostyWebSocketFeignService.java   |   26 +
 .../feign/service/MostyYjzlFeignService.java  |   99 +
 .../feign/service/MostyYszxFeignService.java  |  112 +
 .../java/com/mosty/base/model/BaseEntity.java |   95 +
 .../java/com/mosty/base/model/BasePage.java   |   30 +
 .../base/model/dto/base/GajgSearchDto.java    |   27 +
 .../base/model/dto/base/GetDeptListDTO.java   |   29 +
 .../mosty/base/model/dto/base/GetSsbmDto.java |   28 +
 .../base/model/dto/base/GetYqListDto.java     |   38 +
 .../base/model/dto/base/RsHjyjSearchDto.java  |   29 +
 .../mosty/base/model/dto/base/SysDeptDTO.java |  158 +
 .../base/model/dto/base/SysMessageInfo.java   |  102 +
 .../dto/base/SysMessageInfoInsertDto.java     |   49 +
 .../base/model/dto/base/SysMessageItem.java   |  106 +
 .../dto/base/SysMessageItemInsertDto.java     |   54 +
 .../base/model/dto/bkzx/TbBkClInsertDto.java  |   61 +
 .../base/model/dto/bkzx/TbBkClJudgeDto.java   |   34 +
 .../base/model/dto/bkzx/TbBkDbBkDto.java      |   24 +
 .../base/model/dto/bkzx/TbBkDbInsertDto.java  |   71 +
 .../base/model/dto/bkzx/TbBkDbSearchDto.java  |   28 +
 .../base/model/dto/bkzx/TbBkDbUpDto.java      |   31 +
 .../base/model/dto/bkzx/TbBkRyInsertDto.java  |   83 +
 .../base/model/dto/bkzx/TbBkRyJudgeDto.java   |   34 +
 .../base/model/dto/bkzx/TbBkzxGXDto.java      |   17 +
 .../mosty/base/model/dto/bkzx/XdxxQuery.java  |   45 +
 .../base/model/dto/hczx/BpcclSaveDto.java     |  162 +
 .../base/model/dto/hczx/BpcrySaveDto.java     |  172 +
 .../com/mosty/base/model/dto/hczx/Face.java   |  333 ++
 .../mosty/base/model/dto/hczx/Repository.java |   44 +
 .../model/dto/hczx/TbHcBpcclInsertDto.java    |   58 +
 .../model/dto/hczx/TbHcBpcryInsertDto.java    |   61 +
 .../base/model/dto/hczx/TbHcDtgzDto.java      |  142 +
 .../base/model/dto/hczx/TbHcSydjQueryDto.java |   19 +
 .../base/model/dto/hczx/TbHcSydjSaveDto.java  |   56 +
 .../base/model/dto/jcgl/TbJcglAbfcDto.java    |   45 +
 .../base/model/dto/jcgl/TbJcglBqDto.java      |   59 +
 .../base/model/dto/jcgl/TbJcglBxxDto.java     |   80 +
 .../base/model/dto/jcgl/TbJcglDsfDto.java     |   53 +
 .../model/dto/jcgl/TbJcglDsfJudgeDto.java     |   32 +
 .../base/model/dto/jcgl/TbJcglKfdDto.java     |  105 +
 .../model/dto/jcgl/TbJcglKhbmEditPzDto.java   |  141 +
 .../base/model/dto/jcgl/TbJcglPzfzDto.java    |   44 +
 .../jcgl/TbJcglShabllInsertAndEditDto.java    |   79 +
 .../base/model/dto/jcgl/TbJcglXfZgDto.java    |   40 +
 .../base/model/dto/jcgl/TbJcglXfllDto.java    |  127 +
 .../model/dto/jcgl/TbJcglXfllSearchQuery.java |   40 +
 .../base/model/dto/jcgl/TbJcglXfllVo.java     |  119 +
 .../base/model/dto/jcgl/TbJcglXfqyDto.java    |  102 +
 .../model/dto/jcgl/TbJcglXfwgInsertDto.java   |   60 +
 .../base/model/dto/jcgl/TbJcglXlfaDto.java    |   97 +
 .../model/dto/jcgl/TbJcglXlfaXldwDto.java     |   72 +
 .../base/model/dto/jcgl/TbJcglXljlDto.java    |   40 +
 .../model/dto/jcgl/TbJcglZnzbSearchDto.java   |   50 +
 .../model/dto/jcgl/TbJcglZyjzSearchDto.java   |   51 +
 .../base/model/dto/qwzx/AppSearchQuery.java   |   46 +
 .../model/dto/qwzx/TbQwBmjlbbCountDto.java    |   26 +
 .../model/dto/qwzx/TbQwBmjlbbJlmxDto.java     |   83 +
 .../base/model/dto/qwzx/TbQwBxfsqEditDto.java |   45 +
 .../mosty/base/model/dto/qwzx/TbQwClDto.java  |   70 +
 .../base/model/dto/qwzx/TbQwFjjlBbDto.java    |   29 +
 .../mosty/base/model/dto/qwzx/TbQwJlDto.java  |   79 +
 .../model/dto/qwzx/TbQwJmllSearchDto.java     |   32 +
 .../base/model/dto/qwzx/TbQwJyqxDto.java      |   59 +
 .../base/model/dto/qwzx/TbQwMfjSearchDto.java |   59 +
 .../base/model/dto/qwzx/TbQwQwbcEditDto.java  |   91 +
 .../base/model/dto/qwzx/TbQwQwdjDto.java      |   29 +
 .../base/model/dto/qwzx/TbQwQwdjEditDto.java  |  116 +
 .../base/model/dto/qwzx/TbQwQxjEditDto.java   |   99 +
 .../model/dto/qwzx/TbQwSearchJlqdDto.java     |   38 +
 .../model/dto/qwzx/TbQwSearchZgmfjDto.java    |   43 +
 .../model/dto/qwzx/TbQwSpsHdgjChangeDto.java  |   34 +
 .../base/model/dto/qwzx/TbQwXfbbDkDto.java    |   30 +
 .../base/model/dto/qwzx/TbQwXfbbDkWzDto.java  |   33 +
 .../base/model/dto/qwzx/TbQwXfbbDto.java      |  243 ++
 .../model/dto/qwzx/TbQwXfbbQueryByJlDto.java  |   36 +
 .../dto/qwzx/TbQwXfbbStartOrEndBbDto.java     |   28 +
 .../mosty/base/model/dto/qwzx/TbQwXfbbVo.java |  256 ++
 .../base/model/dto/qwzx/TbQwXffwDto.java      |   41 +
 .../model/dto/qwzx/TbQwXfpbAddAndEditDto.java |   77 +
 .../base/model/dto/qwzx/TbQwXfpbZqDto.java    |  144 +
 .../base/model/dto/qwzx/TbQwXzSearchDto.java  |   34 +
 .../mosty/base/model/dto/qwzx/TbQwZbDto.java  |  108 +
 .../dto/qwzx/TbQwZbpbInsertOrUpdateDto.java   |   76 +
 .../base/model/dto/qwzx/TbQwZbpbZqDto.java    |  152 +
 .../base/model/dto/qwzx/TbQwZnzbDto.java      |   73 +
 .../rwzx/TbRwTaskChangeStateByYwidDto.java    |   43 +
 .../dto/rwzx/TbRwTaskChangeStateDto.java      |   81 +
 .../dto/rwzx/TbRwTaskChangeStateInnerDto.java |   36 +
 .../base/model/dto/rwzx/TbRwTaskDto.java      |  102 +
 .../dto/rwzx/TbRwTaskGrChangeStateDto.java    |  109 +
 .../rwzx/TbRwTaskGrChangeStateInnerDto.java   |   39 +
 .../base/model/dto/rwzx/TbRwTaskInnerDto.java |   78 +
 .../model/dto/rwzx/TbRwTaskStatisticsDto.java |   29 +
 .../base/model/dto/rwzx/TbRwTaskUserDto.java  |   68 +
 .../model/dto/rwzx/TbRwTaskUserInnerDto.java  |   54 +
 .../model/dto/rzzx/TbRzDyjkInsertDto.java     |   40 +
 .../model/dto/rzzx/TbRzDyjkUpdateDto.java     |   36 +
 .../base/model/dto/rzzx/TbRzHjInsertDto.java  |   64 +
 .../base/model/dto/rzzx/TbRzHjUpdateDto.java  |   34 +
 .../model/dto/rzzx/TbRzSpbfInsertDto.java     |   49 +
 .../model/dto/rzzx/TbRzXtfkInsertDto.java     |   80 +
 .../base/model/dto/sjzx/BxdCreatedDto.java    |   30 +
 .../base/model/dto/sjzx/NeighborDTO.java      |   26 +
 .../base/model/dto/sjzx/TbCaseTypeDto.java    |   37 +
 .../mosty/base/model/dto/sjzx/TbJqDTO.java    |  364 +++
 .../base/model/dto/sjzx/TbJqGeohash.java      |   38 +
 .../base/model/dto/sjzx/TbJqYjbjDto.java      |   27 +
 .../mosty/base/model/dto/sjzx/TbSjDto.java    |  150 +
 .../base/model/dto/sjzx/TbSjQcszDto.java      |   40 +
 .../mosty/base/model/dto/sjzx/TbSjRzDto.java  |   76 +
 .../base/model/dto/sjzx/TbSjRzInsertDto.java  |   32 +
 .../base/model/dto/sjzx/TbSjSpbfDTO.java      |   83 +
 .../base/model/dto/sjzx/TbSjUpdateJwdDto.java |   39 +
 .../model/dto/spxl/TbSpxlSpxlfaInsertDto.java |   30 +
 .../model/dto/spxl/TbSpxlSpxlfaSxtDto.java    |   42 +
 .../dto/spxl/TbSpxlSpxlfaSxtPlayDto.java      |   30 +
 .../model/dto/spxl/TbSpxlSpxlfaSxtzDto.java   |   33 +
 .../model/dto/spxl/TbSpxlSpxlfaUpdateDto.java |   45 +
 .../model/dto/websocket/WebSocketObject.java  |   39 +
 .../model/dto/wzzx/AppLocationReceiveDto.java |  115 +
 .../base/model/dto/wzzx/LocationInfo.java     |  212 ++
 .../base/model/dto/wzzx/SjCyjlUpdateDto.java  |   57 +
 .../mosty/base/model/dto/wzzx/SswzQuery.java  |   20 +
 .../mosty/base/model/dto/wzzx/WzcxQuery.java  |   35 +
 .../mosty/base/model/dto/wzzx/WztjQuery.java  |   43 +
 .../base/model/dto/wzzx/XfbbUpdateDto.java    |   70 +
 .../base/model/dto/yjzl/CyjlSearchDto.java    |   27 +
 .../base/model/dto/yjzl/GetLastYjDto.java     |   28 +
 .../base/model/dto/yjzl/KafkaYjxxDto.java     |   27 +
 .../base/model/dto/yjzl/MyZlSearchDto.java    |   46 +
 .../base/model/dto/yjzl/NewZxjlSearchDto.java |   30 +
 .../mosty/base/model/dto/yjzl/TbFzycDto.java  |   54 +
 .../base/model/dto/yjzl/TbFzycXljlDto.java    |  111 +
 .../mosty/base/model/dto/yjzl/TbYjxxDTO.java  |  159 +
 .../dto/yjzl/TbYjxxPageStatisticsDto.java     |   40 +
 .../dto/yjzl/TbYjxxRyNyStatisticsDto.java     |   37 +
 .../dto/yjzl/TbYjxxRyPageStatisticsDto.java   |   43 +
 .../model/dto/yjzl/TbYjxxRyStatisticsDto.java |   28 +
 .../model/dto/yjzl/TbYjxxStatisticsDto.java   |   32 +
 .../dto/yjzl/TbYjxxStatisticsQueryDto.java    |   27 +
 .../model/dto/yjzl/TbYjxxYStatisticsDto.java  |   37 +
 .../dto/yjzl/TbYjxxYyjStatisticsDto.java      |   30 +
 .../base/model/dto/yjzl/TbZlxxInsertDto.java  |  106 +
 .../model/dto/yjzl/TbZlxxPcryclInsertDto.java |   33 +
 .../model/dto/yjzl/TbZlxxZtChangeDto.java     |   87 +
 .../model/dto/yjzl/TbZlxxZtChangeRygkDto.java |   72 +
 .../model/dto/yjzl/TbZlxxZxjlInsertDto.java   |   70 +
 .../model/dto/yjzl/TbZlxxZxrDtoInsertDto.java |   66 +
 .../base/model/dto/yjzl/YjConvertZlDto.java   |   30 +
 .../dto/yjzl/third/ThirdMyZlSearchDto.java    |   50 +
 .../dto/yjzl/third/ThirdTbZlxxInsertDto.java  |  100 +
 .../dto/yjzl/third/ThirdZlInfoSearchDto.java  |   30 +
 .../mosty/base/model/dto/yszx/Cameras.java    |   61 +
 .../base/model/dto/yszx/TbYsAjDelDto.java     |   37 +
 .../mosty/base/model/dto/yszx/TbYsAjDto.java  |   87 +
 .../mosty/base/model/dto/yszx/TbYsDlDTO.java  |  100 +
 .../model/dto/yszx/TbYsGajgAndGlbmDto.java    |   86 +
 .../base/model/dto/yszx/TbYsGajgByJwdDto.java |   40 +
 .../base/model/dto/yszx/TbYsGajgDto.java      |   88 +
 .../base/model/dto/yszx/TbYsGajgGlbmDto.java  |   41 +
 .../mosty/base/model/dto/yszx/TbYsRyDto.java  |  105 +
 .../mosty/base/model/dto/yszx/TbYsSxtDto.java |  114 +
 .../entity/afjcsj/VwShareStMhJgxxbGx.java     |  724 +++++
 .../afjcsj/VwShareStShzyJtKyqcgpxxGx.java     |  269 ++
 .../entity/afjcsj/VwShareStTlLksmdpGx.java    |  114 +
 .../model/entity/afjcsj/VwSydwCyryGx.java     |  255 ++
 .../model/entity/afjcsj/VwSydwJbxxGx.java     |  307 ++
 .../model/entity/afjcsj/VwSyrkJzgjGx.java     |  363 +++
 .../mosty/base/model/entity/base/TbOrg.java   |   47 +
 .../mosty/base/model/entity/base/TbUser.java  |   50 +
 .../mosty/base/model/entity/bkzx/TbBkCl.java  |  158 +
 .../mosty/base/model/entity/bkzx/TbBkDb.java  |   87 +
 .../mosty/base/model/entity/bkzx/TbBkRy.java  |  179 ++
 .../base/model/entity/hczx/TbHcBpccl.java     |  214 ++
 .../base/model/entity/hczx/TbHcBpcclBq.java   |   57 +
 .../base/model/entity/hczx/TbHcBpcclWp.java   |   69 +
 .../base/model/entity/hczx/TbHcBpcry.java     |  229 ++
 .../base/model/entity/hczx/TbHcBpcryBq.java   |   64 +
 .../base/model/entity/hczx/TbHcBpcryTzbq.java |   51 +
 .../base/model/entity/hczx/TbHcBpcryWp.java   |   71 +
 .../base/model/entity/hczx/TbHcDtgz.java      |  158 +
 .../base/model/entity/hczx/TbHcRytzbq.java    |   42 +
 .../base/model/entity/hczx/TbHcSydj.java      |   61 +
 .../mosty/base/model/entity/hczx/TbHcTp.java  |   47 +
 .../base/model/entity/jcgl/TbJcglAbfc.java    |   64 +
 .../base/model/entity/jcgl/TbJcglBq.java      |   71 +
 .../base/model/entity/jcgl/TbJcglBxd.java     |  105 +
 .../base/model/entity/jcgl/TbJcglBxx.java     |   82 +
 .../base/model/entity/jcgl/TbJcglDsf.java     |   58 +
 .../base/model/entity/jcgl/TbJcglJwz.java     |  107 +
 .../base/model/entity/jcgl/TbJcglJyqx.java    |  147 +
 .../base/model/entity/jcgl/TbJcglJz.java      |   89 +
 .../base/model/entity/jcgl/TbJcglJzCl.java    |   50 +
 .../base/model/entity/jcgl/TbJcglJzJyqx.java  |   51 +
 .../base/model/entity/jcgl/TbJcglJzRy.java    |   62 +
 .../base/model/entity/jcgl/TbJcglJzZnzb.java  |   60 +
 .../base/model/entity/jcgl/TbJcglKfd.java     |  117 +
 .../base/model/entity/jcgl/TbJcglKhbm.java    |  185 ++
 .../base/model/entity/jcgl/TbJcglKhmx.java    |  171 +
 .../base/model/entity/jcgl/TbJcglKhtj.java    |  283 ++
 .../base/model/entity/jcgl/TbJcglPzfz.java    |   53 +
 .../base/model/entity/jcgl/TbJcglShabll.java  |   95 +
 .../base/model/entity/jcgl/TbJcglXf.java      |  121 +
 .../base/model/entity/jcgl/TbJcglXfCyry.java  |   80 +
 .../base/model/entity/jcgl/TbJcglXfDwgl.java  |   91 +
 .../base/model/entity/jcgl/TbJcglXfJl.java    |   72 +
 .../base/model/entity/jcgl/TbJcglXfNrmb.java  |   65 +
 .../base/model/entity/jcgl/TbJcglXfRw.java    |   78 +
 .../base/model/entity/jcgl/TbJcglXfZg.java    |   89 +
 .../base/model/entity/jcgl/TbJcglXfcl.java    |  127 +
 .../base/model/entity/jcgl/TbJcglXfclSb.java  |   59 +
 .../base/model/entity/jcgl/TbJcglXfll.java    |  148 +
 .../base/model/entity/jcgl/TbJcglXfllBq.java  |   54 +
 .../base/model/entity/jcgl/TbJcglXfllFz.java  |   38 +
 .../base/model/entity/jcgl/TbJcglXfqy.java    |  107 +
 .../base/model/entity/jcgl/TbJcglXfwg.java    |   86 +
 .../base/model/entity/jcgl/TbJcglXlfa.java    |   93 +
 .../model/entity/jcgl/TbJcglXlfaXldw.java     |   76 +
 .../base/model/entity/jcgl/TbJcglXljl.java    |   50 +
 .../base/model/entity/jcgl/TbJcglZbfl.java    |   57 +
 .../base/model/entity/jcgl/TbJcglZbjl.java    |   71 +
 .../base/model/entity/jcgl/TbJcglZjk.java     |  120 +
 .../base/model/entity/jcgl/TbJcglZnzb.java    |  166 +
 .../base/model/entity/jcgl/TbSbGzjr.java      |   50 +
 .../mosty/base/model/entity/jcgl/Ybfj.java    |   50 +
 .../base/model/entity/lzother/BphJlxx.java    |   35 +
 .../mosty/base/model/entity/lzother/FKDB.java |  266 ++
 .../model/entity/lzother/TAlarmBkxxRy.java    |  112 +
 .../base/model/entity/lzother/TAlarmCkxx.java |  290 ++
 .../base/model/entity/lzother/TAlarmYjZl.java |   94 +
 .../base/model/entity/lzother/TAlarmYjgj.java |  157 +
 .../base/model/entity/lzother/TAlarmZtry.java |  759 +++++
 .../base/model/entity/lzother/VJcxx.java      |   49 +
 .../base/model/entity/lzother/VLz110Txj.java  |  141 +
 .../entity/lzother/ZhjmxfXfqwXfqyGzdw.java    |  160 +
 .../base/model/entity/qwzx/TbQwBmjlbb.java    |  123 +
 .../model/entity/qwzx/TbQwBmjlbbJlmx.java     |  103 +
 .../mosty/base/model/entity/qwzx/TbQwCl.java  |   80 +
 .../mosty/base/model/entity/qwzx/TbQwFa.java  |   61 +
 .../mosty/base/model/entity/qwzx/TbQwJjr.java |   44 +
 .../mosty/base/model/entity/qwzx/TbQwJl.java  |   85 +
 .../base/model/entity/qwzx/TbQwJyqx.java      |   77 +
 .../base/model/entity/qwzx/TbQwQwbc.java      |   93 +
 .../base/model/entity/qwzx/TbQwQwdj.java      |  120 +
 .../mosty/base/model/entity/qwzx/TbQwQxj.java |  100 +
 .../base/model/entity/qwzx/TbQwSpsCsdw.java   |   70 +
 .../model/entity/qwzx/TbQwSpsCsdwhdgj.java    |   79 +
 .../base/model/entity/qwzx/TbQwXfBxfsq.java   |  124 +
 .../base/model/entity/qwzx/TbQwXfbb.java      |  255 ++
 .../base/model/entity/qwzx/TbQwXffw.java      |   72 +
 .../base/model/entity/qwzx/TbQwXfpb.java      |  101 +
 .../base/model/entity/qwzx/TbQwXfpbMrjl.java  |   55 +
 .../base/model/entity/qwzx/TbQwXfpbZq.java    |  150 +
 .../mosty/base/model/entity/qwzx/TbQwZb.java  |  116 +
 .../base/model/entity/qwzx/TbQwZbbb.java      |  171 +
 .../base/model/entity/qwzx/TbQwZbpb.java      |   99 +
 .../base/model/entity/qwzx/TbQwZbpbMrjl.java  |   55 +
 .../base/model/entity/qwzx/TbQwZbpbZq.java    |  151 +
 .../base/model/entity/qwzx/TbQwZnzb.java      |   93 +
 .../base/model/entity/qwzx/TbQwxfbbDk.java    |   49 +
 .../base/model/entity/rh/RhMyhtWarn.java      |   71 +
 .../mosty/base/model/entity/rsother/CJDB.java |  180 ++
 .../base/model/entity/rwzx/TbRwTask.java      |  141 +
 .../base/model/entity/rwzx/TbRwTaskLog.java   |  109 +
 .../base/model/entity/rwzx/TbRwTaskUser.java  |  181 ++
 .../model/entity/rwzx/TbRwTaskUserAll.java    |  181 ++
 .../base/model/entity/rzzx/TbRzDyjk.java      |   99 +
 .../mosty/base/model/entity/rzzx/TbRzHj.java  |  124 +
 .../base/model/entity/rzzx/TbRzSpbf.java      |   99 +
 .../base/model/entity/rzzx/TbRzXtfk.java      |   89 +
 .../base/model/entity/sjzx/TbCaseType.java    |   78 +
 .../mosty/base/model/entity/sjzx/TbJq.java    |  264 ++
 .../mosty/base/model/entity/sjzx/TbJqAll.java |  260 ++
 .../base/model/entity/sjzx/TbJqCjdb.java      |  136 +
 .../mosty/base/model/entity/sjzx/TbJqDz.java  |   97 +
 .../mosty/base/model/entity/sjzx/TbJqZxr.java |  133 +
 .../mosty/base/model/entity/sjzx/TbSj.java    |  157 +
 .../base/model/entity/sjzx/TbSjCyjl.java      |  139 +
 .../mosty/base/model/entity/sjzx/TbSjDz.java  |  100 +
 .../mosty/base/model/entity/sjzx/TbSjRz.java  |   80 +
 .../base/model/entity/sjzx/TbSjSpbf.java      |   80 +
 .../base/model/entity/spxl/TbSpxlSpxlfa.java  |   93 +
 .../model/entity/spxl/TbSpxlSpxlfaSxt.java    |   56 +
 .../model/entity/spxl/TbSpxlSpxlfaSxtPz.java  |   68 +
 .../model/entity/spxl/TbSpxlSpxlfaSxtz.java   |   47 +
 .../base/model/entity/trs/VwAlermYjgl.java    |  162 +
 .../base/model/entity/trs/VwAlermYjzl.java    |   94 +
 .../model/entity/trs/VwAlermYjzlUser.java     |   82 +
 .../model/entity/trs/VwPersonVisitRecord.java |   76 +
 .../base/model/entity/trs/VwPsPersonZy.java   |  128 +
 .../base/model/entity/wzzx/TbWzLswz.java      |  137 +
 .../base/model/entity/wzzx/TbWzRywz.java      |  121 +
 .../base/model/entity/wzzx/TbWzSblswz.java    |  151 +
 .../base/model/entity/wzzx/TbWzSbsswz.java    |  149 +
 .../base/model/entity/wzzx/TbWzSswz.java      |  139 +
 .../base/model/entity/wzzx/TbWzXfwz.java      |  126 +
 .../mosty/base/model/entity/xinzhi/Czxx.java  |   80 +
 .../base/model/entity/xinzhi/GxAlarmAll.java  |  233 ++
 .../mosty/base/model/entity/xinzhi/GxAy.java  |   42 +
 .../base/model/entity/xinzhi/GxCjdb.java      |   83 +
 .../mosty/base/model/entity/xinzhi/Jjdb.java  |  250 ++
 .../base/model/entity/yisa/LocationBase.java  |   63 +
 .../mosty/base/model/entity/yjzl/TbFzyc.java  |  117 +
 .../base/model/entity/yjzl/TbFzycJsdx.java    |   71 +
 .../base/model/entity/yjzl/TbFzycPz.java      |   55 +
 .../base/model/entity/yjzl/TbFzycXfxz.java    |   71 +
 .../base/model/entity/yjzl/TbFzycXljl.java    |  104 +
 .../base/model/entity/yjzl/TbYjDyyjxx.java    |   93 +
 .../mosty/base/model/entity/yjzl/TbYjmx.java  |   55 +
 .../base/model/entity/yjzl/TbYjmxCsb.java     |   41 +
 .../mosty/base/model/entity/yjzl/TbYjxx.java  |  183 ++
 .../base/model/entity/yjzl/TbYjxxCl.java      |  172 +
 .../base/model/entity/yjzl/TbYjxxClBq.java    |   41 +
 .../base/model/entity/yjzl/TbYjxxDypz.java    |   76 +
 .../model/entity/yjzl/TbYjxxDypzClbq.java     |   36 +
 .../base/model/entity/yjzl/TbYjxxDypzGzy.java |   37 +
 .../model/entity/yjzl/TbYjxxDypzRybq.java     |   38 +
 .../model/entity/yjzl/TbYjxxDypzSjbq.java     |   37 +
 .../model/entity/yjzl/TbYjxxDypzYjjb.java     |   37 +
 .../base/model/entity/yjzl/TbYjxxDyyjxx.java  |   85 +
 .../base/model/entity/yjzl/TbYjxxMxyj.java    |  172 +
 .../base/model/entity/yjzl/TbYjxxRy.java      |  198 ++
 .../base/model/entity/yjzl/TbYjxxRyBq.java    |   42 +
 .../base/model/entity/yjzl/TbYjxxRySjaj.java  |   54 +
 .../base/model/entity/yjzl/TbYjxxSj.java      |  123 +
 .../model/entity/yjzl/TbYjxxSjGlrycl.java     |   55 +
 .../base/model/entity/yjzl/TbYjxxYjczjl.java  |   47 +
 .../mosty/base/model/entity/yjzl/TbZlJq.java  |  245 ++
 .../mosty/base/model/entity/yjzl/TbZlRg.java  |  192 ++
 .../mosty/base/model/entity/yjzl/TbZlXl.java  |  237 ++
 .../base/model/entity/yjzl/TbZlXlBxd.java     |  300 ++
 .../base/model/entity/yjzl/TbZlXlBxdXljl.java |  159 +
 .../base/model/entity/yjzl/TbZlYjCl.java      |  250 ++
 .../base/model/entity/yjzl/TbZlYjClCnry.java  |  454 +++
 .../base/model/entity/yjzl/TbZlYjRy.java      |  267 ++
 .../base/model/entity/yjzl/TbZlYjSj.java      |  203 ++
 .../mosty/base/model/entity/yjzl/TbZlxx.java  |  200 ++
 .../base/model/entity/yjzl/TbZlxxPcrycl.java  |   67 +
 .../base/model/entity/yjzl/TbZlxxZxjl.java    |  130 +
 .../base/model/entity/yjzl/TbZlxxZxr.java     |  171 +
 .../mosty/base/model/entity/yjzl/TbZxzb.java  |   49 +
 .../mosty/base/model/entity/yszx/TbYsDl.java  |  121 +
 .../base/model/entity/yszx/TbYsGajg.java      |  125 +
 .../base/model/entity/yszx/TbYsGajgGlbm.java  |   69 +
 .../mosty/base/model/entity/yszx/TbYsRy.java  |  110 +
 .../base/model/entity/yszx/TbYsRyBq.java      |   61 +
 .../base/model/entity/yszx/TbYsRyDh.java      |   50 +
 .../mosty/base/model/entity/yszx/TbYsSxt.java |  133 +
 .../base/model/entity/yszx/TbYsSxtGl.java     |   72 +
 .../base/model/entity/yszx/TbYsXsaj.java      |  117 +
 .../model/entity/yszx/TbYsXsxzajWffzry.java   |  107 +
 .../base/model/entity/yszx/TbYsXzaj.java      |  117 +
 .../query/afjcsj/VwSydwCyryPageQuery.java     |   25 +
 .../model/query/afjcsj/VwSydwJbxxGxQuery.java |   30 +
 .../query/afjcsj/VwSyrkJzgjGxListQuery.java   |   36 +
 .../model/query/afjcsj/VwSyrkJzgjGxQuery.java |   28 +
 .../model/query/base/GetMyMessageQuery.java   |   25 +
 .../model/query/base/GetSysDeptListQuery.java |  162 +
 .../base/model/query/base/SysDeptQuery.java   |   30 +
 .../model/query/bkzx/TbBkClSearchDto.java     |   42 +
 .../model/query/bkzx/TbBkRySearchDto.java     |   48 +
 .../base/model/query/hczx/HcTjQuery.java      |   30 +
 .../base/model/query/hczx/RyClTjQuery.java    |   25 +
 .../base/model/query/hczx/TbHcBpcclQuery.java |   94 +
 .../base/model/query/hczx/TbHcBpcryQuery.java |  103 +
 .../base/model/query/hczx/TbHcRyQuery.java    |   31 +
 .../model/query/hczx/TbHcRytzbqQuery.java     |   37 +
 .../model/query/hczx/TbHcTodayBpcclQuery.java |   33 +
 .../model/query/hczx/TbHcTodayBpcryQuery.java |   37 +
 .../model/query/jcgl/TbJcglAbfcQuery.java     |   43 +
 .../base/model/query/jcgl/TbJcglBqQuery.java  |   45 +
 .../base/model/query/jcgl/TbJcglBxdQuery.java |   49 +
 .../base/model/query/jcgl/TbJcglBxxQuery.java |   48 +
 .../base/model/query/jcgl/TbJcglDsfQuery.java |   43 +
 .../model/query/jcgl/TbJcglJyqxQuery.java     |   37 +
 .../base/model/query/jcgl/TbJcglJzQuery.java  |   47 +
 .../base/model/query/jcgl/TbJcglKfdQuery.java |   51 +
 .../model/query/jcgl/TbJcglKhbmQuery.java     |   33 +
 .../model/query/jcgl/TbJcglKhmxQuery.java     |   30 +
 .../model/query/jcgl/TbJcglKhtjQuery.java     |   61 +
 .../query/jcgl/TbJcglKhtjStatisticsQuery.java |   36 +
 .../model/query/jcgl/TbJcglShabllQuery.java   |   42 +
 .../model/query/jcgl/TbJcglXfCyryQuery.java   |   37 +
 .../model/query/jcgl/TbJcglXfDwglQuery.java   |   37 +
 .../model/query/jcgl/TbJcglXfNrmbQuery.java   |   31 +
 .../base/model/query/jcgl/TbJcglXfQuery.java  |   51 +
 .../model/query/jcgl/TbJcglXfRwQuery.java     |   31 +
 .../model/query/jcgl/TbJcglXfZgQuery.java     |   38 +
 .../model/query/jcgl/TbJcglXfclQuery.java     |   49 +
 .../model/query/jcgl/TbJcglXfclSbQuery.java   |   52 +
 .../model/query/jcgl/TbJcglXfllFzQuery.java   |   28 +
 .../model/query/jcgl/TbJcglXfllQuery.java     |   67 +
 .../query/jcgl/TbJcglXfllQueryAllDto.java     |   35 +
 .../model/query/jcgl/TbJcglXfqyQuery.java     |   48 +
 .../model/query/jcgl/TbJcglXfwgQuery.java     |   54 +
 .../model/query/jcgl/TbJcglXlfaQuery.java     |   50 +
 .../base/model/query/jcgl/TbJcglZjkQuery.java |   51 +
 .../model/query/jcgl/TbJcglZnzbQuery.java     |   49 +
 .../model/query/jcgl/TbJcglZyzbQuery.java     |   35 +
 .../base/model/query/jcgl/TbSjRzQuery.java    |   30 +
 .../base/model/query/jcgl/XfqyQuery.java      |   25 +
 .../query/qwzx/TbQwBmjlbbCountQuery.java      |   47 +
 .../model/query/qwzx/TbQwBmjlbbJlmxQuery.java |   39 +
 .../model/query/qwzx/TbQwBmjlbbQuery.java     |   58 +
 .../base/model/query/qwzx/TbQwFaQuery.java    |   30 +
 .../base/model/query/qwzx/TbQwJjrQuery.java   |   36 +
 .../model/query/qwzx/TbQwJmxzSearchDto.java   |   34 +
 .../base/model/query/qwzx/TbQwQwbcQuery.java  |   51 +
 .../base/model/query/qwzx/TbQwQwdjQuery.java  |   55 +
 .../base/model/query/qwzx/TbQwQxjMyQuery.java |   39 +
 .../base/model/query/qwzx/TbQwQxjQuery.java   |   60 +
 .../model/query/qwzx/TbQwSpsCsdwQuery.java    |   44 +
 .../model/query/qwzx/TbQwXfBxfsqQuery.java    |   74 +
 .../model/query/qwzx/TbQwXfbbJmxzQuery.java   |   59 +
 .../base/model/query/qwzx/TbQwXfbbQuery.java  |  122 +
 .../base/model/query/qwzx/TbQwXfpbQuery.java  |   64 +
 .../query/qwzx/TbQwXfpbSearchMyQuery.java     |   49 +
 .../base/model/query/qwzx/TbQwZbQuery.java    |   54 +
 .../base/model/query/qwzx/TbQwZbbbQuery.java  |   38 +
 .../base/model/query/qwzx/TbQwZbpbQuery.java  |   61 +
 .../query/qwzx/TbQwZbpbSearchMyQuery.java     |   46 +
 .../model/query/rwzx/TbRwTaskByYwidQuery.java |   34 +
 .../model/query/rwzx/TbRwTaskInnerQuery.java  |   78 +
 .../model/query/rwzx/TbRwTaskLogQuery.java    |   49 +
 .../query/rwzx/TbRwTaskMyInnerQuery.java      |   57 +
 .../model/query/rwzx/TbRwTaskMyQuery.java     |   50 +
 .../base/model/query/rwzx/TbRwTaskQuery.java  |   76 +
 .../model/query/rwzx/TbRwTaskUserQuery.java   |   57 +
 .../model/query/rzzx/TbRzDyjkQueryDto.java    |   44 +
 .../base/model/query/rzzx/TbRzHjQueryDto.java |   49 +
 .../model/query/rzzx/TbRzSpbfQueryDto.java    |   39 +
 .../model/query/rzzx/TbRzXtfkQueryDto.java    |   45 +
 .../base/model/query/sjzx/SearchDto.java      |   34 +
 .../base/model/query/sjzx/TbJqCjdbQuery.java  |   29 +
 .../base/model/query/sjzx/TbJqListQuery.java  |   71 +
 .../model/query/sjzx/TbJqPageListQuery.java   |   85 +
 .../base/model/query/sjzx/TbSjQuery.java      |   34 +
 .../base/model/query/sjzx/XfbbQuery.java      |   25 +
 .../base/model/query/sjzx/XfbbTjQuery.java    |   29 +
 .../base/model/query/sjzx/XftjJqlbQuery.java  |   39 +
 .../base/model/query/sjzx/XftjJwzQuery.java   |   30 +
 .../base/model/query/sjzx/XftjQuery.java      |   33 +
 .../base/model/query/sjzx/XftjXfllQuery.java  |   30 +
 .../base/model/query/sjzx/XftjYdzbQuery.java  |   32 +
 .../base/model/query/sjzx/YszxNyQuery.java    |   35 +
 .../base/model/query/sjzx/YszxQuery.java      |   36 +
 .../model/query/spxl/TbSpxlSpxlfaQuery.java   |   45 +
 .../query/trs/VwPersonVisitRecordQuery.java   |   40 +
 .../model/query/trs/VwPsPersonZyQuery.java    |   34 +
 .../model/query/wzzx/TbWzLswzSearchDto.java   |   31 +
 .../model/query/wzzx/TbWzRywzSearchDto.java   |   30 +
 .../model/query/wzzx/TbWzSbLswzSearchDto.java |   27 +
 .../model/query/wzzx/TbWzSswzSearchDto.java   |   31 +
 .../model/query/yjzl/TbYjDyyjxxQuery.java     |   57 +
 .../base/model/query/yjzl/TbYjmxCsbQuery.java |   36 +
 .../base/model/query/yjzl/TbYjmxQuery.java    |   37 +
 .../base/model/query/yjzl/TbYjqkQuery.java    |   25 +
 .../base/model/query/yjzl/TbYjxxClQuery.java  |   57 +
 .../model/query/yjzl/TbYjxxDypzQuery.java     |   46 +
 .../model/query/yjzl/TbYjxxDyyjxxQuery.java   |   55 +
 .../model/query/yjzl/TbYjxxNoPageQuery.java   |   68 +
 .../base/model/query/yjzl/TbYjxxQuery.java    |   83 +
 .../base/model/query/yjzl/TbYjxxRyQuery.java  |   50 +
 .../base/model/query/yjzl/TbYjxxSjQuery.java  |   52 +
 .../query/yjzl/TbYjxxStatisticsQuery.java     |   35 +
 .../model/query/yjzl/TbYjxxYjgjQuery.java     |   36 +
 .../query/yjzl/TbYjxxYjjbStatisticsQuery.java |   44 +
 .../base/model/query/yjzl/TbZlQuery.java      |   66 +
 .../base/model/query/yjzl/TbZlxxQuery.java    |   80 +
 .../model/query/yjzl/TbZlxxZxjlQuery.java     |   40 +
 .../base/model/query/yjzl/TbZxzbQuery.java    |   30 +
 .../model/query/yszx/TbYsAjNoPageQuery.java   |   52 +
 .../base/model/query/yszx/TbYsAjQuery.java    |   58 +
 .../base/model/query/yszx/TbYsDlQuery.java    |   52 +
 .../model/query/yszx/TbYsSxtNoPageQuery.java  |   61 +
 .../model/query/yszx/TbYsSxtPageOneQuery.java |   33 +
 .../base/model/query/yszx/TbYsSxtQuery.java   |   61 +
 .../mosty/base/model/vo/base/DeptInfoVo.java  |   56 +
 .../com/mosty/base/model/vo/hczx/BkclVo.java  |  117 +
 .../com/mosty/base/model/vo/hczx/BkryVo.java  |   88 +
 .../com/mosty/base/model/vo/hczx/ClpcVo.java  |   69 +
 .../com/mosty/base/model/vo/hczx/DqclVo.java  |  115 +
 .../base/model/vo/hczx/RepositoryVo.java      |   45 +
 .../mosty/base/model/vo/hczx/RxSearchVo.java  |   74 +
 .../base/model/vo/hczx/RyZpSearchVo.java      |   38 +
 .../com/mosty/base/model/vo/hczx/RypcVo.java  |  101 +
 .../mosty/base/model/vo/hczx/TbHcBpcclVo.java |  221 ++
 .../base/model/vo/hczx/TbHcBpcclWpVo.java     |   44 +
 .../mosty/base/model/vo/hczx/TbHcBpcryVo.java |  229 ++
 .../base/model/vo/hczx/TbHcBpcryWpVo.java     |   45 +
 .../mosty/base/model/vo/hczx/TbHcSydjVo.java  |   58 +
 .../mosty/base/model/vo/hczx/TbHcTpVo.java    |   42 +
 .../mosty/base/model/vo/hczx/XlpcRxbdVO.java  |   49 +
 .../mosty/base/model/vo/jcgl/TbJcglBqVo.java  |   81 +
 .../mosty/base/model/vo/jcgl/TbJcglDsfVo.java |   51 +
 .../base/model/vo/jcgl/TbJcglJzAllVo.java     |  109 +
 .../mosty/base/model/vo/jcgl/TbJcglJzVo.java  |   94 +
 .../base/model/vo/jcgl/TbJcglKhbmVo.java      |  163 +
 .../base/model/vo/jcgl/TbJcglKhmxVo.java      |  144 +
 .../base/model/vo/jcgl/TbJcglKhtjVo.java      |  280 ++
 .../base/model/vo/jcgl/TbJcglSbdwVo.java      |   69 +
 .../base/model/vo/jcgl/TbJcglXfllBqVo.java    |   53 +
 .../base/model/vo/jcgl/TbJcglXfllVo.java      |  132 +
 .../base/model/vo/jcgl/TbJcglXljlVo.java      |   43 +
 .../base/model/vo/jcgl/TbJcglZnzbVo.java      |  147 +
 .../mosty/base/model/vo/jcgl/TbJcglZyjz.java  |  144 +
 .../base/model/vo/lzother/TAlarmYjZlVo.java   |   95 +
 .../com/mosty/base/model/vo/qwzx/Gzqk.java    |   22 +
 .../base/model/vo/qwzx/TbQwBmjlbbCountVo.java |   51 +
 .../base/model/vo/qwzx/TbQwBmjlbbVo.java      |  133 +
 .../base/model/vo/qwzx/TbQwSpsCsdwVo.java     |   69 +
 .../base/model/vo/qwzx/TbQwSpsCsdwhdgjVo.java |   77 +
 .../base/model/vo/qwzx/TbQwXfbbBmtjVo.java    |   36 +
 .../base/model/vo/qwzx/TbQwXfbbBrtjVo.java    |   56 +
 .../base/model/vo/qwzx/TbQwXfpbZqMyVo.java    |  169 +
 .../base/model/vo/qwzx/TbQwXfpbZqVo.java      |  153 +
 .../base/model/vo/qwzx/TbQwZbCheckVo.java     |   35 +
 .../mosty/base/model/vo/qwzx/TbQwZbVo.java    |  152 +
 .../mosty/base/model/vo/qwzx/TbQwZbbbVo.java  |  171 +
 .../base/model/vo/qwzx/TbQwZbpbZqMyVo.java    |  151 +
 .../model/vo/rwzx/TbRwTaskLXStatisticsVo.java |   42 +
 .../base/model/vo/rwzx/TbRwTaskLogVo.java     |  106 +
 .../base/model/vo/rwzx/TbRwTaskMyVo.java      |  140 +
 .../base/model/vo/rwzx/TbRwTaskRankingVo.java |   36 +
 .../model/vo/rwzx/TbRwTaskStatisticsVo.java   |   36 +
 .../base/model/vo/rwzx/TbRwTaskUserVo.java    |   96 +
 .../mosty/base/model/vo/rwzx/TbRwTaskVo.java  |  151 +
 .../base/model/vo/sjzx/GeohashQuery.java      |   65 +
 .../com/mosty/base/model/vo/sjzx/TbJqVo.java  |  269 ++
 .../com/mosty/base/model/vo/trs/TrsToken.java |   24 +
 .../base/model/vo/trs/VwAlermYjzlVo.java      |  101 +
 .../model/vo/trs/VwPersonVisitRecordVo.java   |   74 +
 .../base/model/vo/wzzx/TbWzSblswzVo.java      |  149 +
 .../base/model/vo/xinzhi/GxAlarmAllVo.java    |  242 ++
 .../model/vo/yjzl/ForecastInterfaceVO.java    |   34 +
 .../base/model/vo/yjzl/ForecastResultsVO.java |   84 +
 .../mosty/base/model/vo/yjzl/TbFzJlVo.java    |   60 +
 .../mosty/base/model/vo/yjzl/TbFzycPzVo.java  |   51 +
 .../mosty/base/model/vo/yjzl/TbFzycVo.java    |   97 +
 .../base/model/vo/yjzl/TbFzycXljlVo.java      |   96 +
 .../mosty/base/model/vo/yjzl/TbYjmxAllVo.java |   59 +
 .../mosty/base/model/vo/yjzl/TbYjmxCsbVo.java |   37 +
 .../mosty/base/model/vo/yjzl/TbYjmxVo.java    |   60 +
 .../mosty/base/model/vo/yjzl/TbYjxxClVo.java  |  151 +
 .../base/model/vo/yjzl/TbYjxxDypzVo.java      |   93 +
 .../mosty/base/model/vo/yjzl/TbYjxxRyVo.java  |  179 ++
 .../mosty/base/model/vo/yjzl/TbYjxxSjVo.java  |  106 +
 .../base/model/vo/yjzl/TbYjzlZqtjVo.java      |   20 +
 .../base/model/vo/yjzl/TbYjzltjphVo.java      |   30 +
 .../base/model/vo/yjzl/TbYjzltjxxVo.java      |   21 +
 .../base/model/vo/yjzl/TbYzzlDjtjVo.java      |   18 +
 .../mosty/base/model/vo/yjzl/TbZlYjRyVo.java  |  255 ++
 .../base/model/vo/yjzl/TbZlxxInfoVo.java      |  198 ++
 .../mosty/base/model/vo/yjzl/TbZlxxVo.java    |  206 ++
 .../base/model/vo/yjzl/TbZlxxZxjlVo.java      |  123 +
 .../mosty/base/model/vo/yjzl/TbZlxxZxrVo.java |  169 +
 .../mosty/base/model/vo/yszx/TbYsAjVo.java    |  110 +
 .../mosty/base/model/vo/yszx/TbYsDlDto.java   |   88 +
 .../mosty/base/model/vo/yszx/TbYsDlQuery.java |   55 +
 .../mosty/base/model/vo/yszx/TbYsDlVo.java    |  110 +
 .../base/model/vo/yszx/TbYsGajgGlbmVo.java    |   71 +
 .../base/model/vo/yszx/TbYsGajgQuery.java     |   59 +
 .../mosty/base/model/vo/yszx/TbYsGajgVo.java  |  129 +
 .../base/model/vo/yszx/TbYsRyBqUpdateDto.java |   34 +
 .../mosty/base/model/vo/yszx/TbYsRyBqVo.java  |   55 +
 .../base/model/vo/yszx/TbYsRyDhUpdateDto.java |   32 +
 .../mosty/base/model/vo/yszx/TbYsRyDhVo.java  |   52 +
 .../mosty/base/model/vo/yszx/TbYsRyVo.java    |  109 +
 .../mosty/base/utils/BeanConvertUtils.java    |   30 +
 .../com/mosty/base/utils/BoundingBox.java     |  306 ++
 .../mosty/base/utils/CameraPreviewUtil.java   |   53 +
 .../java/com/mosty/base/utils/Constant.java   |  109 +
 .../mosty/base/utils/CoordinateTransform.java |  182 ++
 .../java/com/mosty/base/utils/DateUtils.java  |  884 ++++++
 .../com/mosty/base/utils/DecimalUtils.java    |  251 ++
 .../com/mosty/base/utils/DistanceUtils.java   |  179 ++
 .../java/com/mosty/base/utils/DoubleUtil.java |   17 +
 .../java/com/mosty/base/utils/GeoHash.java    |  549 ++++
 .../java/com/mosty/base/utils/GeoHashKit.java |  139 +
 .../java/com/mosty/base/utils/IDCardUtil.java |  208 ++
 .../java/com/mosty/base/utils/JtsUtils.java   |  243 ++
 .../main/java/com/mosty/base/utils/Kit.java   |  226 ++
 .../com/mosty/base/utils/OkHttpUtils.java     |  389 +++
 .../java/com/mosty/base/utils/PageUtils.java  |   32 +
 .../com/mosty/base/utils/PingYinUtil.java     |   95 +
 .../com/mosty/base/utils/PositionUtil.java    |  197 ++
 .../mosty/base/utils/SystemFiledsAddUtil.java |   40 +
 .../com/mosty/base/utils/UUIDGenerator.java   |   41 +
 .../java/com/mosty/base/utils/WGS84Point.java |   65 +
 .../java/com/mosty/base/utils/getPinYin.java  |   48 +
 .../utils/mongo/core/constant/ECompare.java   |   21 +
 .../mongo/core/constant/EConditionType.java   |   14 +
 .../utils/mongo/core/constant/ESortType.java  |   14 +
 .../utils/mongo/core/entity/Condition.java    |   90 +
 .../base/utils/mongo/core/entity/Page.java    |   65 +
 .../utils/mongo/core/entity/SelectField.java  |   30 +
 .../mongo/core/entity/SortCondition.java      |   46 +
 .../mongo/core/sdk/EasyMongoService.java      |  125 +
 .../utils/mongo/core/sdk/base/Compare.java    |  205 ++
 .../base/utils/mongo/core/sdk/base/Func.java  |   76 +
 .../utils/mongo/core/sdk/base/Nested.java     |   41 +
 .../utils/mongo/core/sdk/base/SFunction.java  |   17 +
 .../mongo/core/wrapper/ConditionWrapper.java  |   93 +
 .../core/wrapper/LambdaQueryWrapper.java      |  205 ++
 .../utils/mongo/core/wrapper/Wrappers.java    |   15 +
 .../mongo/exception/EasyMongoException.java   |   22 +
 .../base/utils/mongo/utils/ArrayUtils.java    |   35 +
 .../base/utils/mongo/utils/ClassUtil.java     |  100 +
 .../base/utils/mongo/utils/ConvertUtil.java   |   81 +
 .../utils/mongo/utils/ExceptionUtils.java     |   47 +
 .../base/utils/mongo/utils/StringUtils.java   |   40 +
 .../src/main/resources/rebel.xml              |   16 +
 .../src/resources/META-INF/spring.factories   |    2 +
 feign-client-api/pom.xml                      |   23 +
 mosty-base/mosty-base.iml                     |  268 ++
 mosty-base/pom.xml                            |  154 +
 .../com/mosty/base/MostyBaseApplication.java  |   34 +
 .../com/mosty/base/config/FeignConfig.java    |   23 +
 .../mosty/base/config/GlobalYmlConfig.java    |   30 +
 .../com/mosty/base/config/WebMvcConfig.java   |  137 +
 .../mosty/base/controller/DeptController.java |  145 +
 .../base/controller/OtherController.java      |  131 +
 .../controller/SysConfigNewController.java    |   36 +
 .../base/controller/SysMessageController.java |   44 +
 .../base/controller/UserConfigController.java |   56 +
 .../base/controller/UserDeptController.java   |   70 +
 .../base/controller/UserInfoController.java   |   43 +
 .../main/java/com/mosty/base/manager/img.png  |  Bin 0 -> 164826 bytes
 .../com/mosty/base/manager/package-info.java  |    7 +
 .../com/mosty/base/mapper/DeptMapper.java     |   14 +
 .../mosty/base/mapper/GajgSearchMapper.java   |   30 +
 .../base/mapper/SysMessageInfoMapper.java     |   14 +
 .../base/mapper/SysMessageItemMapper.java     |   14 +
 .../com/mosty/base/mapper/TbOrgMapper.java    |   10 +
 .../com/mosty/base/mapper/TbUserMapper.java   |   10 +
 .../mosty/base/mapper/UserConfigMapper.java   |   10 +
 .../com/mosty/base/mapper/UserDeptMapper.java |   22 +
 .../com/mosty/base/service/DeptService.java   |   64 +
 .../mosty/base/service/GajgSearchService.java |   19 +
 .../base/service/SysConfigNewService.java     |    9 +
 .../mosty/base/service/SysMessageService.java |   20 +
 .../mosty/base/service/UserConfigService.java |   13 +
 .../mosty/base/service/UserDeptService.java   |   34 +
 .../mosty/base/service/UserInfoService.java   |   15 +
 .../base/service/impl/DeptServiceImpl.java    |  726 +++++
 .../service/impl/GajgSearchServiceImpl.java   |   44 +
 .../service/impl/SysConfigNewServiceImpl.java |   67 +
 .../service/impl/SysMessageServiceImpl.java   |   88 +
 .../service/impl/UserConfigServiceImpl.java   |  135 +
 .../service/impl/UserDeptServiceImpl.java     |  241 ++
 .../service/impl/UserInfoServiceImpl.java     |   31 +
 .../java/com/mosty/base/utils/HttpUtils.java  |  584 ++++
 .../com/mosty/base/utils/Sminfo_return.java   |   51 +
 .../main/java/com/mosty/base/utils/XML.java   |   38 +
 .../com/mosty/base/utils/XStreamUtil.java     |  122 +
 ...itional-spring-configuration-metadata.json |    8 +
 mosty-base/src/main/resources/application.yml |  132 +
 mosty-base/src/main/resources/bootstrap.yml   |   40 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../src/main/resources/mapper/DeptMapper.xml  |   23 +
 .../resources/mapper/GajgSearchMapper.xml     |   99 +
 mosty-base/src/main/resources/rebel.xml       |   16 +
 mosty-bkzx/mosty-bkzx.iml                     |  273 ++
 mosty-bkzx/pom.xml                            |  104 +
 .../com/mosty/bkzx/MostyBkzxApplication.java  |   29 +
 .../com/mosty/bkzx/config/FeignConfig.java    |   23 +
 .../mosty/bkzx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/bkzx/config/WebMvcConfig.java   |  120 +
 .../bkzx/controller/TbBkClController.java     |   95 +
 .../bkzx/controller/TbBkDbController.java     |  118 +
 .../bkzx/controller/TbBkRyController.java     |   95 +
 .../mosty/bkzx/controller/XdxxController.java |   65 +
 .../com/mosty/bkzx/mapper/TbBkClMapper.java   |   15 +
 .../com/mosty/bkzx/mapper/TbBkDbMapper.java   |    9 +
 .../com/mosty/bkzx/mapper/TbBkRyMapper.java   |   15 +
 .../com/mosty/bkzx/mapper/XdxxMapper.java     |   35 +
 .../CreateAndUpdateMetaObjectHandler.java     |  118 +
 .../bkzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../bkzx/remote/TbBaseAdaptRemoteService.java |   68 +
 .../com/mosty/bkzx/service/TbBkClService.java |   42 +
 .../com/mosty/bkzx/service/TbBkDbService.java |   99 +
 .../com/mosty/bkzx/service/TbBkRyService.java |   42 +
 .../mosty/bkzx/service/ThridBkService.java    |  195 ++
 .../com/mosty/bkzx/service/XdxxService.java   |   26 +
 .../bkzx/service/impl/TbBkClServiceImpl.java  |  242 ++
 .../bkzx/service/impl/TbBkDbServiceImpl.java  |  467 +++
 .../bkzx/service/impl/TbBkRyServiceImpl.java  |  281 ++
 .../bkzx/service/impl/XdxxServiceImpl.java    |   79 +
 .../mosty/bkzx/sjjs/client/AccountUtils.java  |  103 +
 .../mosty/bkzx/sjjs/client/HttpClient.java    |  271 ++
 .../mosty/bkzx/sjjs/client/TokenClient.java   |   44 +
 .../bkzx/sjjs/domain/ResponseStatusList.java  |   39 +
 .../com/mosty/bkzx/sjjs/dto/CustomInfo.java   |   52 +
 .../com/mosty/bkzx/sjjs/dto/DHDateDto.java    |   15 +
 .../bkzx/sjjs/dto/DHUpVIASDataClassTabs.java  |   19 +
 .../bkzx/sjjs/dto/DispositionObjectDto.java   |  170 +
 .../mosty/bkzx/sjjs/dto/FaceObjectDTO.java    |  100 +
 .../bkzx/sjjs/dto/MotorVehicleObject.java     |   42 +
 .../bkzx/sjjs/dto/ResponseStatusObject.java   |   15 +
 .../mosty/bkzx/sjjs/dto/SubImageListDTO.java  |   46 +
 .../bkzx/sjjs/entity/DataClassTabObject.java  |   42 +
 .../mosty/bkzx/sjjs/entity/Dispositions.java  |  148 +
 .../java/com/mosty/bkzx/sjjs/entity/Face.java |   48 +
 .../mosty/bkzx/sjjs/entity/FaceObject.java    |   15 +
 .../mosty/bkzx/sjjs/entity/MotorVehic.java    |   36 +
 .../mosty/bkzx/sjjs/enums/DHDataTypeEnum.java |   17 +
 .../bkzx/sjjs/enums/DHOperateTypeENum.java    |   15 +
 .../mosty/bkzx/sjjs/vo/AuthorizeOneVo.java    |   35 +
 .../mosty/bkzx/sjjs/vo/AuthorizeTwoVo.java    |   41 +
 .../com/mosty/bkzx/sjjs/vo/CustomInfoVo.java  |   38 +
 .../com/mosty/bkzx/sjjs/vo/FaceObject.java    |   23 +
 .../mosty/bkzx/sjjs/vo/FaceObjectList.java    |   31 +
 .../com/mosty/bkzx/sjjs/vo/FaceObjectVo.java  |   21 +
 .../com/mosty/bkzx/sjjs/vo/FacePicture.java   |   32 +
 .../mosty/bkzx/sjjs/vo/FaceRepository.java    |   34 +
 .../bkzx/sjjs/vo/FaceRepositoryInfo.java      |   81 +
 .../bkzx/sjjs/vo/FaceRepositoryUser.java      |   81 +
 .../com/mosty/bkzx/sjjs/vo/ImageList.java     |   43 +
 .../mosty/bkzx/sjjs/vo/PersonIdentify.java    |   32 +
 .../bkzx/sjjs/vo/PersonIdentifyObject.java    |  213 ++
 .../sjjs/vo/PersonIdentifyResultObject.java   |   24 +
 .../mosty/bkzx/sjjs/vo/RepositoryUser.java    |   97 +
 .../bkzx/sjjs/vo/SubImageInfoObject.java      |   18 +
 .../com/mosty/bkzx/sjjs/vo/SubImageList.java  |   23 +
 .../com/mosty/bkzx/sjjs/vo/VehicleCar.java    |  106 +
 .../java/com/mosty/bkzx/utlis/MD5Util.java    |  162 +
 .../com/mosty/bkzx/utlis/OkHttpUtils.java     |  389 +++
 mosty-bkzx/src/main/resources/application.yml |   75 +
 mosty-bkzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../src/main/resources/mapper/XdxxMapper.xml  |  151 +
 mosty-bkzx/src/main/resources/rebel.xml       |   16 +
 mosty-dyga-cloud.iml                          |   12 +
 mosty-gateway/mosty-gateway.iml               |  164 +
 mosty-gateway/pom.xml                         |  122 +
 .../base/gateway/MostyGatewayApplication.java |   26 +
 .../gateway/filter/FilterOrderConstant.java   |   14 +
 .../mosty/base/gateway/filter/JwtFilter.java  |   84 +
 ...itional-spring-configuration-metadata.json |   13 +
 .../src/main/resources/application.yml        |    5 +
 .../src/main/resources/bootstrap.yml          |  141 +
 mosty-gateway/src/main/resources/rebel.xml    |   16 +
 mosty-hczx/mosty-hczx.iml                     |  273 ++
 mosty-hczx/pom.xml                            |  105 +
 .../com/mosty/hczx/MostyHczxApplication.java  |   31 +
 .../com/mosty/hczx/config/FeignConfig.java    |   23 +
 .../mosty/hczx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/hczx/config/WebMvcConfig.java   |  120 +
 .../hczx/controller/SseHcController.java      |   64 +
 .../hczx/controller/TbHcBpcclController.java  |  123 +
 .../hczx/controller/TbHcBpcryController.java  |  194 ++
 .../hczx/controller/TbHcDtgzController.java   |   39 +
 .../hczx/controller/TbHcRytzbqController.java |   41 +
 .../hczx/controller/TbHcSydjController.java   |   63 +
 .../mosty/hczx/mapper/TbHcBpcclBqMapper.java  |   10 +
 .../mosty/hczx/mapper/TbHcBpcclMapper.java    |   58 +
 .../mosty/hczx/mapper/TbHcBpcclWpMapper.java  |   14 +
 .../mosty/hczx/mapper/TbHcBpcryBqMapper.java  |   15 +
 .../mosty/hczx/mapper/TbHcBpcryMapper.java    |   56 +
 .../hczx/mapper/TbHcBpcryTzbqMapper.java      |   14 +
 .../mosty/hczx/mapper/TbHcBpcryWpMapper.java  |   14 +
 .../com/mosty/hczx/mapper/TbHcDtgzMapper.java |   10 +
 .../mosty/hczx/mapper/TbHcRytzbqMapper.java   |   14 +
 .../com/mosty/hczx/mapper/TbHcSydjMapper.java |   10 +
 .../com/mosty/hczx/mapper/TbHcTpMapper.java   |   14 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../hczx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../hczx/remote/TbBaseAdaptRemoteService.java |   74 +
 .../hczx/remote/TbJcglAdaptRemoteService.java |   46 +
 .../remote/TbLzotherAdapRemoteService.java    |   61 +
 .../hczx/remote/TbYszxAdapRemoteService.java  |   66 +
 .../service/Impl/TbHcBpcclServiceImpl.java    |  607 ++++
 .../service/Impl/TbHcBpcryServiceImpl.java    | 1137 +++++++
 .../service/Impl/TbHcDtgzServiceImpl.java     |   51 +
 .../service/Impl/TbHcRytzbqServiceImpl.java   |   48 +
 .../service/Impl/TbHcSydjServiceImpl.java     |  122 +
 .../mosty/hczx/service/TbHcBpcclService.java  |   50 +
 .../mosty/hczx/service/TbHcBpcryService.java  |   84 +
 .../mosty/hczx/service/TbHcDtgzService.java   |   14 +
 .../mosty/hczx/service/TbHcRytzbqService.java |   21 +
 .../mosty/hczx/service/TbHcSydjServer.java    |   17 +
 .../com/mosty/hczx/utils/HttpClientUtils.java |  560 ++++
 .../java/com/mosty/hczx/utils/ImageUtils.java |  307 ++
 .../com/mosty/hczx/utils/JacksonUtils.java    |  204 ++
 .../java/com/mosty/hczx/utils/MD5Utils.java   |   87 +
 .../mosty/hczx/utils/MyX509TrustManager.java  |   22 +
 .../java/com/mosty/hczx/utils/PinYinUtil.java |   91 +
 .../com/mosty/hczx/utils/StringUtils.java     | 1105 +++++++
 mosty-hczx/src/main/resources/application.yml |   75 +
 mosty-hczx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../main/resources/mapper/TbHcBpcclMapper.xml |  566 ++++
 .../main/resources/mapper/TbHcBpcryMapper.xml |  568 ++++
 mosty-hczx/src/main/resources/rebel.xml       |   16 +
 mosty-jcgl/mosty-jcgl.iml                     |  273 ++
 mosty-jcgl/pom.xml                            |  109 +
 .../base/manager/MostyJcglApplication.java    |   30 +
 .../base/manager/config/FeignConfig.java      |   23 +
 .../base/manager/config/GlobalYmlConfig.java  |   25 +
 .../base/manager/config/WebMvcConfig.java     |  122 +
 .../controller/TbJcglAbfcController.java      |   70 +
 .../controller/TbJcglBqController.java        |  161 +
 .../controller/TbJcglBxdController.java       |   73 +
 .../controller/TbJcglBxxController.java       |   66 +
 .../controller/TbJcglDsfController.java       |   90 +
 .../controller/TbJcglJwzController.java       |   66 +
 .../controller/TbJcglJyqxController.java      |  134 +
 .../controller/TbJcglJzController.java        |   91 +
 .../controller/TbJcglKfdController.java       |   86 +
 .../controller/TbJcglKhbmController.java      |   63 +
 .../controller/TbJcglKhmxController.java      |   75 +
 .../controller/TbJcglKhtjController.java      |  187 ++
 .../controller/TbJcglPzfzController.java      |   73 +
 .../controller/TbJcglShabllController.java    |   69 +
 .../controller/TbJcglXfController.java        |  140 +
 .../controller/TbJcglXfCyryController.java    |  115 +
 .../controller/TbJcglXfDwglController.java    |  115 +
 .../controller/TbJcglXfNrmbController.java    |  118 +
 .../controller/TbJcglXfZgController.java      |  118 +
 .../controller/TbJcglXfclController.java      |  100 +
 .../controller/TbJcglXfclSbController.java    |   72 +
 .../controller/TbJcglXfllController.java      |  333 ++
 .../controller/TbJcglXfllFzController.java    |   88 +
 .../controller/TbJcglXfqyController.java      |  107 +
 .../controller/TbJcglXfwgController.java      |   75 +
 .../controller/TbJcglXlfaController.java      |   68 +
 .../controller/TbJcglXljlController.java      |   68 +
 .../controller/TbJcglZjkController.java       |   73 +
 .../controller/TbSbGzjrController.java        |   74 +
 .../controller/TpJcglZbflController.java      |   68 +
 .../controller/TpjcglZnzbController.java      |  174 ++
 .../controller/VwSydwJbxxGxController.java    |   61 +
 .../controller/VwSyrkJzgjGxController.java    |   72 +
 .../base/manager/mapper/TbJcglAbfcMapper.java |   16 +
 .../base/manager/mapper/TbJcglBqMapper.java   |   43 +
 .../base/manager/mapper/TbJcglBxdMapper.java  |   32 +
 .../base/manager/mapper/TbJcglBxxMapper.java  |   36 +
 .../base/manager/mapper/TbJcglDsfMapper.java  |   10 +
 .../base/manager/mapper/TbJcglJwzMapper.java  |   21 +
 .../base/manager/mapper/TbJcglJyqxMapper.java |   14 +
 .../base/manager/mapper/TbJcglJzClMapper.java |   29 +
 .../manager/mapper/TbJcglJzJyqxMapper.java    |   32 +
 .../base/manager/mapper/TbJcglJzMapper.java   |   38 +
 .../base/manager/mapper/TbJcglJzRyMapper.java |   32 +
 .../manager/mapper/TbJcglJzZnzbMapper.java    |   26 +
 .../base/manager/mapper/TbJcglKfdMapper.java  |   35 +
 .../base/manager/mapper/TbJcglKhbmMapper.java |   24 +
 .../base/manager/mapper/TbJcglKhmxMapper.java |   11 +
 .../base/manager/mapper/TbJcglKhtjMapper.java |   25 +
 .../base/manager/mapper/TbJcglPzfzMapper.java |   26 +
 .../manager/mapper/TbJcglShabllMapper.java    |   14 +
 .../manager/mapper/TbJcglXfCyryMapper.java    |   10 +
 .../manager/mapper/TbJcglXfDwglMapper.java    |   10 +
 .../base/manager/mapper/TbJcglXfMapper.java   |   19 +
 .../manager/mapper/TbJcglXfNrmbMapper.java    |   10 +
 .../base/manager/mapper/TbJcglXfRwMapper.java |   10 +
 .../base/manager/mapper/TbJcglXfZgMapper.java |   10 +
 .../base/manager/mapper/TbJcglXfclMapper.java |   15 +
 .../manager/mapper/TbJcglXfclSbMapper.java    |   10 +
 .../manager/mapper/TbJcglXfllFzMapper.java    |   10 +
 .../base/manager/mapper/TbJcglXfllMapper.java |   42 +
 .../manager/mapper/TbJcglXfllbqMapper.java    |   15 +
 .../base/manager/mapper/TbJcglXfqyMapper.java |   54 +
 .../base/manager/mapper/TbJcglXfwgMapper.java |   22 +
 .../base/manager/mapper/TbJcglXlfaMapper.java |   14 +
 .../manager/mapper/TbJcglXlfaXldwMapper.java  |   26 +
 .../base/manager/mapper/TbJcglXljlMapper.java |   10 +
 .../base/manager/mapper/TbJcglYbfjMapper.java |    8 +
 .../base/manager/mapper/TbJcglZbjlMapper.java |   10 +
 .../base/manager/mapper/TbJcglZjkMapper.java  |   25 +
 .../base/manager/mapper/TbSbGzjrMapper.java   |   10 +
 .../base/manager/mapper/TpJcglZbflMapper.java |   16 +
 .../base/manager/mapper/TpjcglZnzbMapper.java |   32 +
 .../mapper/VwShareStMhJgxxbGxMapper.java      |   14 +
 .../VwShareStShzyJtKyqcgpxxGxMapper.java      |   14 +
 .../mapper/VwShareStTlLksmdpGxMapper.java     |   14 +
 .../manager/mapper/VwSydwCyryGxMapper.java    |   12 +
 .../manager/mapper/VwSydwJbxxGxMapper.java    |   26 +
 .../manager/mapper/VwSyrkJzgjGxMapper.java    |   24 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../mybatisplus/MybatisPlusConfig.java        |   29 +
 .../remote/TbBaseAdaptRemoteService.java      |  175 ++
 .../remote/TbHczxAdaptRemoteService.java      |   60 +
 .../remote/TbQwzxAdaptRemoteService.java      |   46 +
 .../remote/TbYjzlAdaptRrmoteService.java      |   46 +
 .../remote/TbYsZxAdaptRemoteService.java      |   93 +
 .../manager/service/TbJcglAbfcService.java    |   27 +
 .../base/manager/service/TbJcglBqService.java |   72 +
 .../manager/service/TbJcglBxdService.java     |   31 +
 .../manager/service/TbJcglBxxService.java     |   27 +
 .../manager/service/TbJcglDsfService.java     |   39 +
 .../manager/service/TbJcglJwzService.java     |   19 +
 .../manager/service/TbJcglJyqxService.java    |   37 +
 .../base/manager/service/TbJcglJzService.java |   40 +
 .../manager/service/TbJcglKfdService.java     |   30 +
 .../manager/service/TbJcglKhbmService.java    |   27 +
 .../manager/service/TbJcglKhmxService.java    |   61 +
 .../manager/service/TbJcglKhtjService.java    |   28 +
 .../manager/service/TbJcglPzfzService.java    |   30 +
 .../manager/service/TbJcglShabllService.java  |   32 +
 .../manager/service/TbJcglXfCyryService.java  |   24 +
 .../manager/service/TbJcglXfDwglService.java  |   22 +
 .../manager/service/TbJcglXfNrmbService.java  |   22 +
 .../manager/service/TbJcglXfRwService.java    |   22 +
 .../base/manager/service/TbJcglXfService.java |   29 +
 .../manager/service/TbJcglXfZgService.java    |   24 +
 .../manager/service/TbJcglXfclSbService.java  |   32 +
 .../manager/service/TbJcglXfclService.java    |   29 +
 .../manager/service/TbJcglXfllBqService.java  |   14 +
 .../manager/service/TbJcglXfllFzService.java  |    8 +
 .../manager/service/TbJcglXfllService.java    |   82 +
 .../manager/service/TbJcglXfqyService.java    |   47 +
 .../manager/service/TbJcglXfwgService.java    |   34 +
 .../manager/service/TbJcglXlfaService.java    |   30 +
 .../manager/service/TbJcglXljlService.java    |   25 +
 .../manager/service/TbJcglZbjlService.java    |   11 +
 .../manager/service/TbJcglZjkService.java     |   34 +
 .../base/manager/service/TbSbGzjrService.java |   29 +
 .../manager/service/TpJcglZbflService.java    |   20 +
 .../manager/service/TpjcglZnzbService.java    |   65 +
 .../manager/service/VwSydwJbxxGxService.java  |   31 +
 .../manager/service/VwSyrkJzgjGxService.java  |   29 +
 .../service/impl/TbJcglAbfcServiceImpl.java   |   59 +
 .../service/impl/TbJcglBqServiceImpl.java     |  161 +
 .../service/impl/TbJcglBxdServiceImpl.java    |  194 ++
 .../service/impl/TbJcglBxxServiceImpl.java    |  168 +
 .../service/impl/TbJcglDsfServiceImpl.java    |  110 +
 .../service/impl/TbJcglJwzServiceImpl.java    |  154 +
 .../service/impl/TbJcglJyqxServiceImpl.java   |  383 +++
 .../service/impl/TbJcglJzServiceImpl.java     |  347 +++
 .../service/impl/TbJcglKfdServiceImpl.java    |  304 ++
 .../service/impl/TbJcglKhbmServiceImpl.java   |  114 +
 .../service/impl/TbJcglKhmxServiceImpl.java   |  135 +
 .../service/impl/TbJcglKhtjServiceImpl.java   |  342 ++
 .../service/impl/TbJcglPzfzServiceImpl.java   |   98 +
 .../service/impl/TbJcglShabllServiceImpl.java |  101 +
 .../service/impl/TbJcglXfCyryServiceImpl.java |  144 +
 .../service/impl/TbJcglXfDwglServiceImpl.java |  110 +
 .../service/impl/TbJcglXfNrmbServiceImpl.java |   93 +
 .../service/impl/TbJcglXfRwServiceImpl.java   |  111 +
 .../service/impl/TbJcglXfServiceImpl.java     |  130 +
 .../service/impl/TbJcglXfZgServiceImpl.java   |  112 +
 .../service/impl/TbJcglXfclSbServiceImpl.java |   77 +
 .../service/impl/TbJcglXfclServiceImpl.java   |  264 ++
 .../service/impl/TbJcglXfllBqServiceImpl.java |   29 +
 .../service/impl/TbJcglXfllFzServiceImpl.java |   15 +
 .../service/impl/TbJcglXfllServiceImpl.java   |  549 ++++
 .../service/impl/TbJcglXfqyServiceImpl.java   |  415 +++
 .../service/impl/TbJcglXfwgServiceImpl.java   |  194 ++
 .../service/impl/TbJcglXlfaServiceImpl.java   |  175 ++
 .../service/impl/TbJcglXljlServiceImpl.java   |   48 +
 .../service/impl/TbJcglZbjlServiceImpl.java   |   23 +
 .../service/impl/TbJcglZjkServiceImpl.java    |  101 +
 .../service/impl/TbSbGzjrServiceImpl.java     |   80 +
 .../service/impl/TpJcglZbflServiceImpl.java   |  192 ++
 .../service/impl/TpjcglZnzbServiceImpl.java   |  711 +++++
 .../service/impl/VwSydwJbxxGxServiceImpl.java |   90 +
 .../service/impl/VwSyrkJzgjGxServiceImpl.java |   76 +
 .../base/manager/task/TbJcglDsfTask.java      |   30 +
 .../base/manager/task/TbJcglJxkhTask.java     |   37 +
 .../base/manager/task/TbJcglZnzbTxTask.java   |   32 +
 mosty-jcgl/src/main/resources/application.yml |   77 +
 mosty-jcgl/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../resources/mapper/SysDeptRemoteService.xml |   11 +
 .../resources/mapper/TbJcglAbfcMapper.xml     |   62 +
 .../main/resources/mapper/TbJcglBqMapper.xml  |   52 +
 .../main/resources/mapper/TbJcglBxdMapper.xml |  149 +
 .../main/resources/mapper/TbJcglBxxMapper.xml |  232 ++
 .../main/resources/mapper/TbJcglJwzMapper.xml |  144 +
 .../resources/mapper/TbJcglJyqxMapper.xml     |   13 +
 .../resources/mapper/TbJcglJzClMapper.xml     |   16 +
 .../resources/mapper/TbJcglJzJyqxMapper.xml   |   15 +
 .../main/resources/mapper/TbJcglJzMapper.xml  |  132 +
 .../resources/mapper/TbJcglJzRyMapper.xml     |   16 +
 .../resources/mapper/TbJcglJzTxzbMapper.xml   |   16 +
 .../main/resources/mapper/TbJcglKfdMapper.xml |  312 ++
 .../resources/mapper/TbJcglKhbmMapper.xml     |   79 +
 .../resources/mapper/TbJcglKhtjMapper.xml     |  149 +
 .../resources/mapper/TbJcglPzfzMapper.xml     |   67 +
 .../main/resources/mapper/TbJcglXfMapper.xml  |   25 +
 .../resources/mapper/TbJcglXfllMapper.xml     |  442 +++
 .../resources/mapper/TbJcglXfqyMapper.xml     |  343 ++
 .../resources/mapper/TbJcglXfwgMapper.xml     |  133 +
 .../resources/mapper/TbJcglXlfaXldwMapper.xml |  181 ++
 .../resources/mapper/TbJcglZbflMapper.xml     |   15 +
 .../main/resources/mapper/TbJcglZjkMapper.xml |   13 +
 .../resources/mapper/TbJcglZnzbMapper.xml     |  146 +
 .../mapper/VwShareStMhJgxxbGxMapper.xml       |  168 +
 .../VwShareStShzyJtKyqcgpxxGxMapper.xml       |   65 +
 .../mapper/VwShareStTlLksmdpGxMapper.xml      |   32 +
 .../resources/mapper/VwSydwCyryGxMapper.xml   |   97 +
 .../resources/mapper/VwSydwJbxxGxMapper.xml   |  135 +
 .../resources/mapper/VwSyrkJzgjGxMapper.xml   |   35 +
 mosty-jcgl/src/main/resources/rebel.xml       |   16 +
 mosty-other/mosty-other.iml                   |  264 ++
 mosty-other/pom.xml                           |  149 +
 .../lzother/MostyLzotherApplication.java      |   21 +
 .../com/mosty/lzother/config/FeignConfig.java |   27 +
 .../mosty/lzother/config/GlobalYmlConfig.java |   25 +
 .../mosty/lzother/config/WebMvcConfig.java    |  120 +
 .../controller/VLz110TxjController.java       |   62 +
 .../com/mosty/lzother/mapper/CzxxMapper.java  |   10 +
 .../com/mosty/lzother/mapper/FkdbMapper.java  |   10 +
 .../com/mosty/lzother/mapper/JjdbMapper.java  |   10 +
 .../lzother/mapper/RhMyhtWarnMapper.java      |   10 +
 .../remote/TbBaseAdaptRemoteService.java      |  136 +
 .../remote/TbSjzxAdaptRemoteService.java      |  107 +
 .../remote/TbYjzlAdaptRemoteService.java      |   78 +
 .../remote/TbYsZxAdaptRemoteService.java      |   69 +
 .../lzother/service/VLz110TxjService.java     |   22 +
 .../service/impl/VLz110TxjServiceImpl.java    |  181 ++
 .../com/mosty/lzother/task/SyncJqTask.java    |   46 +
 .../com/mosty/lzother/utils/ArthenaTest.java  |   56 +
 .../com/mosty/lzother/utils/OkHttpUtils.java  |  403 +++
 .../java/com/mosty/lzother/utils/RSAUtil.java |  278 ++
 .../src/main/resources/application.yml        |   55 +
 mosty-other/src/main/resources/bootstrap.yml  |   24 +
 .../src/main/resources/logback-spring.xml     |  114 +
 mosty-qwzx/mosty-qwzx.iml                     |  273 ++
 mosty-qwzx/pom.xml                            |  108 +
 .../com/mosty/qwzx/MostyQwzxApplication.java  |   32 +
 .../com/mosty/qwzx/config/FeignConfig.java    |   23 +
 .../mosty/qwzx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/qwzx/config/WebMvcConfig.java   |  120 +
 .../qwzx/controller/QwzxQwlbController.java   |   40 +
 .../controller/QwzxStatisticsController.java  |  279 ++
 .../qwzx/controller/TbQwBmjlbbController.java |   89 +
 .../qwzx/controller/TbQwFaController.java     |  114 +
 .../qwzx/controller/TbQwJjrController.java    |   80 +
 .../qwzx/controller/TbQwQwbcController.java   |   96 +
 .../qwzx/controller/TbQwQwdjController.java   |  106 +
 .../qwzx/controller/TbQwQxjController.java    |   92 +
 .../controller/TbQwSpsCsdwController.java     |   58 +
 .../controller/TbQwXfBxfsqController.java     |   90 +
 .../qwzx/controller/TbQwXfbbController.java   |  348 +++
 .../qwzx/controller/TbQwXfpbController.java   |  158 +
 .../qwzx/controller/TbQwZbbbController.java   |  123 +
 .../qwzx/controller/TbQwZbpbController.java   |  146 +
 .../com/mosty/qwzx/mapper/QwzxQwlbMapper.java |   20 +
 .../qwzx/mapper/QwzxStatisticsMapper.java     |  133 +
 .../qwzx/mapper/TbQwBmjlbbJlmxMapper.java     |   28 +
 .../mosty/qwzx/mapper/TbQwBmjlbbMapper.java   |   29 +
 .../com/mosty/qwzx/mapper/TbQwClMapper.java   |   40 +
 .../com/mosty/qwzx/mapper/TbQwFaMapper.java   |   10 +
 .../com/mosty/qwzx/mapper/TbQwJjrMapper.java  |   19 +
 .../com/mosty/qwzx/mapper/TbQwJlMapper.java   |   57 +
 .../com/mosty/qwzx/mapper/TbQwJyqxMapper.java |   40 +
 .../com/mosty/qwzx/mapper/TbQwQwbcMapper.java |   17 +
 .../com/mosty/qwzx/mapper/TbQwQwdjMapper.java |   28 +
 .../com/mosty/qwzx/mapper/TbQwQxjMapper.java  |   29 +
 .../mosty/qwzx/mapper/TbQwSpsCsdwMapper.java  |   14 +
 .../qwzx/mapper/TbQwSpsCsdwhdgjMapper.java    |   15 +
 .../mosty/qwzx/mapper/TbQwXfBxfsqMapper.java  |   17 +
 .../com/mosty/qwzx/mapper/TbQwXfbbMapper.java |  125 +
 .../com/mosty/qwzx/mapper/TbQwXffwMapper.java |   13 +
 .../com/mosty/qwzx/mapper/TbQwXfpbMapper.java |   38 +
 .../mosty/qwzx/mapper/TbQwXfpbMrjlMapper.java |   26 +
 .../mosty/qwzx/mapper/TbQwXfpbZqMapper.java   |   33 +
 .../com/mosty/qwzx/mapper/TbQwZbbbMapper.java |   32 +
 .../com/mosty/qwzx/mapper/TbQwZbpbMapper.java |   38 +
 .../mosty/qwzx/mapper/TbQwZbpbMrjlMapper.java |   26 +
 .../mosty/qwzx/mapper/TbQwZbpbZqMapper.java   |   31 +
 .../com/mosty/qwzx/mapper/TbQwZnzbMapper.java |   40 +
 .../mosty/qwzx/mapper/TbQwxfbbDkMapper.java   |   10 +
 .../CreateAndUpdateMetaObjectHandler.java     |  118 +
 .../qwzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../qwzx/remote/TbBaseAdaptRemoteService.java |  197 ++
 .../qwzx/remote/TbJcglAdaptRemoteService.java |  106 +
 .../remote/TbLzotherAdaptRemoteService.java   |   39 +
 .../qwzx/remote/TbRwzxAdaptRemoteService.java |   57 +
 .../remote/TbWebSocketAdaptRemoteService.java |   42 +
 .../qwzx/remote/TbYszxAdaptRemoteService.java |   50 +
 .../mosty/qwzx/service/QwzxQwlbService.java   |   17 +
 .../qwzx/service/QwzxStatisticsService.java   |  121 +
 .../mosty/qwzx/service/TbQwBmjlbbService.java |   40 +
 .../com/mosty/qwzx/service/TbQwFaService.java |   22 +
 .../mosty/qwzx/service/TbQwJjrService.java    |   27 +
 .../mosty/qwzx/service/TbQwQwbcService.java   |   43 +
 .../mosty/qwzx/service/TbQwQwdjService.java   |   44 +
 .../mosty/qwzx/service/TbQwQxjService.java    |   38 +
 .../qwzx/service/TbQwSpsCsdwService.java      |   23 +
 .../qwzx/service/TbQwXfBxfsqService.java      |   33 +
 .../mosty/qwzx/service/TbQwXfbbService.java   |  155 +
 .../mosty/qwzx/service/TbQwXfpbService.java   |   72 +
 .../mosty/qwzx/service/TbQwZbbbService.java   |   54 +
 .../mosty/qwzx/service/TbQwZbpbService.java   |   62 +
 .../service/impl/QwzxQwlbServiceImpl.java     |   54 +
 .../impl/QwzxStatisticsServiceImpl.java       |  621 ++++
 .../service/impl/TbQwBmjlbbServiceImpl.java   |  512 +++
 .../qwzx/service/impl/TbQwFaServiceImpl.java  |  108 +
 .../qwzx/service/impl/TbQwJjrServiceImpl.java |   62 +
 .../service/impl/TbQwQwbcServiceImpl.java     |  165 +
 .../service/impl/TbQwQwdjServiceImpl.java     |  195 ++
 .../qwzx/service/impl/TbQwQxjServiceImpl.java |  324 ++
 .../service/impl/TbQwSpsCsdwServiceImpl.java  |  129 +
 .../service/impl/TbQwXfBxfsqServiceImpl.java  |  127 +
 .../service/impl/TbQwXfbbServiceImpl.java     | 1247 ++++++++
 .../service/impl/TbQwXfpbServiceImpl.java     | 1126 +++++++
 .../service/impl/TbQwZbbbServiceImpl.java     |  396 +++
 .../service/impl/TbQwZbpbServiceImpl.java     |  993 ++++++
 .../mosty/qwzx/task/TbQwBmjlbbSearchTask.java |   38 +
 .../com/mosty/qwzx/task/TbQwBmjlbbTask.java   |   40 +
 .../com/mosty/qwzx/task/TbQwJsbbTask.java     |   41 +
 .../com/mosty/qwzx/task/TbQwXfbbScTask.java   |   39 +
 .../com/mosty/qwzx/task/TbQwZbPbMrjlTask.java |   30 +
 .../mosty/qwzx/task/TbQwZbbbAndXfbbTask.java  |   31 +
 mosty-qwzx/src/main/resources/application.yml |   75 +
 mosty-qwzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../main/resources/mapper/QwzxQwlbMapper.xml  |   43 +
 .../resources/mapper/QwzxStatisticsMapper.xml | 1086 +++++++
 .../resources/mapper/TbQwBmjlbbJlmxMapper.xml |   20 +
 .../resources/mapper/TbQwBmjlbbMapper.xml     |  105 +
 .../main/resources/mapper/TbQwClMapper.xml    |   27 +
 .../main/resources/mapper/TbQwJjrMapper.xml   |   11 +
 .../main/resources/mapper/TbQwJlMapper.xml    |  561 ++++
 .../main/resources/mapper/TbQwJyqxMapper.xml  |   27 +
 .../main/resources/mapper/TbQwQwbcMapper.xml  |   12 +
 .../main/resources/mapper/TbQwQwdjMapper.xml  |   18 +
 .../main/resources/mapper/TbQwQxjMapper.xml   |   17 +
 .../resources/mapper/TbQwSpsCsdwMapper.xml    |    5 +
 .../mapper/TbQwSpsCsdwhdgjMapper.xml          |    5 +
 .../resources/mapper/TbQwXfBxfsqMapper.xml    |   12 +
 .../main/resources/mapper/TbQwXfbbMapper.xml  |  838 +++++
 .../main/resources/mapper/TbQwXffwMapper.xml  |    8 +
 .../main/resources/mapper/TbQwXfpbMapper.xml  |  107 +
 .../resources/mapper/TbQwXfpbMrjlMapper.xml   |   31 +
 .../resources/mapper/TbQwXfpbZqMapper.xml     |   68 +
 .../main/resources/mapper/TbQwZbbbMapper.xml  |  211 ++
 .../main/resources/mapper/TbQwZbpbMapper.xml  |  105 +
 .../resources/mapper/TbQwZbpbMrjlMapper.xml   |   29 +
 .../resources/mapper/TbQwZbpbZqMapper.xml     |   74 +
 .../main/resources/mapper/TbQwZnzbMapper.xml  |   29 +
 mosty-qwzx/src/main/resources/rebel.xml       |   16 +
 mosty-rwzx/mosty-rwzx.iml                     |  273 ++
 mosty-rwzx/pom.xml                            |  109 +
 .../com/mosty/rwzx/MostyRwzxApplication.java  |   31 +
 .../com/mosty/rwzx/config/FeignConfig.java    |   23 +
 .../mosty/rwzx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/rwzx/config/WebMvcConfig.java   |  120 +
 .../rwzx/controller/TbRwTaskController.java   |   42 +
 .../controller/TbRwTaskInnerController.java   |  201 ++
 .../mosty/rwzx/mapper/TbRwTaskLogMapper.java  |   13 +
 .../com/mosty/rwzx/mapper/TbRwTaskMapper.java |   68 +
 .../rwzx/mapper/TbRwTaskUserAllMapper.java    |   17 +
 .../mosty/rwzx/mapper/TbRwTaskUserMapper.java |   21 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../rwzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../rwzx/remote/TbBaseAdaptRemoteService.java |  123 +
 .../rwzx/remote/TbJcglAdaptRemoteService.java |   32 +
 .../rwzx/remote/TbQwzxAdaptRemoteService.java |   56 +
 .../Impl/TbRwTaskInnerServiceImpl.java        |  602 ++++
 .../service/Impl/TbRwTaskServiceImpl.java     |  571 ++++
 .../rwzx/service/TbRwTaskInnerService.java    |   43 +
 .../mosty/rwzx/service/TbRwTaskService.java   |   61 +
 .../com/mosty/rwzx/task/ChangeRwztTask.java   |   24 +
 mosty-rwzx/src/main/resources/application.yml |   75 +
 mosty-rwzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../resources/mapper/TbRwTaskLogMapper.xml    |   78 +
 .../main/resources/mapper/TbRwTaskMapper.xml  |  354 +++
 .../mapper/TbRwTaskUserAllMapper.xml          |   29 +
 .../resources/mapper/TbRwTaskUserMapper.xml   |   34 +
 mosty-rwzx/src/main/resources/rebel.xml       |   16 +
 mosty-rzzx/mosty-rzzx.iml                     |  273 ++
 mosty-rzzx/pom.xml                            |  104 +
 .../com/mosty/rzzx/MostyRzzxApplication.java  |   25 +
 .../com/mosty/rzzx/config/FeignConfig.java    |   23 +
 .../mosty/rzzx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/rzzx/config/WebMvcConfig.java   |  120 +
 .../controller/RzzxStatisticsController.java  |   69 +
 .../rzzx/controller/TbRzDyjkController.java   |   63 +
 .../rzzx/controller/TbRzHjController.java     |   62 +
 .../rzzx/controller/TbRzSpbfController.java   |   70 +
 .../rzzx/controller/TbRzXtfkController.java   |   70 +
 .../rzzx/mapper/RzzxStatisticsMapper.java     |   30 +
 .../com/mosty/rzzx/mapper/TbRzDyjkMapper.java |   15 +
 .../com/mosty/rzzx/mapper/TbRzHjMapper.java   |   14 +
 .../com/mosty/rzzx/mapper/TbRzSpbfMapper.java |   15 +
 .../com/mosty/rzzx/mapper/TbRzXtfkMapper.java |   16 +
 .../CreateAndUpdateMetaObjectHandler.java     |  118 +
 .../rzzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../rzzx/remote/TbBaseAdaptRemoteService.java |   53 +
 .../rzzx/service/RzzxStatisticsService.java   |   26 +
 .../mosty/rzzx/service/TbRzDyjkService.java   |   28 +
 .../com/mosty/rzzx/service/TbRzHjService.java |   28 +
 .../mosty/rzzx/service/TbRzSpbfService.java   |   29 +
 .../mosty/rzzx/service/TbRzXtfkService.java   |   30 +
 .../impl/RzzxStatisticsServiceImpl.java       |   71 +
 .../service/impl/TbRzDyjkServiceImpl.java     |   94 +
 .../rzzx/service/impl/TbRzHjServiceImpl.java  |   88 +
 .../service/impl/TbRzSpbfServiceImpl.java     |  105 +
 .../service/impl/TbRzXtfkServiceImpl.java     |  103 +
 mosty-rzzx/src/main/resources/application.yml |   76 +
 mosty-rzzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../resources/mapper/RzzxStatisticsMapper.xml |   69 +
 .../main/resources/mapper/TbRzXtfkMapper.xml  |   11 +
 mosty-rzzx/src/main/resources/rebel.xml       |   16 +
 mosty-sjzx/mosty-sjzx.iml                     |  271 ++
 mosty-sjzx/pom.xml                            |  114 +
 .../com/mosty/sjzx/MostySjzxApplication.java  |   29 +
 .../com/mosty/sjzx/config/FeignConfig.java    |   23 +
 .../mosty/sjzx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/sjzx/config/WebMvcConfig.java   |  120 +
 .../mosty/sjzx/controller/AyController.java   |   44 +
 .../mosty/sjzx/controller/SgfxController.java |  156 +
 .../sjzx/controller/TbCaseTypeController.java |   47 +
 .../mosty/sjzx/controller/TbJqController.java |  391 +++
 .../mosty/sjzx/controller/TbSjController.java |  119 +
 .../sjzx/controller/TbSjCyjlController.java   |   45 +
 .../sjzx/controller/TbSjRzController.java     |   51 +
 .../sjzx/controller/TbSjSpbfController.java   |   69 +
 .../mosty/sjzx/controller/XftjController.java |  143 +
 .../mosty/sjzx/controller/ZdgzController.java |   37 +
 .../mosty/sjzx/controller/ZtfxController.java |  107 +
 .../com/mosty/sjzx/mapper/SgfxMapper.java     |  163 +
 .../mosty/sjzx/mapper/TbCaseTypeMapper.java   |    9 +
 .../com/mosty/sjzx/mapper/TbJqAllMapper.java  |   13 +
 .../com/mosty/sjzx/mapper/TbJqCjdbMapper.java |   10 +
 .../com/mosty/sjzx/mapper/TbJqDzMapper.java   |   13 +
 .../com/mosty/sjzx/mapper/TbJqMapper.java     |  122 +
 .../com/mosty/sjzx/mapper/TbSjCyjlMapper.java |   29 +
 .../com/mosty/sjzx/mapper/TbSjDzMapper.java   |   17 +
 .../com/mosty/sjzx/mapper/TbSjMapper.java     |   33 +
 .../com/mosty/sjzx/mapper/TbSjRzMapper.java   |   14 +
 .../com/mosty/sjzx/mapper/TbSjSpbfMapper.java |   31 +
 .../com/mosty/sjzx/mapper/TbjqZxrMapper.java  |   14 +
 .../CreateAndUpdateMetaObjectHandler.java     |  118 +
 .../sjzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../sjzx/remote/TbBaseAdaptRemoteService.java |  100 +
 .../sjzx/remote/TbJcglAdaptRemoteService.java |   70 +
 .../remote/TbLzotherAdaptRemoteService.java   |   23 +
 .../sjzx/remote/TbQwzxAdaptRemoteService.java |   65 +
 .../remote/TbRzSpbfAdaptRemoteService.java    |   34 +
 .../sjzx/remote/TbSjzxAdaptRemoteService.java |   36 +
 .../remote/TbWebSocketAdaptRemoteService.java |   43 +
 .../sjzx/remote/TbYjxxAdaptRemoteService.java |   32 +
 .../sjzx/remote/TbYjzlAdaptRrmoteService.java |   76 +
 .../sjzx/remote/TbYszxAdapRemoteService.java  |   47 +
 .../com/mosty/sjzx/service/SgfxService.java   |  155 +
 .../mosty/sjzx/service/TbCaseTypeService.java |   22 +
 .../com/mosty/sjzx/service/TbJqService.java   |  162 +
 .../mosty/sjzx/service/TbSjCyjlService.java   |   19 +
 .../com/mosty/sjzx/service/TbSjRzService.java |   16 +
 .../com/mosty/sjzx/service/TbSjService.java   |   49 +
 .../mosty/sjzx/service/TbSjSpbfService.java   |   27 +
 .../sjzx/service/impl/DistanceRunnable.java   |   42 +
 .../sjzx/service/impl/SgfxServiceImpl.java    |  427 +++
 .../service/impl/TbCaseTypeServiceImpl.java   |   88 +
 .../sjzx/service/impl/TbJqServiceImpl.java    | 2070 ++++++++++++
 .../service/impl/TbSjCyjlServiceImpl.java     |   41 +
 .../sjzx/service/impl/TbSjRzServiceImpl.java  |   83 +
 .../sjzx/service/impl/TbSjServiceImpl.java    |  708 +++++
 .../service/impl/TbSjSpbfServiceImpl.java     |   63 +
 .../com/mosty/sjzx/service/impl/Test.java     |  198 ++
 .../com/mosty/sjzx/task/BxdCreateTask.java    |   33 +
 .../java/com/mosty/sjzx/task/TbJqTask.java    |   16 +
 mosty-sjzx/src/main/resources/application.yml |   77 +
 mosty-sjzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../src/main/resources/mapper/SgfxMapper.xml  |  740 +++++
 .../resources/mapper/TbCaseTypeMapper.xml     |    6 +
 .../main/resources/mapper/TbJqAllMapper.xml   |   30 +
 .../main/resources/mapper/TbJqDzMapper.xml    |   21 +
 .../src/main/resources/mapper/TbJqMapper.xml  |  969 ++++++
 .../main/resources/mapper/TbSjCyjlMapper.xml  |   91 +
 .../main/resources/mapper/TbSjDzMapper.xml    |   77 +
 .../src/main/resources/mapper/TbSjMapper.xml  |  281 ++
 .../main/resources/mapper/TbSjSpbfMapper.xml  |   59 +
 mosty-sjzx/src/main/resources/rebel.xml       |   16 +
 mosty-spxl/mosty-spxl.iml                     |  273 ++
 mosty-spxl/pom.xml                            |  103 +
 .../com/mosty/spxl/MostySpxlApplication.java  |   29 +
 .../com/mosty/spxl/config/FeignConfig.java    |   23 +
 .../mosty/spxl/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/spxl/config/WebMvcConfig.java   |  120 +
 .../controller/TbSpxlSpxlfaController.java    |   69 +
 .../controller/TbSpxlSpxlfaSxtController.java |   51 +
 .../mosty/spxl/mapper/TbSpxlSpxlfaMapper.java |   15 +
 .../spxl/mapper/TbSpxlSpxlfaSxtMapper.java    |   14 +
 .../spxl/mapper/TbSpxlSpxlfaSxtPzMapper.java  |   14 +
 .../spxl/mapper/TbSpxlSpxlfaSxtzMapper.java   |   14 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../spxl/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../spxl/remote/TbBaseAdaptRemoteService.java |   57 +
 .../spxl/service/TbSpxlSpxlfaService.java     |   32 +
 .../spxl/service/TbSpxlSpxlfaSxtService.java  |   25 +
 .../service/impl/TbSpxlSpxlfaServiceImpl.java |  107 +
 .../impl/TbSpxlSpxlfaSxtServiceImpl.java      |  188 ++
 mosty-spxl/src/main/resources/application.yml |   74 +
 mosty-spxl/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 mosty-spxl/src/main/resources/rebel.xml       |   16 +
 mosty-websocket/mosty-websocket.iml           |  259 ++
 mosty-websocket/pom.xml                       |  109 +
 .../websocket/MostyWebSocketApplication.java  |   24 +
 .../mosty/websocket/config/FeignConfig.java   |   23 +
 .../websocket/config/GlobalYmlConfig.java     |   25 +
 .../mosty/websocket/config/WebMvcConfig.java  |  120 +
 .../websocket/config/WebSocketConfig.java     |   18 +
 .../websocket/config/WebSocketServer.java     |  163 +
 .../controller/WebSocketController.java       |   35 +
 .../remote/TbBaseAdaptRemoteService.java      |   38 +
 .../websocket/service/WebSocketService.java   |   12 +
 .../service/impl/WebSocketServiceImpl.java    |   37 +
 .../src/main/resources/application.yml        |   63 +
 .../src/main/resources/bootstrap.yml          |   27 +
 .../src/main/resources/logback-spring.xml     |  114 +
 mosty-wzzx/mosty-wzzx.iml                     |  281 ++
 mosty-wzzx/pom.xml                            |  115 +
 .../com/mosty/wzzx/MostyWzzxApplication.java  |   31 +
 .../com/mosty/wzzx/config/FeignConfig.java    |   24 +
 .../mosty/wzzx/config/GlobalYmlConfig.java    |   25 +
 .../Listener/ApplicationEventListener.java    |   60 +
 .../com/mosty/wzzx/config/WebMvcConfig.java   |  120 +
 .../config/mongo/AbstractMongoConfigure.java  |   17 +
 .../config/mongo/AdminMongoConfigure.java     |   19 +
 .../controller/LocationInfoController.java    |  133 +
 .../wzzx/controller/TbWzRywzController.java   |  120 +
 .../wzzx/controller/TbWzSbsswzController.java |   92 +
 .../wzzx/controller/TbWzXfbbController.java   |   76 +
 .../wzzx/controller/TbWzXfwzController.java   |  106 +
 .../mosty/wzzx/controller/WzcxController.java |   57 +
 .../mosty/wzzx/controller/WztjController.java |  114 +
 .../com/mosty/wzzx/mapper/TbQwXfbbMapper.java |   28 +
 .../com/mosty/wzzx/mapper/TbQwZnzbMapper.java |   29 +
 .../com/mosty/wzzx/mapper/TbSjCyjlMapper.java |   27 +
 .../com/mosty/wzzx/mapper/TbWzLswzMapper.java |   22 +
 .../com/mosty/wzzx/mapper/TbWzRywzMapper.java |   38 +
 .../mosty/wzzx/mapper/TbWzSblswzMapper.java   |   36 +
 .../mosty/wzzx/mapper/TbWzSbsswzMapper.java   |   25 +
 .../com/mosty/wzzx/mapper/TbWzSswzMapper.java |   40 +
 .../com/mosty/wzzx/mapper/TbWzXfwzMapper.java |   48 +
 .../com/mosty/wzzx/mapper/WztjMapper.java     |   49 +
 .../com/mosty/wzzx/mapper/WzzxUserMapper.java |   26 +
 .../wzzx/mongodb/TbWzSblswzMongoService.java  |   10 +
 .../wzzx/mongodb/entity/TbWzSblswzMo.java     |  261 ++
 .../mongodb/impl/EasyMongoServiceImpl.java    |  179 ++
 .../wzzx/mongodb/impl/QueryBuildUtils.java    |  251 ++
 .../impl/TbWzSblswzMongoServiceImpl.java      |   11 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../wzzx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../wzzx/remote/TbBaseAdaptRemoteService.java |  105 +
 .../wzzx/remote/TbQwzxAdaptRemoteService.java |   56 +
 .../remote/TbWebSocketAdaptRemoteService.java |   33 +
 .../wzzx/remote/TbXfbbAdaptRemoteService.java |   39 +
 .../wzzx/remote/TbYjzlAdaptRemoteService.java |   60 +
 .../wzzx/service/LocationInfoService.java     |   19 +
 .../mosty/wzzx/service/TbQwXfbbService.java   |   22 +
 .../mosty/wzzx/service/TbQwZnzbService.java   |   14 +
 .../mosty/wzzx/service/TbSjCyjlService.java   |   24 +
 .../mosty/wzzx/service/TbWzLswzService.java   |   11 +
 .../mosty/wzzx/service/TbWzSblswzService.java |   11 +
 .../mosty/wzzx/service/TbWzSbsswzService.java |   14 +
 .../mosty/wzzx/service/TbWzSswzService.java   |   38 +
 .../mosty/wzzx/service/TbWzXfwzService.java   |   47 +
 .../com/mosty/wzzx/service/WztjService.java   |   55 +
 .../wzzx/service/WzzxSysUserService.java      |   13 +
 .../service/impl/LocationInfoServiceImpl.java |  413 +++
 .../service/impl/TbQwXfbbServiceImpl.java     |  207 ++
 .../service/impl/TbQwZnzbServiceImpl.java     |   21 +
 .../service/impl/TbSjCyjlServiceImpl.java     |   52 +
 .../service/impl/TbWzLswzServiceImpl.java     |  114 +
 .../service/impl/TbWzSblswzServiceImpl.java   |   47 +
 .../service/impl/TbWzSbsswzServiceImpl.java   |  244 ++
 .../service/impl/TbWzSswzServiceImpl.java     |  228 ++
 .../service/impl/TbWzXfwzServiceImpl.java     |  338 ++
 .../wzzx/service/impl/WztjServiceImpl.java    |  265 ++
 .../service/impl/WzzxSysUserServiceImpl.java  |   22 +
 .../mosty/wzzx/task/LocationCenterTask.java   |  113 +
 .../mosty/wzzx/task/LocationClearTask.java    |   60 +
 .../java/com/mosty/wzzx/udp/UdpLzEntity.java  |  201 ++
 .../com/mosty/wzzx/udp/UdpServerForLz.java    |  115 +
 mosty-wzzx/src/main/resources/application.yml |   93 +
 mosty-wzzx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../main/resources/mapper/TbQwXfbbMapper.xml  |  147 +
 .../main/resources/mapper/TbQwZnzbMapper.xml  |   16 +
 .../main/resources/mapper/TbSjCyjlMapper.xml  |  104 +
 .../main/resources/mapper/TbWzLswzMapper.xml  |   25 +
 .../main/resources/mapper/TbWzRywzMapper.xml  |  236 ++
 .../resources/mapper/TbWzSblswzMapper.xml     |   50 +
 .../resources/mapper/TbWzSbsswzMapper.xml     |   30 +
 .../main/resources/mapper/TbWzSswzMapper.xml  |  158 +
 .../main/resources/mapper/TbWzXfwzMapper.xml  |  559 ++++
 .../src/main/resources/mapper/WztjMapper.xml  |  295 ++
 .../main/resources/mapper/WzzxUserMapper.xml  |   44 +
 mosty-wzzx/src/main/resources/rebel.xml       |   16 +
 mosty-yjzl/mosty-yjzl.iml                     |  271 ++
 mosty-yjzl/pom.xml                            |  107 +
 .../com/mosty/yjzl/MostyYjzlApplication.java  |   30 +
 .../java/com/mosty/yjzl/cluster/Cluster.java  |   12 +
 .../mosty/yjzl/cluster/DistanceRunnable.java  |   38 +
 .../com/mosty/yjzl/cluster/NeighborDTO.java   |   37 +
 .../yjzl/cluster/NeighborDistanceDTO.java     |   24 +
 .../com/mosty/yjzl/cluster/PositionUtil.java  |  197 ++
 .../com/mosty/yjzl/cluster/WGS84Point.java    |   75 +
 .../com/mosty/yjzl/config/FeignConfig.java    |   23 +
 .../mosty/yjzl/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/yjzl/config/WebMvcConfig.java   |  120 +
 .../yjzl/controller/TbFzycController.java     |   82 +
 .../yjzl/controller/TbFzycPzController.java   |   49 +
 .../yjzl/controller/TbFzycXljlController.java |   80 +
 .../yjzl/controller/TbYjDyyjxxController.java |   50 +
 .../yjzl/controller/TbYjmxController.java     |   73 +
 .../yjzl/controller/TbYjmxCsbController.java  |   60 +
 .../yjzl/controller/TbYjxxClController.java   |   92 +
 .../yjzl/controller/TbYjxxController.java     |  175 ++
 .../yjzl/controller/TbYjxxDypzController.java |   68 +
 .../yjzl/controller/TbYjxxLzController.java   |   46 +
 .../yjzl/controller/TbYjxxRyController.java   |   84 +
 .../yjzl/controller/TbYjxxSjController.java   |   83 +
 .../yjzl/controller/TbZlxxController.java     |  246 ++
 .../yjzl/controller/TbZlxxtjController.java   |   69 +
 .../yjzl/controller/TbZxzbController.java     |   53 +
 .../controller/YjzlStatisticsController.java  |  237 ++
 .../controller/YjzxStatisticsController.java  |   60 +
 .../mosty/yjzl/mapper/TbFzycJsdxMapper.java   |   18 +
 .../com/mosty/yjzl/mapper/TbFzycMapper.java   |   25 +
 .../com/mosty/yjzl/mapper/TbFzycPzMapper.java |   18 +
 .../mosty/yjzl/mapper/TbFzycXfxzMapper.java   |   23 +
 .../mosty/yjzl/mapper/TbFzycXljlMapper.java   |   41 +
 .../mosty/yjzl/mapper/TbYjDyyjxxMapper.java   |   20 +
 .../mosty/yjzl/mapper/TbYjmxCsbMapper.java    |   13 +
 .../com/mosty/yjzl/mapper/TbYjmxMapper.java   |   18 +
 .../mosty/yjzl/mapper/TbYjxxClBqMapper.java   |   42 +
 .../com/mosty/yjzl/mapper/TbYjxxClMapper.java |   27 +
 .../yjzl/mapper/TbYjxxDypzClbqMapper.java     |   22 +
 .../yjzl/mapper/TbYjxxDypzGzyMapper.java      |   24 +
 .../mosty/yjzl/mapper/TbYjxxDypzMapper.java   |   27 +
 .../yjzl/mapper/TbYjxxDypzRybqMapper.java     |   31 +
 .../yjzl/mapper/TbYjxxDypzSjbqMapper.java     |   31 +
 .../yjzl/mapper/TbYjxxDypzYjjbMapper.java     |   31 +
 .../com/mosty/yjzl/mapper/TbYjxxMapper.java   |   71 +
 .../mosty/yjzl/mapper/TbYjxxMxyjMapper.java   |   27 +
 .../mosty/yjzl/mapper/TbYjxxRyBqMapper.java   |   40 +
 .../com/mosty/yjzl/mapper/TbYjxxRyMapper.java |   28 +
 .../mosty/yjzl/mapper/TbYjxxRySjajMapper.java |   40 +
 .../yjzl/mapper/TbYjxxSjGlryclMapper.java     |   40 +
 .../com/mosty/yjzl/mapper/TbYjxxSjMapper.java |   30 +
 .../mosty/yjzl/mapper/TbYjxxYjczjlMapper.java |   27 +
 .../com/mosty/yjzl/mapper/TbYjzltjMapper.java |   32 +
 .../com/mosty/yjzl/mapper/TbZlJqMapper.java   |   10 +
 .../com/mosty/yjzl/mapper/TbZlRgMapper.java   |   13 +
 .../mosty/yjzl/mapper/TbZlXlBxdMapper.java    |   18 +
 .../yjzl/mapper/TbZlXlBxdXljlMapper.java      |   18 +
 .../com/mosty/yjzl/mapper/TbZlXlMapper.java   |   18 +
 .../mosty/yjzl/mapper/TbZlYjClCnryMapper.java |   18 +
 .../com/mosty/yjzl/mapper/TbZlYjClMapper.java |   13 +
 .../com/mosty/yjzl/mapper/TbZlYjRyMapper.java |   14 +
 .../com/mosty/yjzl/mapper/TbZlYjSjMapper.java |   13 +
 .../com/mosty/yjzl/mapper/TbZlxxMapper.java   |   64 +
 .../mosty/yjzl/mapper/TbZlxxPcryclMapper.java |   18 +
 .../mosty/yjzl/mapper/TbZlxxZxjlMapper.java   |   30 +
 .../mosty/yjzl/mapper/TbZlxxZxrMapper.java    |   22 +
 .../com/mosty/yjzl/mapper/TbZxzbMapper.java   |   16 +
 .../yjzl/mapper/YjzlStatisticsMapper.java     |  145 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../yjzl/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../yjzl/remote/TbBaseAdaptRemoteService.java |  198 ++
 .../yjzl/remote/TbJcglAdaptRemoteService.java |   47 +
 .../yjzl/remote/TbQwzxAdaptRemoteService.java |   68 +
 .../yjzl/remote/TbRwzxAdaptRemoteService.java |   67 +
 .../yjzl/remote/TbSjzxAdaptRemoteService.java |   93 +
 .../remote/TbWebSocketAdaptRemoteService.java |   34 +
 .../yjzl/remote/TbYszxAdaptRemoteService.java |   91 +
 .../service/Impl/TbFzycPzServiceImpl.java     |   93 +
 .../yjzl/service/Impl/TbFzycServiceImpl.java  |  158 +
 .../service/Impl/TbFzycXljlServiceImpl.java   |  283 ++
 .../service/Impl/TbYjDyyjxxServiceImpl.java   |   69 +
 .../service/Impl/TbYjmxCsbServiceImpl.java    |   80 +
 .../yjzl/service/Impl/TbYjmxServiceImpl.java  |  149 +
 .../service/Impl/TbYjxxClServiceImpl.java     |  199 ++
 .../service/Impl/TbYjxxDypzServiceImpl.java   |  222 ++
 .../service/Impl/TbYjxxLzServiceImpl.java     | 1142 +++++++
 .../service/Impl/TbYjxxRyServiceImpl.java     |  225 ++
 .../yjzl/service/Impl/TbYjxxServiceImpl.java  | 1040 ++++++
 .../service/Impl/TbYjxxSjServiceImpl.java     |  214 ++
 .../service/Impl/TbYjzltjServiceImpl.java     |  168 +
 .../yjzl/service/Impl/TbZlxxServiceImpl.java  | 2774 +++++++++++++++++
 .../service/Impl/TbZlxxZxjlServiceImpl.java   |  360 +++
 .../yjzl/service/Impl/TbZxzbServiceImpl.java  |  382 +++
 .../Impl/YjzlStatisticsServiceImpl.java       |  578 ++++
 .../mosty/yjzl/service/TbFzycPzService.java   |   27 +
 .../com/mosty/yjzl/service/TbFzycService.java |   39 +
 .../mosty/yjzl/service/TbFzycXljlService.java |   33 +
 .../mosty/yjzl/service/TbYjDyyjxxService.java |   22 +
 .../mosty/yjzl/service/TbYjmxCsbService.java  |   39 +
 .../com/mosty/yjzl/service/TbYjmxService.java |   57 +
 .../mosty/yjzl/service/TbYjxxClService.java   |   59 +
 .../mosty/yjzl/service/TbYjxxDypzService.java |   26 +
 .../mosty/yjzl/service/TbYjxxLzService.java   |   15 +
 .../mosty/yjzl/service/TbYjxxRyService.java   |   59 +
 .../com/mosty/yjzl/service/TbYjxxService.java |   78 +
 .../mosty/yjzl/service/TbYjxxSjService.java   |   41 +
 .../mosty/yjzl/service/TbYjzltjService.java   |   25 +
 .../com/mosty/yjzl/service/TbZlxxService.java |   94 +
 .../mosty/yjzl/service/TbZlxxZxjlService.java |   68 +
 .../com/mosty/yjzl/service/TbZxzbService.java |   20 +
 .../yjzl/service/YjzlStatisticsService.java   |  117 +
 .../java/com/mosty/yjzl/task/LzFzycTask.java  |   26 +
 .../mosty/yjzl/task/LzYjxxRedisClearTask.java |   33 +
 .../com/mosty/yjzl/task/TbZlxxGqTask.java     |   25 +
 .../mosty/yjzl/third/YjzlThirdController.java |   80 +
 .../com/mosty/yjzl/utils/OkHttpUtils.java     |  400 +++
 .../com/mosty/yjzl/utils/YjAndZlRule.java     |  143 +
 mosty-yjzl/src/main/resources/application.yml |   78 +
 mosty-yjzl/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../src/main/resources/mapper/TbFzyc.xml      |   65 +
 .../src/main/resources/mapper/TbFzycXfxz.xml  |   18 +
 .../src/main/resources/mapper/TbFzycXljl.xml  |  226 ++
 .../resources/mapper/TbYjDyyjxxMapper.xml     |   13 +
 .../main/resources/mapper/TbYjmxCsbMapper.xml |    5 +
 .../main/resources/mapper/TbYjmxMapper.xml    |    6 +
 .../main/resources/mapper/TbYjmxMapperCsb.xml |    5 +
 .../resources/mapper/TbYjxxClBqMapper.xml     |   13 +
 .../main/resources/mapper/TbYjxxClMapper.xml  |   91 +
 .../resources/mapper/TbYjxxDypzClbqMapper.xml |   27 +
 .../resources/mapper/TbYjxxDypzGzyMapper.xml  |   27 +
 .../resources/mapper/TbYjxxDypzMapper.xml     |   13 +
 .../resources/mapper/TbYjxxDypzRybqMapper.xml |   27 +
 .../resources/mapper/TbYjxxDypzSjbqMapper.xml |   27 +
 .../resources/mapper/TbYjxxDypzYjjbMapper.xml |   27 +
 .../resources/mapper/TbYjxxDyyjxxMapper.xml   |   13 +
 .../main/resources/mapper/TbYjxxMapper.xml    |  633 ++++
 .../resources/mapper/TbYjxxMxyjMapper.xml     |  226 ++
 .../resources/mapper/TbYjxxRyBqMapper.xml     |   27 +
 .../main/resources/mapper/TbYjxxRyMapper.xml  |  115 +
 .../resources/mapper/TbYjxxRySjajMapper.xml   |   27 +
 .../resources/mapper/TbYjxxSjGlryclMapper.xml |   27 +
 .../main/resources/mapper/TbYjxxSjMapper.xml  |   76 +
 .../resources/mapper/TbYjxxYjczjlMapper.xml   |   13 +
 .../main/resources/mapper/TbZlJqMapper.xml    |  346 ++
 .../main/resources/mapper/TbZlRgMapper.xml    |  288 ++
 .../main/resources/mapper/TbZlXlBxdMapper.xml |  259 ++
 .../resources/mapper/TbZlXlBxdXljlMapper.xml  |   50 +
 .../main/resources/mapper/TbZlXlMapper.xml    |   62 +
 .../resources/mapper/TbZlYjClCnryMapper.xml   |  366 +++
 .../main/resources/mapper/TbZlYjClMapper.xml  |  340 ++
 .../main/resources/mapper/TbZlYjRyMapper.xml  |  375 +++
 .../main/resources/mapper/TbZlYjSjMapper.xml  |  277 ++
 .../main/resources/mapper/TbZlxxMapper.xml    |  594 ++++
 .../resources/mapper/TbZlxxPcryclMapper.xml   |    5 +
 .../resources/mapper/TbZlxxZxjlMapper.xml     |  176 ++
 .../main/resources/mapper/TbZlxxZxrMapper.xml |    9 +
 .../main/resources/mapper/TbZxzbMapper.xml    |    9 +
 .../main/resources/mapper/TbyjzktjMapper.xml  |  142 +
 .../resources/mapper/YjzlStatisticsMapper.xml | 1008 ++++++
 mosty-yjzl/src/main/resources/rebel.xml       |   16 +
 mosty-yszx/mosty-yszx.iml                     |  273 ++
 mosty-yszx/pom.xml                            |  120 +
 .../com/mosty/yszx/MostyYszxApplication.java  |   29 +
 .../com/mosty/yszx/config/FeignConfig.java    |   23 +
 .../mosty/yszx/config/GlobalYmlConfig.java    |   25 +
 .../com/mosty/yszx/config/WebMvcConfig.java   |  120 +
 .../yszx/controller/TbYsAjController.java     |   96 +
 .../yszx/controller/TbYsDlController.java     |   95 +
 .../yszx/controller/TbYsGajgController.java   |  132 +
 .../yszx/controller/TbYsRyController.java     |   77 +
 .../yszx/controller/TbYsSxtController.java    |  221 ++
 .../com/mosty/yszx/mapper/TbYsDlMapper.java   |   39 +
 .../mosty/yszx/mapper/TbYsGajgGlbmMapper.java |   18 +
 .../com/mosty/yszx/mapper/TbYsGajgMapper.java |   35 +
 .../com/mosty/yszx/mapper/TbYsRyBqMapper.java |   14 +
 .../com/mosty/yszx/mapper/TbYsRyDhMapper.java |   13 +
 .../com/mosty/yszx/mapper/TbYsRyMapper.java   |   10 +
 .../com/mosty/yszx/mapper/TbYsSxtMapper.java  |   46 +
 .../com/mosty/yszx/mapper/TbYsXsajMapper.java |   27 +
 .../com/mosty/yszx/mapper/TbYsXzajMapper.java |   40 +
 .../CreateAndUpdateMetaObjectHandler.java     |  117 +
 .../yszx/mybatisplus/MybatisPlusConfig.java   |   29 +
 .../yszx/remote/TbBaseAdaptRemoteService.java |   72 +
 .../yszx/remote/TbRwzxAdaptRemoteService.java |   56 +
 .../yszx/remote/TbSjzxAdaptRemoteService.java |   33 +
 .../com/mosty/yszx/service/TbYsAjService.java |   40 +
 .../com/mosty/yszx/service/TbYsDlService.java |   45 +
 .../mosty/yszx/service/TbYsGajgService.java   |   58 +
 .../com/mosty/yszx/service/TbYsRyService.java |   25 +
 .../mosty/yszx/service/TbYsSxtService.java    |   64 +
 .../yszx/service/impl/TbYsAjServiceImpl.java  |  229 ++
 .../yszx/service/impl/TbYsDlServiceImpl.java  |  238 ++
 .../service/impl/TbYsGajgServiceImpl.java     |  675 ++++
 .../yszx/service/impl/TbYsRyServiceImpl.java  |  134 +
 .../yszx/service/impl/TbYsSxtServiceImpl.java |  370 +++
 mosty-yszx/src/main/resources/application.yml |   75 +
 mosty-yszx/src/main/resources/bootstrap.yml   |   39 +
 .../src/main/resources/logback-spring.xml     |  114 +
 .../main/resources/mapper/TbYsDlMapper.xml    |  314 ++
 .../resources/mapper/TbYsGajgGlbmMapper.xml   |    8 +
 .../main/resources/mapper/TbYsGajgMapper.xml  |  371 +++
 .../main/resources/mapper/TbYsRyBqMapper.xml  |    8 +
 .../main/resources/mapper/TbYsRyDhMapper.xml  |    9 +
 .../main/resources/mapper/TbYsRyMapper.xml    |    5 +
 .../main/resources/mapper/TbYsSxtMapper.xml   |  369 +++
 .../main/resources/mapper/TbYsXsajMapper.xml  |  259 ++
 .../main/resources/mapper/TbYsXzajMapper.xml  |  418 +++
 mosty-yszx/src/main/resources/rebel.xml       |   16 +
 pom.xml                                       |   90 +
 1931 files changed, 163526 insertions(+)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
 create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
 create mode 100644 .idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_druid_1_1_10.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml
 create mode 100644 .idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml
 create mode 100644 .idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml
 create mode 100644 .idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml
 create mode 100644 .idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml
 create mode 100644 .idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml
 create mode 100644 .idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
 create mode 100644 .idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
 create mode 100644 .idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
 create mode 100644 .idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
 create mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
 create mode 100644 .idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml
 create mode 100644 .idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
 create mode 100644 .idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
 create mode 100644 .idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml
 create mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
 create mode 100644 .idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml
 create mode 100644 .idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
 create mode 100644 .idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml
 create mode 100644 .idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml
 create mode 100644 .idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
 create mode 100644 .idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
 create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
 create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
 create mode 100644 .idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml
 create mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
 create mode 100644 .idea/libraries/Maven__com_vividsolutions_jts_1_13.xml
 create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
 create mode 100644 .idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
 create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
 create mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
 create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
 create mode 100644 .idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
 create mode 100644 .idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
 create mode 100644 .idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml
 create mode 100644 .idea/libraries/Maven__commons_io_commons_io_1_3_2.xml
 create mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_2.xml
 create mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
 create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
 create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
 create mode 100644 .idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml
 create mode 100644 .idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml
 create mode 100644 .idea/libraries/Maven__io_minio_minio_8_0_3.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml
 create mode 100644 .idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml
 create mode 100644 .idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
 create mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
 create mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
 create mode 100644 .idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml
 create mode 100644 .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml
 create mode 100644 .idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml
 create mode 100644 .idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml
 create mode 100644 .idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
 create mode 100644 .idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
 create mode 100644 .idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml
 create mode 100644 .idea/libraries/Maven__javax_activation_activation_1_1.xml
 create mode 100644 .idea/libraries/Maven__javax_inject_javax_inject_1.xml
 create mode 100644 .idea/libraries/Maven__javax_mail_mail_1_4.xml
 create mode 100644 .idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
 create mode 100644 .idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
 create mode 100644 .idea/libraries/Maven__jaxen_jaxen_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__jdom_jdom_1_0.xml
 create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml
 create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml
 create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml
 create mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
 create mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml
 create mode 100644 .idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
 create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml
 create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_3_17.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
 create mode 100644 .idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml
 create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml
 create mode 100644 .idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
 create mode 100644 .idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml
 create mode 100644 .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
 create mode 100644 .idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
 create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
 create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml
 create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml
 create mode 100644 .idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml
 create mode 100644 .idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
 create mode 100644 .idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
 create mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
 create mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
 create mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
 create mode 100644 .idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
 create mode 100644 .idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
 create mode 100644 .idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml
 create mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
 create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_mongodb_bson_3_11_2.xml
 create mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml
 create mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml
 create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
 create mode 100644 .idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
 create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
 create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
 create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
 create mode 100644 .idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml
 create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
 create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml
 create mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
 create mode 100644 .idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
 create mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
 create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
 create mode 100644 .idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml
 create mode 100644 .idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml
 create mode 100644 .idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml
 create mode 100644 .idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml
 create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
 create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
 create mode 100644 .idea/libraries/Maven__stax_stax_api_1_0_1.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 feign-client-api/feign-client-api.iml
 create mode 100644 feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml
 create mode 100644 feign-client-api/mosty-base-feign-sdk/pom.xml
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKCSTypeEnum.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKDbTypeEnum.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BkTypeEnum.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/PlateClassEnum.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/FeignAutoConfiguration.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/OpenFeignLogConfig.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/WxMessageConverter.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/fallback/SysDeptRemoteServiceFallback.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/AbstractGeometryTypeHandler.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/LineStringTypeHandler.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PointTypeHandler.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PolygonTypeHandler.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyBaseFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyHczxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyJcglFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyLzotherFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyQwzxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRwzxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRzzxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostySjzxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyWebSocketFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYjzlFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYszxFeignService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BaseEntity.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BasePage.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GajgSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetDeptListDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetSsbmDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetYqListDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/RsHjyjSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysDeptDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfoInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItem.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItemInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClJudgeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbBkDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbUpDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyJudgeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkzxGXDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/XdxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcclSaveDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcrySaveDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Face.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Repository.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcclInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcryInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcDtgzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjSaveDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglAbfcDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBqDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBxxDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfJudgeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKfdDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKhbmEditPzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglPzfzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglShabllInsertAndEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfZgDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllSearchQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfqyDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfwgInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaXldwDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXljlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZnzbSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZyjzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/AppSearchQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbCountDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbJlmxDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBxfsqEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwClDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwFjjlBbDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJmllSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJyqxDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwMfjSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwbcEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQxjEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchJlqdDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchZgmfjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSpsHdgjChangeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkWzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbQueryByJlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbStartOrEndBbDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXffwDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbAddAndEditDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbZqDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbInsertOrUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbZqDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZnzbDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateByYwidDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateInnerDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateInnerDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskInnerDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserInnerDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzSpbfInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzXtfkInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/BxdCreatedDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/NeighborDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbCaseTypeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqGeohash.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqYjbjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjQcszDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjSpbfDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjUpdateJwdDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtPlayDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtzDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/websocket/WebSocketObject.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/AppLocationReceiveDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/LocationInfo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SjCyjlUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SswzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WzcxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WztjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/XfbbUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/CyjlSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/GetLastYjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/KafkaYjxxDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/MyZlSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/NewZxjlSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycXljlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxPageStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyNyStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyPageStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYyjStatisticsDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxPcryclInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeRygkDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxjlInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxrDtoInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/YjConvertZlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdMyZlSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdTbZlxxInsertDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdZlInfoSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/Cameras.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDelDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsDlDTO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgAndGlbmDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgByJwdDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgGlbmDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsRyDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsSxtDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStMhJgxxbGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStShzyJtKyqcgpxxGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStTlLksmdpGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwCyryGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwJbxxGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSyrkJzgjGx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbOrg.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbUser.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkCl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkDb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpccl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclWp.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcry.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryTzbq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryWp.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcDtgz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcRytzbq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcSydj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcTp.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglAbfc.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxd.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglDsf.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJwz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJyqx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzCl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzJyqx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzZnzb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKfd.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhbm.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhmx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhtj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglPzfz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglShabll.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXf.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfCyry.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfDwgl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfJl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfNrmb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfRw.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfZg.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfcl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfclSb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfll.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllFz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfqy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfwg.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfa.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfaXldw.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXljl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbfl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZjk.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZnzb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbSbGzjr.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/Ybfj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/BphJlxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/FKDB.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmBkxxRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmCkxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjZl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjgj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmZtry.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VJcxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VLz110Txj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/ZhjmxfXfqwXfqyGzdw.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbbJlmx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwCl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwFa.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJjr.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJyqx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwbc.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwdj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQxj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdw.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdwhdgj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfBxfsq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfbb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXffw.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbMrjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbZq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbbb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbMrjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbZq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZnzb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwxfbbDk.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rh/RhMyhtWarn.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rsother/CJDB.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTask.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskLog.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUser.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUserAll.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzDyjk.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzHj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzSpbf.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzXtfk.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbCaseType.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqAll.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqCjdb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqDz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqZxr.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjCyjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjDz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjRz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjSpbf.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfa.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxt.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtPz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjgl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzlUser.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPersonVisitRecord.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPsPersonZy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzLswz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzRywz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSblswz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSbsswz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSswz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzXfwz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Czxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAlarmAll.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxCjdb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Jjdb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yisa/LocationBase.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzyc.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycJsdx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycPz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXfxz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXljl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjDyyjxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmxCsb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxCl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxClBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzClbq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzGzy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzRybq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzSjbq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzYjjb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDyyjxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxMxyj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRyBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRySjaj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSjGlrycl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxYjczjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlJq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlRg.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxd.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxdXljl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjCl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjClCnry.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjSj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxx.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxPcrycl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxjl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxr.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZxzb.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsDl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajg.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajgGlbm.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRy.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyBq.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyDh.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxt.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxtGl.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsaj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsxzajWffzry.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXzaj.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwCyryPageQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwJbxxGxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxListQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetMyMessageQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetSysDeptListQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/SysDeptQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkClSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkRySearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/HcTjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/RyClTjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcclQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcryQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRytzbqQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcclQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcryQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglAbfcQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBqQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxdQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglDsfQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJyqxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKfdQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhbmQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhmxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjStatisticsQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglShabllQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfCyryQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfDwglQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfNrmbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfRwQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfZgQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclSbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllFzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQueryAllDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfqyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfwgQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXlfaQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZjkQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZnzbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZyzbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbSjRzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/XfqyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbCountQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbJlmxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwFaQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJjrQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJmxzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwbcQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwdjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjMyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwSpsCsdwQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfBxfsqQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbJmxzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbSearchMyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbbbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbSearchMyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskByYwidQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskInnerQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskLogQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyInnerQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskUserQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzDyjkQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzHjQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzSpbfQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzXtfkQueryDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/SearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqCjdbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqListQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqPageListQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbSjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbTjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJqlbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJwzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjXfllQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjYdzbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxNyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/spxl/TbSpxlSpxlfaQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPersonVisitRecordQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPsPersonZyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzLswzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzRywzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSbLswzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSswzSearchDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjDyyjxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxCsbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjqkQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxClQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDypzQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDyyjxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxNoPageQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxRyQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxSjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxStatisticsQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjgjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjjbStatisticsQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxZxjlQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZxzbQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjNoPageQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsDlQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtNoPageQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtPageOneQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/base/DeptInfoVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkclVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkryVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/ClpcVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/DqclVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RepositoryVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RxSearchVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RyZpSearchVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RypcVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclWpVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryWpVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcSydjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcTpVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/XlpcRxbdVO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglBqVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglDsfVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzAllVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhbmVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhmxVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhtjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglSbdwVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllBqVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXljlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZnzbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZyjz.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/lzother/TAlarmYjZlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/Gzqk.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbCountVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwhdgjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBmtjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBrtjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqMyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbCheckVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbbbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbpbZqMyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLXStatisticsVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLogVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskMyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskRankingVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskStatisticsVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskUserVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/GeohashQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/TbJqVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/TrsToken.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwAlermYjzlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwPersonVisitRecordVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/wzzx/TbWzSblswzVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/xinzhi/GxAlarmAllVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastInterfaceVO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastResultsVO.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzJlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycPzVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycXljlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxAllVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxCsbVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxClVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxDypzVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxRyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxSjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzlZqtjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjphVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjxxVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYzzlDjtjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlYjRyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxInfoVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxjlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxrVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsAjVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgGlbmVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgQuery.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhUpdateDto.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyVo.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BeanConvertUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BoundingBox.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CameraPreviewUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CoordinateTransform.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DateUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DecimalUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DistanceUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DoubleUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHash.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHashKit.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/IDCardUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/JtsUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Kit.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/OkHttpUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PageUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PingYinUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PositionUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/SystemFiledsAddUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/UUIDGenerator.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/WGS84Point.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/getPinYin.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ECompare.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/EConditionType.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ESortType.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Condition.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Page.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SelectField.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SortCondition.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/EasyMongoService.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Compare.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Func.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Nested.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/SFunction.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/ConditionWrapper.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/LambdaQueryWrapper.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/Wrappers.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/exception/EasyMongoException.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ArrayUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ClassUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ConvertUtil.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ExceptionUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/StringUtils.java
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/main/resources/rebel.xml
 create mode 100644 feign-client-api/mosty-base-feign-sdk/src/resources/META-INF/spring.factories
 create mode 100644 feign-client-api/pom.xml
 create mode 100644 mosty-base/mosty-base.iml
 create mode 100644 mosty-base/pom.xml
 create mode 100644 mosty-base/src/main/java/com/mosty/base/MostyBaseApplication.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/config/FeignConfig.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/config/GlobalYmlConfig.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/config/WebMvcConfig.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/DeptController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/OtherController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/SysConfigNewController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/SysMessageController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/UserConfigController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/UserDeptController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/controller/UserInfoController.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/manager/img.png
 create mode 100644 mosty-base/src/main/java/com/mosty/base/manager/package-info.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/DeptMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/GajgSearchMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/SysMessageInfoMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/SysMessageItemMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/TbOrgMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/TbUserMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/UserConfigMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/mapper/UserDeptMapper.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/DeptService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/GajgSearchService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/SysConfigNewService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/SysMessageService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/UserConfigService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/UserDeptService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/UserInfoService.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/DeptServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/GajgSearchServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/SysConfigNewServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/SysMessageServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/UserConfigServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/UserDeptServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/service/impl/UserInfoServiceImpl.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/utils/HttpUtils.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/utils/Sminfo_return.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/utils/XML.java
 create mode 100644 mosty-base/src/main/java/com/mosty/base/utils/XStreamUtil.java
 create mode 100644 mosty-base/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 mosty-base/src/main/resources/application.yml
 create mode 100644 mosty-base/src/main/resources/bootstrap.yml
 create mode 100644 mosty-base/src/main/resources/logback-spring.xml
 create mode 100644 mosty-base/src/main/resources/mapper/DeptMapper.xml
 create mode 100644 mosty-base/src/main/resources/mapper/GajgSearchMapper.xml
 create mode 100644 mosty-base/src/main/resources/rebel.xml
 create mode 100644 mosty-bkzx/mosty-bkzx.iml
 create mode 100644 mosty-bkzx/pom.xml
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/MostyBkzxApplication.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/config/FeignConfig.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/config/WebMvcConfig.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkClController.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkDbController.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkRyController.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/controller/XdxxController.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkClMapper.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkDbMapper.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkRyMapper.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/XdxxMapper.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkClService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkDbService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkRyService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/ThridBkService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/XdxxService.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkClServiceImpl.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkDbServiceImpl.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkRyServiceImpl.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/XdxxServiceImpl.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/AccountUtils.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/HttpClient.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/TokenClient.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/domain/ResponseStatusList.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/CustomInfo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHDateDto.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHUpVIASDataClassTabs.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DispositionObjectDto.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/FaceObjectDTO.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/MotorVehicleObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/ResponseStatusObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/SubImageListDTO.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/DataClassTabObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Dispositions.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Face.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/FaceObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/MotorVehic.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHDataTypeEnum.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHOperateTypeENum.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeOneVo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeTwoVo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/CustomInfoVo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectList.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectVo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FacePicture.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepository.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryInfo.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryUser.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/ImageList.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentify.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyResultObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/RepositoryUser.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageInfoObject.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageList.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/VehicleCar.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/MD5Util.java
 create mode 100644 mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/OkHttpUtils.java
 create mode 100644 mosty-bkzx/src/main/resources/application.yml
 create mode 100644 mosty-bkzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-bkzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-bkzx/src/main/resources/mapper/XdxxMapper.xml
 create mode 100644 mosty-bkzx/src/main/resources/rebel.xml
 create mode 100644 mosty-dyga-cloud.iml
 create mode 100644 mosty-gateway/mosty-gateway.iml
 create mode 100644 mosty-gateway/pom.xml
 create mode 100644 mosty-gateway/src/main/java/com/mosty/base/gateway/MostyGatewayApplication.java
 create mode 100644 mosty-gateway/src/main/java/com/mosty/base/gateway/filter/FilterOrderConstant.java
 create mode 100644 mosty-gateway/src/main/java/com/mosty/base/gateway/filter/JwtFilter.java
 create mode 100644 mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 mosty-gateway/src/main/resources/application.yml
 create mode 100644 mosty-gateway/src/main/resources/bootstrap.yml
 create mode 100644 mosty-gateway/src/main/resources/rebel.xml
 create mode 100644 mosty-hczx/mosty-hczx.iml
 create mode 100644 mosty-hczx/pom.xml
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/MostyHczxApplication.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/config/FeignConfig.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/config/GlobalYmlConfig.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/config/WebMvcConfig.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/SseHcController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcclController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcryController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcDtgzController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcRytzbqController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcSydjController.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclBqMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclWpMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryBqMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryTzbqMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryWpMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcDtgzMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcRytzbqMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcSydjMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcTpMapper.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/remote/TbJcglAdaptRemoteService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/remote/TbLzotherAdapRemoteService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/remote/TbYszxAdapRemoteService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcclServiceImpl.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcryServiceImpl.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcDtgzServiceImpl.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcRytzbqServiceImpl.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcSydjServiceImpl.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcclService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcryService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcDtgzService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcRytzbqService.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcSydjServer.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/HttpClientUtils.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/ImageUtils.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/JacksonUtils.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/MD5Utils.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/MyX509TrustManager.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/PinYinUtil.java
 create mode 100644 mosty-hczx/src/main/java/com/mosty/hczx/utils/StringUtils.java
 create mode 100644 mosty-hczx/src/main/resources/application.yml
 create mode 100644 mosty-hczx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-hczx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-hczx/src/main/resources/mapper/TbHcBpcclMapper.xml
 create mode 100644 mosty-hczx/src/main/resources/mapper/TbHcBpcryMapper.xml
 create mode 100644 mosty-hczx/src/main/resources/rebel.xml
 create mode 100644 mosty-jcgl/mosty-jcgl.iml
 create mode 100644 mosty-jcgl/pom.xml
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/MostyJcglApplication.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/config/FeignConfig.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/config/GlobalYmlConfig.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/config/WebMvcConfig.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglAbfcController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBqController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxdController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxxController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglDsfController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJwzController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJyqxController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJzController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKfdController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhbmController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhmxController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhtjController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglPzfzController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglShabllController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfCyryController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfDwglController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfNrmbController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfZgController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclSbController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllFzController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfqyController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfwgController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXlfaController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXljlController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglZjkController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbSbGzjrController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpJcglZbflController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpjcglZnzbController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSydwJbxxGxController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSyrkJzgjGxController.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglAbfcMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBqMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxdMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglDsfMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJwzMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJyqxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzClMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzJyqxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzRyMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzZnzbMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKfdMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhbmMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhmxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhtjMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglPzfzMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglShabllMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfCyryMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfDwglMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfNrmbMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfRwMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfZgMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclSbMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllFzMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllbqMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfqyMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfwgMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaXldwMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXljlMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglYbfjMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZbjlMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZjkMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbSbGzjrMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpJcglZbflMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpjcglZnzbMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStMhJgxxbGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStShzyJtKyqcgpxxGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStTlLksmdpGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwCyryGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwJbxxGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSyrkJzgjGxMapper.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbHczxAdaptRemoteService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbQwzxAdaptRemoteService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYjzlAdaptRrmoteService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYsZxAdaptRemoteService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglAbfcService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBqService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxdService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxxService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglDsfService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJwzService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJyqxService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJzService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKfdService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhbmService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhmxService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhtjService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglPzfzService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglShabllService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfCyryService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfDwglService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfNrmbService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfRwService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfZgService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclSbService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllBqService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllFzService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfqyService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfwgService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXlfaService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXljlService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZbjlService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZjkService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbSbGzjrService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpJcglZbflService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpjcglZnzbService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSydwJbxxGxService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSyrkJzgjGxService.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglAbfcServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBqServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxdServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxxServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglDsfServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJwzServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJyqxServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJzServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKfdServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhbmServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhmxServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhtjServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglPzfzServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglShabllServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfCyryServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfDwglServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfNrmbServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfRwServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfZgServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclSbServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllBqServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllFzServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfqyServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfwgServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXlfaServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXljlServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZbjlServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZjkServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbSbGzjrServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpJcglZbflServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpjcglZnzbServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSydwJbxxGxServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSyrkJzgjGxServiceImpl.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglDsfTask.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglJxkhTask.java
 create mode 100644 mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglZnzbTxTask.java
 create mode 100644 mosty-jcgl/src/main/resources/application.yml
 create mode 100644 mosty-jcgl/src/main/resources/bootstrap.yml
 create mode 100644 mosty-jcgl/src/main/resources/logback-spring.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/SysDeptRemoteService.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglAbfcMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglBqMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglBxdMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglBxxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJwzMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJyqxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJzClMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJzJyqxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJzMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJzRyMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglJzTxzbMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglKfdMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglKhbmMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglKhtjMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglPzfzMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglXfMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglXfllMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglXfqyMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglXfwgMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglXlfaXldwMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglZbflMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglZjkMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/TbJcglZnzbMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwShareStMhJgxxbGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwShareStShzyJtKyqcgpxxGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwShareStTlLksmdpGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwSydwCyryGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwSydwJbxxGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/mapper/VwSyrkJzgjGxMapper.xml
 create mode 100644 mosty-jcgl/src/main/resources/rebel.xml
 create mode 100644 mosty-other/mosty-other.iml
 create mode 100644 mosty-other/pom.xml
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/MostyLzotherApplication.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/config/FeignConfig.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/config/GlobalYmlConfig.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/config/WebMvcConfig.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/controller/VLz110TxjController.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/mapper/CzxxMapper.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/mapper/FkdbMapper.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/mapper/JjdbMapper.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/mapper/RhMyhtWarnMapper.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/remote/TbSjzxAdaptRemoteService.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/remote/TbYjzlAdaptRemoteService.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/remote/TbYsZxAdaptRemoteService.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/service/VLz110TxjService.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/service/impl/VLz110TxjServiceImpl.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/task/SyncJqTask.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/utils/ArthenaTest.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/utils/OkHttpUtils.java
 create mode 100644 mosty-other/src/main/java/com/mosty/lzother/utils/RSAUtil.java
 create mode 100644 mosty-other/src/main/resources/application.yml
 create mode 100644 mosty-other/src/main/resources/bootstrap.yml
 create mode 100644 mosty-other/src/main/resources/logback-spring.xml
 create mode 100644 mosty-qwzx/mosty-qwzx.iml
 create mode 100644 mosty-qwzx/pom.xml
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/MostyQwzxApplication.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/config/FeignConfig.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/config/WebMvcConfig.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxQwlbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxStatisticsController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwBmjlbbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwFaController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwJjrController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwbcController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwdjController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQxjController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwSpsCsdwController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfBxfsqController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfpbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbbbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbpbController.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxQwlbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxStatisticsMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbJlmxMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwClMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwFaMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJjrMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJlMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJyqxMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwbcMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwdjMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQxjMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwhdgjMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfBxfsqMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXffwMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMrjlMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbZqMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbbbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMrjlMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbZqMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZnzbMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwxfbbDkMapper.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbJcglAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbLzotherAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbRwzxAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbWebSocketAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbYszxAdaptRemoteService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxQwlbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxStatisticsService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwBmjlbbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwFaService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwJjrService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwbcService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwdjService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQxjService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwSpsCsdwService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfBxfsqService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfpbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbbbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbpbService.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxQwlbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxStatisticsServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwBmjlbbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwFaServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwJjrServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwbcServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwdjServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQxjServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwSpsCsdwServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfBxfsqServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfpbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbbbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbpbServiceImpl.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbSearchTask.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbTask.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwJsbbTask.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwXfbbScTask.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbPbMrjlTask.java
 create mode 100644 mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbbbAndXfbbTask.java
 create mode 100644 mosty-qwzx/src/main/resources/application.yml
 create mode 100644 mosty-qwzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-qwzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/QwzxQwlbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/QwzxStatisticsMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbJlmxMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwClMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwJjrMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwJlMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwJyqxMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwQwbcMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwQwdjMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwQxjMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwhdgjMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXfBxfsqMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXffwMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXfpbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXfpbMrjlMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwXfpbZqMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwZbbbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwZbpbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwZbpbMrjlMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwZbpbZqMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/mapper/TbQwZnzbMapper.xml
 create mode 100644 mosty-qwzx/src/main/resources/rebel.xml
 create mode 100644 mosty-rwzx/mosty-rwzx.iml
 create mode 100644 mosty-rwzx/pom.xml
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/MostyRwzxApplication.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/config/FeignConfig.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/config/WebMvcConfig.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskController.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskInnerController.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskLogMapper.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskMapper.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserAllMapper.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserMapper.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbJcglAdaptRemoteService.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbQwzxAdaptRemoteService.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskInnerServiceImpl.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskServiceImpl.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskInnerService.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskService.java
 create mode 100644 mosty-rwzx/src/main/java/com/mosty/rwzx/task/ChangeRwztTask.java
 create mode 100644 mosty-rwzx/src/main/resources/application.yml
 create mode 100644 mosty-rwzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-rwzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-rwzx/src/main/resources/mapper/TbRwTaskLogMapper.xml
 create mode 100644 mosty-rwzx/src/main/resources/mapper/TbRwTaskMapper.xml
 create mode 100644 mosty-rwzx/src/main/resources/mapper/TbRwTaskUserAllMapper.xml
 create mode 100644 mosty-rwzx/src/main/resources/mapper/TbRwTaskUserMapper.xml
 create mode 100644 mosty-rwzx/src/main/resources/rebel.xml
 create mode 100644 mosty-rzzx/mosty-rzzx.iml
 create mode 100644 mosty-rzzx/pom.xml
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/MostyRzzxApplication.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/config/FeignConfig.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/config/WebMvcConfig.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/controller/RzzxStatisticsController.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzDyjkController.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzHjController.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzSpbfController.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzXtfkController.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/RzzxStatisticsMapper.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzDyjkMapper.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzHjMapper.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzSpbfMapper.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzXtfkMapper.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/RzzxStatisticsService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzDyjkService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzHjService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzSpbfService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzXtfkService.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/RzzxStatisticsServiceImpl.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzDyjkServiceImpl.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzHjServiceImpl.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzSpbfServiceImpl.java
 create mode 100644 mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzXtfkServiceImpl.java
 create mode 100644 mosty-rzzx/src/main/resources/application.yml
 create mode 100644 mosty-rzzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-rzzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-rzzx/src/main/resources/mapper/RzzxStatisticsMapper.xml
 create mode 100644 mosty-rzzx/src/main/resources/mapper/TbRzXtfkMapper.xml
 create mode 100644 mosty-rzzx/src/main/resources/rebel.xml
 create mode 100644 mosty-sjzx/mosty-sjzx.iml
 create mode 100644 mosty-sjzx/pom.xml
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/MostySjzxApplication.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/config/FeignConfig.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/config/WebMvcConfig.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/AyController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/SgfxController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbCaseTypeController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbJqController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjCyjlController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjRzController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjSpbfController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/XftjController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZdgzController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZtfxController.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/SgfxMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbCaseTypeMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqAllMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqCjdbMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqDzMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjCyjlMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjDzMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjRzMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjSpbfMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbjqZxrMapper.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbJcglAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbLzotherAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbQwzxAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbRzSpbfAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbSjzxAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbWebSocketAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjxxAdaptRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjzlAdaptRrmoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYszxAdapRemoteService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/SgfxService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbCaseTypeService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbJqService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjCyjlService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjRzService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjSpbfService.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/DistanceRunnable.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/SgfxServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbCaseTypeServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbJqServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjCyjlServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjRzServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjSpbfServiceImpl.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/Test.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/task/BxdCreateTask.java
 create mode 100644 mosty-sjzx/src/main/java/com/mosty/sjzx/task/TbJqTask.java
 create mode 100644 mosty-sjzx/src/main/resources/application.yml
 create mode 100644 mosty-sjzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-sjzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/SgfxMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbCaseTypeMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbJqAllMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbJqDzMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbJqMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbSjCyjlMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbSjDzMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbSjMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/mapper/TbSjSpbfMapper.xml
 create mode 100644 mosty-sjzx/src/main/resources/rebel.xml
 create mode 100644 mosty-spxl/mosty-spxl.iml
 create mode 100644 mosty-spxl/pom.xml
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/MostySpxlApplication.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/config/FeignConfig.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/config/GlobalYmlConfig.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/config/WebMvcConfig.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaController.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaSxtController.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaMapper.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtMapper.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtPzMapper.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtzMapper.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaService.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaSxtService.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaServiceImpl.java
 create mode 100644 mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaSxtServiceImpl.java
 create mode 100644 mosty-spxl/src/main/resources/application.yml
 create mode 100644 mosty-spxl/src/main/resources/bootstrap.yml
 create mode 100644 mosty-spxl/src/main/resources/logback-spring.xml
 create mode 100644 mosty-spxl/src/main/resources/rebel.xml
 create mode 100644 mosty-websocket/mosty-websocket.iml
 create mode 100644 mosty-websocket/pom.xml
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/MostyWebSocketApplication.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/config/FeignConfig.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/config/GlobalYmlConfig.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/config/WebMvcConfig.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketConfig.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketServer.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/controller/WebSocketController.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/service/WebSocketService.java
 create mode 100644 mosty-websocket/src/main/java/com/mosty/websocket/service/impl/WebSocketServiceImpl.java
 create mode 100644 mosty-websocket/src/main/resources/application.yml
 create mode 100644 mosty-websocket/src/main/resources/bootstrap.yml
 create mode 100644 mosty-websocket/src/main/resources/logback-spring.xml
 create mode 100644 mosty-wzzx/mosty-wzzx.iml
 create mode 100644 mosty-wzzx/pom.xml
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/MostyWzzxApplication.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/FeignConfig.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/GlobalYmlConfig.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/Listener/ApplicationEventListener.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/WebMvcConfig.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AbstractMongoConfigure.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AdminMongoConfigure.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/LocationInfoController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzRywzController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzSbsswzController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfbbController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfwzController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WzcxController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WztjController.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwXfbbMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwZnzbMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbSjCyjlMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzLswzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzRywzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSblswzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSbsswzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSswzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzXfwzMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WztjMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WzzxUserMapper.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/TbWzSblswzMongoService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/entity/TbWzSblswzMo.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/EasyMongoServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/QueryBuildUtils.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/TbWzSblswzMongoServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbQwzxAdaptRemoteService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbWebSocketAdaptRemoteService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbXfbbAdaptRemoteService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbYjzlAdaptRemoteService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/LocationInfoService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwXfbbService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwZnzbService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbSjCyjlService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzLswzService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSblswzService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSbsswzService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSswzService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzXfwzService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/WztjService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/WzzxSysUserService.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/LocationInfoServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwXfbbServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwZnzbServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbSjCyjlServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzLswzServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSblswzServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSbsswzServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSswzServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzXfwzServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WztjServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WzzxSysUserServiceImpl.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationCenterTask.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationClearTask.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpLzEntity.java
 create mode 100644 mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpServerForLz.java
 create mode 100644 mosty-wzzx/src/main/resources/application.yml
 create mode 100644 mosty-wzzx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-wzzx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbQwXfbbMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbQwZnzbMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbSjCyjlMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzLswzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzRywzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzSblswzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzSbsswzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzSswzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/TbWzXfwzMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/WztjMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/mapper/WzzxUserMapper.xml
 create mode 100644 mosty-wzzx/src/main/resources/rebel.xml
 create mode 100644 mosty-yjzl/mosty-yjzl.iml
 create mode 100644 mosty-yjzl/pom.xml
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/MostyYjzlApplication.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/Cluster.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/DistanceRunnable.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDTO.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDistanceDTO.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/PositionUtil.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/WGS84Point.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/config/FeignConfig.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/config/GlobalYmlConfig.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/config/WebMvcConfig.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycPzController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycXljlController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjDyyjxxController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxCsbController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxClController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxDypzController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxLzController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxRyController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxSjController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxtjController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZxzbController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzlStatisticsController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzxStatisticsController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycJsdxMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycPzMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXfxzMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXljlMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjDyyjxxMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxCsbMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClBqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzClbqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzGzyMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzRybqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzSjbqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzYjjbMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMxyjMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyBqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRySjajMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjGlryclMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxYjczjlMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjzltjMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlJqMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlRgMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdXljlMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClCnryMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjRyMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjSjMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxPcryclMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxjlMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxrMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZxzbMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/YjzlStatisticsMapper.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbJcglAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbQwzxAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbRwzxAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbSjzxAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbWebSocketAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbYszxAdaptRemoteService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycPzServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycXljlServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjDyyjxxServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxCsbServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxClServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxDypzServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxLzServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxRyServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxSjServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjzltjServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxZxjlServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZxzbServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/YjzlStatisticsServiceImpl.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycPzService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycXljlService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjDyyjxxService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxCsbService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxClService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxDypzService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxLzService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxRyService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxSjService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjzltjService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxZxjlService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZxzbService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/service/YjzlStatisticsService.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzFzycTask.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzYjxxRedisClearTask.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/task/TbZlxxGqTask.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/third/YjzlThirdController.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/utils/OkHttpUtils.java
 create mode 100644 mosty-yjzl/src/main/java/com/mosty/yjzl/utils/YjAndZlRule.java
 create mode 100644 mosty-yjzl/src/main/resources/application.yml
 create mode 100644 mosty-yjzl/src/main/resources/bootstrap.yml
 create mode 100644 mosty-yjzl/src/main/resources/logback-spring.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbFzyc.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbFzycXfxz.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbFzycXljl.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjDyyjxxMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjmxCsbMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjmxMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjmxMapperCsb.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxClBqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxClMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzClbqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzGzyMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzRybqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzSjbqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDypzYjjbMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxDyyjxxMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxMxyjMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxRyBqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxRyMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxRySjajMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxSjGlryclMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxSjMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbYjxxYjczjlMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlJqMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlRgMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlXlBxdMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlXlBxdXljlMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlXlMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlYjClCnryMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlYjClMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlYjRyMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlYjSjMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlxxMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlxxPcryclMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlxxZxjlMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZlxxZxrMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbZxzbMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/TbyjzktjMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/mapper/YjzlStatisticsMapper.xml
 create mode 100644 mosty-yjzl/src/main/resources/rebel.xml
 create mode 100644 mosty-yszx/mosty-yszx.iml
 create mode 100644 mosty-yszx/pom.xml
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/MostyYszxApplication.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/config/FeignConfig.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/config/GlobalYmlConfig.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/config/WebMvcConfig.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsAjController.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsDlController.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsGajgController.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsRyController.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsSxtController.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsDlMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgGlbmMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyBqMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyDhMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsSxtMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXsajMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXzajMapper.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/MybatisPlusConfig.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/remote/TbBaseAdaptRemoteService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/remote/TbRwzxAdaptRemoteService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/remote/TbSjzxAdaptRemoteService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsAjService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsDlService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsGajgService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsRyService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsSxtService.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsAjServiceImpl.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsDlServiceImpl.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsGajgServiceImpl.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsRyServiceImpl.java
 create mode 100644 mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsSxtServiceImpl.java
 create mode 100644 mosty-yszx/src/main/resources/application.yml
 create mode 100644 mosty-yszx/src/main/resources/bootstrap.yml
 create mode 100644 mosty-yszx/src/main/resources/logback-spring.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsDlMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsGajgGlbmMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsGajgMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsRyBqMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsRyDhMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsRyMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsSxtMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsXsajMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/mapper/TbYsXzajMapper.xml
 create mode 100644 mosty-yszx/src/main/resources/rebel.xml
 create mode 100644 pom.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..4d8e2fd
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="mosty-yszx" />
+        <module name="mosty-gateway" />
+        <module name="mosty-websocket" />
+        <module name="mosty-yjzl" />
+        <module name="mosty-other" />
+        <module name="mosty-jcgl" />
+        <module name="mosty-base-feign-sdk" />
+        <module name="mosty-rzzx" />
+        <module name="mosty-qwzx" />
+        <module name="mosty-bkzx" />
+        <module name="mosty-rwzx" />
+        <module name="mosty-base" />
+        <module name="mosty-wzzx" />
+        <module name="mosty-sjzx" />
+        <module name="mosty-hczx" />
+        <module name="mosty-spxl" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="feign-client-api" target="8" />
+      <module name="mosty-base" target="8" />
+      <module name="mosty-base-feign-sdk" target="8" />
+      <module name="mosty-bkzx" target="8" />
+      <module name="mosty-dyga-cloud" target="1.8" />
+      <module name="mosty-gateway" target="8" />
+      <module name="mosty-hczx" target="8" />
+      <module name="mosty-jcgl" target="8" />
+      <module name="mosty-other" target="8" />
+      <module name="mosty-qwzx" target="8" />
+      <module name="mosty-rwzx" target="8" />
+      <module name="mosty-rzzx" target="8" />
+      <module name="mosty-sjzx" target="8" />
+      <module name="mosty-spxl" target="8" />
+      <module name="mosty-websocket" target="8" />
+      <module name="mosty-wzzx" target="8" />
+      <module name="mosty-yjzl" target="8" />
+      <module name="mosty-yszx" target="8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="mosty-base" options="-parameters" />
+      <module name="mosty-base-feign-sdk" options="-parameters" />
+      <module name="mosty-bkzx" options="-parameters" />
+      <module name="mosty-gateway" options="-parameters" />
+      <module name="mosty-hczx" options="-parameters" />
+      <module name="mosty-jcgl" options="-parameters" />
+      <module name="mosty-other" options="-parameters" />
+      <module name="mosty-qwzx" options="-parameters" />
+      <module name="mosty-rwzx" options="-parameters" />
+      <module name="mosty-rzzx" options="-parameters" />
+      <module name="mosty-sjzx" options="-parameters" />
+      <module name="mosty-spxl" options="-parameters" />
+      <module name="mosty-websocket" options="-parameters" />
+      <module name="mosty-wzzx" options="-parameters" />
+      <module name="mosty-yjzl" options="-parameters" />
+      <module name="mosty-yszx" options="-parameters" />
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..d21b2b5
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-base/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-bkzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-gateway/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-hczx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-jcgl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-other/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-other/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-qwzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-rwzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-rzzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-sjzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-spxl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-websocket/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-wzzx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-yjzl/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/mosty-yszx/src/main/java" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
new file mode 100644
index 0000000..6fec8f4
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
new file mode 100644
index 0000000..9eb8596
--- /dev/null
+++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ch.qos.logback:logback-core:1.2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml b/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml
new file mode 100644
index 0000000..fa85ae7
--- /dev/null
+++ b/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_20.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.hutool:hutool-all:5.7.20">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cn/hutool/hutool-all/5.7.20/hutool-all-5.7.20-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml
new file mode 100644
index 0000000..7712673
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_alibaba_nacos_discovery_2_1_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:2.1.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-alibaba-nacos-discovery/2.1.0.RELEASE/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-alibaba-nacos-discovery/2.1.0.RELEASE/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-alibaba-nacos-discovery/2.1.0.RELEASE/spring-cloud-alibaba-nacos-discovery-2.1.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml
new file mode 100644
index 0000000..53e8922
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_0_3_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.0.3.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.0.3.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.0.3.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.0.3.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.0.3.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.0.3.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..b523aa3
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_cloud_spring_cloud_starter_alibaba_nacos_discovery_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.4.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.4.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/cloud/spring-cloud-starter-alibaba-nacos-discovery/2.2.4.RELEASE/spring-cloud-starter-alibaba-nacos-discovery-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml
new file mode 100644
index 0000000..4c27784
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:druid:1.1.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml
new file mode 100644
index 0000000..74fcd43
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
new file mode 100644
index 0000000..dcd6ee5
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:fastjson:1.2.47">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml
new file mode 100644
index 0000000..fb8e949
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:fastjson:1.2.83">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.83/fastjson-1.2.83-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_1_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_1_1.xml
new file mode 100644
index 0000000..1de6629
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-api:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.1.1/nacos-api-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.1.1/nacos-api-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.1.1/nacos-api-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml
new file mode 100644
index 0000000..248c73f
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-api:1.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.3.3/nacos-api-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.3.3/nacos-api-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.3.3/nacos-api-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml
new file mode 100644
index 0000000..b4fe60a
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_api_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-api:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.4.1/nacos-api-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.4.1/nacos-api-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-api/1.4.1/nacos-api-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_1_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_1_1.xml
new file mode 100644
index 0000000..2b7a2df
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-client:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.1.1/nacos-client-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.1.1/nacos-client-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.1.1/nacos-client-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml
new file mode 100644
index 0000000..f176774
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-client:1.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.3.3/nacos-client-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.3.3/nacos-client-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.3.3/nacos-client-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml
new file mode 100644
index 0000000..9d1aefa
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_client_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-client:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.4.1/nacos-client-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.4.1/nacos-client-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-client/1.4.1/nacos-client-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_1_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_1_1.xml
new file mode 100644
index 0000000..3c64a64
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-common:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.1.1/nacos-common-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.1.1/nacos-common-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.1.1/nacos-common-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml
new file mode 100644
index 0000000..0a39f39
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_3_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-common:1.3.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.3.3/nacos-common-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.3.3/nacos-common-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.3.3/nacos-common-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml
new file mode 100644
index 0000000..08363d4
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_nacos_nacos_common_1_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.nacos:nacos-common:1.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.4.1/nacos-common-1.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.4.1/nacos-common-1.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/nacos/nacos-common/1.4.1/nacos-common-1.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml b/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml
new file mode 100644
index 0000000..694c155
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_spring_spring_context_support_1_0_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba.spring:spring-context-support:1.0.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/spring/spring-context-support/1.0.10/spring-context-support-1.0.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml b/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml
new file mode 100644
index 0000000..a34ba45
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_transmittable_thread_local_2_11_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:transmittable-thread-local:2.11.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/transmittable-thread-local/2.11.5/transmittable-thread-local-2.11.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml b/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml
new file mode 100644
index 0000000..1755ec4
--- /dev/null
+++ b/.idea/libraries/Maven__com_auth0_java_jwt_3_8_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.auth0:java-jwt:3.8.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/auth0/java-jwt/3.8.1/java-jwt-3.8.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml b/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml
new file mode 100644
index 0000000..9f4c6e7
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_4_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/dynamic-datasource-spring-boot-starter/3.4.1/dynamic-datasource-spring-boot-starter-3.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml
new file mode 100644
index 0000000..ffb1369
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus/3.4.3/mybatis-plus-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml
new file mode 100644
index 0000000..2570725
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-annotation/3.4.3/mybatis-plus-annotation-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml
new file mode 100644
index 0000000..fd9a3f6
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-boot-starter/3.4.3/mybatis-plus-boot-starter-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml
new file mode 100644
index 0000000..0e93676
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-core:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.4.3/mybatis-plus-core-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml
new file mode 100644
index 0000000..0bdbc71
--- /dev/null
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.4.3/mybatis-plus-extension-3.4.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml b/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml
new file mode 100644
index 0000000..2ca54a7
--- /dev/null
+++ b/.idea/libraries/Maven__com_belerweb_pinyin4j_2_5_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.belerweb:pinyin4j:2.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/belerweb/pinyin4j/2.5.0/pinyin4j-2.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml
new file mode 100644
index 0000000..a918945
--- /dev/null
+++ b/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/carrotsearch/thirdparty/simple-xml-safe/2.7.1/simple-xml-safe-2.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
new file mode 100644
index 0000000..bc7d7fd
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml:classmate:1.5.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
new file mode 100644
index 0000000..3aa8175
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
new file mode 100644
index 0000000..bd0d979
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
new file mode 100644
index 0000000..08c0010
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
new file mode 100644
index 0000000..ea31a53
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.11.1/jackson-datatype-jdk8-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
new file mode 100644
index 0000000..50b2736
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.1/jackson-datatype-jsr310-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
new file mode 100644
index 0000000..6eac973
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.11.1/jackson-module-parameter-names-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml b/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml
new file mode 100644
index 0000000..fc5a467
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_caspar_chen_swagger_ui_layer_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/caspar-chen/swagger-ui-layer/1.1.3/swagger-ui-layer-1.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
new file mode 100644
index 0000000..87f32d8
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.jsqlparser:jsqlparser:4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/4.2/jsqlparser-4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
new file mode 100644
index 0000000..798310e
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.pagehelper:pagehelper:5.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.3.0/pagehelper-5.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml b/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
new file mode 100644
index 0000000..bc88169
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.penggle:kaptcha:2.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/penggle/kaptcha/2.3.2/kaptcha-2.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
new file mode 100644
index 0000000..2db7431
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.virtuald:curvesapi:1.04">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
new file mode 100644
index 0000000..d156c18
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.virtuald:curvesapi:1.06">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/virtuald/curvesapi/1.06/curvesapi-1.06-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
new file mode 100644
index 0000000..1c380d0
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.findbugs:jsr305:3.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
new file mode 100644
index 0000000..848cecd
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_3_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.errorprone:error_prone_annotations:2.3.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
new file mode 100644
index 0000000..36e948e
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:failureaccess:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml
new file mode 100644
index 0000000..f349d63
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_29_0_jre.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:guava:29.0-jre">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/29.0-jre/guava-29.0-jre-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
new file mode 100644
index 0000000..4e15702
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
new file mode 100644
index 0000000..bacaa45
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.j2objc:j2objc-annotations:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
new file mode 100644
index 0000000..f3f3738
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.googlecode.json-simple:json-simple:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml b/.idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml
new file mode 100644
index 0000000..b8f061c
--- /dev/null
+++ b/.idea/libraries/Maven__com_hikvision_ga_artemis_http_client_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.hikvision.ga:artemis-http-client:1.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/hikvision/ga/artemis-http-client/1.1.3/artemis-http-client-1.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/hikvision/ga/artemis-http-client/1.1.3/artemis-http-client-1.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/hikvision/ga/artemis-http-client/1.1.3/artemis-http-client-1.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
new file mode 100644
index 0000000..f19f6eb
--- /dev/null
+++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
new file mode 100644
index 0000000..f674d8e
--- /dev/null
+++ b/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jhlabs:filters:2.0.235-1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jhlabs/filters/2.0.235-1/filters-2.0.235-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..592f78c
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_base_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-base-starter/1.0.0-SNAPSHOT/common-base-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-base-starter/1.0.0-SNAPSHOT/common-base-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-base-starter/1.0.0-SNAPSHOT/common-base-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..e816788
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_config_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-config-starter/1.0.0-SNAPSHOT/common-config-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-config-starter/1.0.0-SNAPSHOT/common-config-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-config-starter/1.0.0-SNAPSHOT/common-config-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..5c9d00c
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_core_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-core-starter/1.0.0-SNAPSHOT/common-core-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-core-starter/1.0.0-SNAPSHOT/common-core-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-core-starter/1.0.0-SNAPSHOT/common-core-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..c6a4c4d
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_log_base_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-log-base-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-log-base-starter/1.0.0-SNAPSHOT/common-log-base-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-log-base-starter/1.0.0-SNAPSHOT/common-log-base-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-log-base-starter/1.0.0-SNAPSHOT/common-log-base-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..f491c36
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_magic_api_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-magic-api-starter/1.0.0-SNAPSHOT/common-magic-api-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-magic-api-starter/1.0.0-SNAPSHOT/common-magic-api-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-magic-api-starter/1.0.0-SNAPSHOT/common-magic-api-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..7f5d586
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_redis_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-redis-starter/1.0.0-SNAPSHOT/common-redis-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-redis-starter/1.0.0-SNAPSHOT/common-redis-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-redis-starter/1.0.0-SNAPSHOT/common-redis-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..9e99eeb
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_common_token_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-token-starter/1.0.0-SNAPSHOT/common-token-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-token-starter/1.0.0-SNAPSHOT/common-token-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/common-token-starter/1.0.0-SNAPSHOT/common-token-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml
new file mode 100644
index 0000000..ee29a8d
--- /dev/null
+++ b/.idea/libraries/Maven__com_mosty_operation_log_aspect_starter_1_0_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/operation-log-aspect-starter/1.0.0-SNAPSHOT/operation-log-aspect-starter-1.0.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/operation-log-aspect-starter/1.0.0-SNAPSHOT/operation-log-aspect-starter-1.0.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/mosty/operation-log-aspect-starter/1.0.0-SNAPSHOT/operation-log-aspect-starter-1.0.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
new file mode 100644
index 0000000..bd9061c
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.archaius:archaius-core:0.7.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml b/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml
new file mode 100644
index 0000000..d977a58
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_feign_feign_core_8_14_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.feign:feign-core:8.14.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-core/8.14.4/feign-core-8.14.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml b/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml
new file mode 100644
index 0000000..7b9a4b5
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_feign_feign_slf4j_8_14_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.feign:feign-slf4j:8.14.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/feign/feign-slf4j/8.14.4/feign-slf4j-8.14.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml
new file mode 100644
index 0000000..588dca0
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_18.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.hystrix:hystrix-core:1.5.18">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/hystrix/hystrix-core/1.5.18/hystrix-core-1.5.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml
new file mode 100644
index 0000000..a1a320c
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
new file mode 100644
index 0000000..09c6f6e
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml
new file mode 100644
index 0000000..28cf880
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.ribbon:ribbon:2.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon/2.3.0/ribbon-2.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml
new file mode 100644
index 0000000..eff738d
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.ribbon:ribbon-core:2.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-core/2.3.0/ribbon-core-2.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml
new file mode 100644
index 0000000..1312269
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-httpclient/2.3.0/ribbon-httpclient-2.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml
new file mode 100644
index 0000000..a1ff3f0
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-loadbalancer/2.3.0/ribbon-loadbalancer-2.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml
new file mode 100644
index 0000000..658fe0c
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/ribbon/ribbon-transport/2.3.0/ribbon-transport-2.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
new file mode 100644
index 0000000..837985a
--- /dev/null
+++ b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.netflix.servo:servo-core:0.12.21">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml
new file mode 100644
index 0000000..a955ebd
--- /dev/null
+++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.oracle:ojdbc6:11.2.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/oracle/ojdbc6/11.2.0.3/ojdbc6-11.2.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/oracle/ojdbc6/11.2.0.3/ojdbc6-11.2.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/oracle/ojdbc6/11.2.0.3/ojdbc6-11.2.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml
new file mode 100644
index 0000000..359f811
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okhttp3:okhttp:3.14.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/3.14.6/okhttp-3.14.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/3.14.6/okhttp-3.14.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okhttp3/okhttp/3.14.6/okhttp-3.14.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml b/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
new file mode 100644
index 0000000..9260035
--- /dev/null
+++ b/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.squareup.okio:okio:1.17.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.17.2/okio-1.17.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/squareup/okio/okio/1.17.2/okio-1.17.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
new file mode 100644
index 0000000..2061d8c
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
new file mode 100644
index 0000000..2b077bc
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-client:1.19.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
new file mode 100644
index 0000000..91d65b2
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-core:1.19.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml
new file mode 100644
index 0000000..16d84bf
--- /dev/null
+++ b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_20.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.thoughtworks.xstream:xstream:1.4.20">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/thoughtworks/xstream/xstream/1.4.20/xstream-1.4.20-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml
new file mode 100644
index 0000000..b7e360b
--- /dev/null
+++ b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.vividsolutions:jts:1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.13/jts-1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
new file mode 100644
index 0000000..eeba709
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:HikariCP:3.4.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
new file mode 100644
index 0000000..6ce4aae
--- /dev/null
+++ b/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.zaxxer:SparseBitSet:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
new file mode 100644
index 0000000..84eb115
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-beanutils:commons-beanutils:1.9.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-beanutils/commons-beanutils/1.9.4/commons-beanutils-1.9.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
new file mode 100644
index 0000000..5384f7a
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.13/commons-codec-1.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 0000000..13afda2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-collections:commons-collections:3.2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
new file mode 100644
index 0000000..772d6fe
--- /dev/null
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-configuration:commons-configuration:1.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
new file mode 100644
index 0000000..3b9dcc0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-fileupload:commons-fileupload:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml
new file mode 100644
index 0000000..cc22b93
--- /dev/null
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-httpclient:commons-httpclient:3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml b/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml
new file mode 100644
index 0000000..7b5b3b7
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_1_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:1.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.3.2/commons-io-1.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/1.3.2/commons-io-1.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
new file mode 100644
index 0000000..f8084ec
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
new file mode 100644
index 0000000..2ec8376
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
new file mode 100644
index 0000000..217d6e0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.0.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file mode 100644
index 0000000..eab40b3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml b/.idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml
new file mode 100644
index 0000000..3b28179
--- /dev/null
+++ b/.idea/libraries/Maven__de_codecentric_spring_boot_admin_client_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: de.codecentric:spring-boot-admin-client:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-client/2.2.0/spring-boot-admin-client-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-client/2.2.0/spring-boot-admin-client-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-client/2.2.0/spring-boot-admin-client-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml b/.idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml
new file mode 100644
index 0000000..5b44d53
--- /dev/null
+++ b/.idea/libraries/Maven__de_codecentric_spring_boot_admin_starter_client_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-starter-client/2.2.0/spring-boot-admin-starter-client-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-starter-client/2.2.0/spring-boot-admin-starter-client-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/de/codecentric/spring-boot-admin-starter-client/2.2.0/spring-boot-admin-starter-client-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml
new file mode 100644
index 0000000..efc64b2
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_core_10_10_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-core:10.10.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-core/10.10.1/feign-core-10.10.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml
new file mode 100644
index 0000000..11bde67
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_10_10_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-hystrix:10.10.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-hystrix/10.10.1/feign-hystrix-10.10.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml
new file mode 100644
index 0000000..2ec2f6e
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_10_10_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign:feign-slf4j:10.10.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/feign-slf4j/10.10.1/feign-slf4j-10.10.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml
new file mode 100644
index 0000000..0534476
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign.form:feign-form:3.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form/3.8.0/feign-form-3.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml
new file mode 100644
index 0000000..47e101e
--- /dev/null
+++ b/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/github/openfeign/form/feign-form-spring/3.8.0/feign-form-spring-3.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml
new file mode 100644
index 0000000..9b43b77
--- /dev/null
+++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_2_1_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.1.RELEASE/lettuce-core-5.2.1.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.1.RELEASE/lettuce-core-5.2.1.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/lettuce/lettuce-core/5.2.1.RELEASE/lettuce-core-5.2.1.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml
new file mode 100644
index 0000000..7a6a113
--- /dev/null
+++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_5_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.micrometer:micrometer-core:1.5.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.3/micrometer-core-1.5.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.3/micrometer-core-1.5.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/micrometer/micrometer-core/1.5.3/micrometer-core-1.5.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_minio_minio_8_0_3.xml b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml
new file mode 100644
index 0000000..c8743c4
--- /dev/null
+++ b/.idea/libraries/Maven__io_minio_minio_8_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.minio:minio:8.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/minio/minio/8.0.3/minio-8.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml
new file mode 100644
index 0000000..68df79d
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-buffer:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.51.Final/netty-buffer-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml
new file mode 100644
index 0000000..62ec8c2
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.51.Final/netty-codec-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml
new file mode 100644
index 0000000..9f5def2
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_http2_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec-http2:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.51.Final/netty-codec-http2-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.51.Final/netty-codec-http2-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.51.Final/netty-codec-http2-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml
new file mode 100644
index 0000000..34624d5
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec-http:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.51.Final/netty-codec-http-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.51.Final/netty-codec-http-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.51.Final/netty-codec-http-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml
new file mode 100644
index 0000000..cff0e15
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_codec_socks_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-codec-socks:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.1.51.Final/netty-codec-socks-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.1.51.Final/netty-codec-socks-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-socks/4.1.51.Final/netty-codec-socks-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml
new file mode 100644
index 0000000..36e612e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-common:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.51.Final/netty-common-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml
new file mode 100644
index 0000000..fb10871
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-handler:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.51.Final/netty-handler-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml
new file mode 100644
index 0000000..aaae26c
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_handler_proxy_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-handler-proxy:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.1.51.Final/netty-handler-proxy-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.1.51.Final/netty-handler-proxy-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler-proxy/4.1.51.Final/netty-handler-proxy-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml
new file mode 100644
index 0000000..0281c5e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-resolver:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.51.Final/netty-resolver-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml
new file mode 100644
index 0000000..425736e
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-transport:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.51.Final/netty-transport-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml
new file mode 100644
index 0000000..29275ce
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_linux_x86_64_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.51.Final/netty-transport-native-epoll-4.1.51.Final-linux-x86_64.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.51.Final/netty-transport-native-epoll-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-epoll/4.1.51.Final/netty-transport-native-epoll-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml
new file mode 100644
index 0000000..783e2a2
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_51_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty-transport-native-unix-common:4.1.51.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.51.Final/netty-transport-native-unix-common-4.1.51.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.51.Final/netty-transport-native-unix-common-4.1.51.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport-native-unix-common/4.1.51.Final/netty-transport-native-unix-common-4.1.51.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml
new file mode 100644
index 0000000..45d9a6f
--- /dev/null
+++ b/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.projectreactor.addons:reactor-extra:3.3.3.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/addons/reactor-extra/3.3.3.RELEASE/reactor-extra-3.3.3.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/addons/reactor-extra/3.3.3.RELEASE/reactor-extra-3.3.3.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/addons/reactor-extra/3.3.3.RELEASE/reactor-extra-3.3.3.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml
new file mode 100644
index 0000000..6246568
--- /dev/null
+++ b/.idea/libraries/Maven__io_projectreactor_netty_reactor_netty_0_9_10_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.projectreactor.netty:reactor-netty:0.9.10.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/netty/reactor-netty/0.9.10.RELEASE/reactor-netty-0.9.10.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/netty/reactor-netty/0.9.10.RELEASE/reactor-netty-0.9.10.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/netty/reactor-netty/0.9.10.RELEASE/reactor-netty-0.9.10.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml
new file mode 100644
index 0000000..6be68e7
--- /dev/null
+++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.8.RELEASE/reactor-core-3.3.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.8.RELEASE/reactor-core-3.3.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/projectreactor/reactor-core/3.3.8.RELEASE/reactor-core-3.3.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml b/.idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml
new file mode 100644
index 0000000..555759b
--- /dev/null
+++ b/.idea/libraries/Maven__io_prometheus_simpleclient_0_5_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.prometheus:simpleclient:0.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/prometheus/simpleclient/0.5.0/simpleclient-0.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
new file mode 100644
index 0000000..cda742b
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex:rxjava:1.3.8">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
new file mode 100644
index 0000000..82613f4
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex:rxnetty:0.4.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
new file mode 100644
index 0000000..1ce62ff
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex:rxnetty-contexts:0.4.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
new file mode 100644
index 0000000..f9da5f7
--- /dev/null
+++ b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.reactivex:rxnetty-servo:0.4.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml
new file mode 100644
index 0000000..64855d8
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-core:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/2.8.0/springfox-core-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml
new file mode 100644
index 0000000..c271a62
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-schema:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/2.8.0/springfox-schema-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml
new file mode 100644
index 0000000..c43a6ab
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spi:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/2.8.0/springfox-spi-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml
new file mode 100644
index 0000000..5060ed3
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spring-web:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/2.8.0/springfox-spring-web-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml
new file mode 100644
index 0000000..3838245
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger2:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.8.0/springfox-swagger2-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml
new file mode 100644
index 0000000..830eefd
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-common:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/2.8.0/springfox-swagger-common-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml
new file mode 100644
index 0000000..bd002c8
--- /dev/null
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-ui:2.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/2.8.0/springfox-swagger-ui-2.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml
new file mode 100644
index 0000000..ffd56aa
--- /dev/null
+++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-annotations:1.5.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.14/swagger-annotations-1.5.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml
new file mode 100644
index 0000000..000ff27
--- /dev/null
+++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-models:1.5.14">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.14/swagger-models-1.5.14-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml
new file mode 100644
index 0000000..a96bbdc
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.1/jakarta.activation-api-1.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
new file mode 100644
index 0000000..cba9dd2
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
new file mode 100644
index 0000000..e66afb9
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml
new file mode 100644
index 0000000..bdf217a
--- /dev/null
+++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.2/jakarta.xml.bind-api-2.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
new file mode 100644
index 0000000..180d587
--- /dev/null
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/activation/activation/1.1/activation-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
new file mode 100644
index 0000000..93cf65a
--- /dev/null
+++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.inject:javax.inject:1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4.xml b/.idea/libraries/Maven__javax_mail_mail_1_4.xml
new file mode 100644
index 0000000..ead2b38
--- /dev/null
+++ b/.idea/libraries/Maven__javax_mail_mail_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.mail:mail:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/mail/mail/1.4/mail-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
new file mode 100644
index 0000000..d05c196
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:4.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/4.0.1/javax.servlet-api-4.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
new file mode 100644
index 0000000..a0c4d76
--- /dev/null
+++ b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.ws.rs:jsr311-api:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml b/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml
new file mode 100644
index 0000000..c6d18ad
--- /dev/null
+++ b/.idea/libraries/Maven__jaxen_jaxen_1_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jaxen:jaxen:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jaxen/jaxen/1.2.0/jaxen-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jdom_jdom_1_0.xml b/.idea/libraries/Maven__jdom_jdom_1_0.xml
new file mode 100644
index 0000000..3349d67
--- /dev/null
+++ b/.idea/libraries/Maven__jdom_jdom_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jdom:jdom:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/jdom/jdom/1.0/jdom-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml
new file mode 100644
index 0000000..b969cc3
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_16.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: mysql:mysql-connector-java:8.0.16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.16/mysql-connector-java-8.0.16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml
new file mode 100644
index 0000000..a967587
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy:1.10.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.6/byte-buddy-1.10.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml
new file mode 100644
index 0000000..5c50dfd
--- /dev/null
+++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.6/byte-buddy-agent-1.10.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
new file mode 100644
index 0000000..b3d3858
--- /dev/null
+++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:accessors-smart:1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/1.2/accessors-smart-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
new file mode 100644
index 0000000..1083023
--- /dev/null
+++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.minidev:json-smart:2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.3/json-smart-2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
new file mode 100644
index 0000000..1c71163
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.ehcache:ehcache-core:2.6.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/ehcache/ehcache-core/2.6.11/ehcache-core-2.6.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ 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 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-collections4:4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
new file mode 100644
index 0000000..5871c95
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-collections4:4.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
new file mode 100644
index 0000000..7c25fef
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_19.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.19">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-compress/1.19/commons-compress-1.19-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
new file mode 100644
index 0000000..28edf49
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
new file mode 100644
index 0000000..9050e00
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-lang3:3.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
new file mode 100644
index 0000000..ebfe0a8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-math3:3.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml b/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml
new file mode 100644
index 0000000..5a2fa29
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-text:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-text/1.6/commons-text-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml
new file mode 100644
index 0000000..fe2908c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpasyncclient_4_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpasyncclient/4.1.4/httpasyncclient-4.1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml
new file mode 100644
index 0000000..32ad6d3
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.10/httpclient-4.5.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
new file mode 100644
index 0000000..b475675
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml
new file mode 100644
index 0000000..6650fe0
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_nio_4_4_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.13/httpcore-nio-4.4.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.13/httpcore-nio-4.4.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore-nio/4.4.13/httpcore-nio-4.4.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
new file mode 100644
index 0000000..8ad4996
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-api:2.13.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.13.3/log4j-api-2.13.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
new file mode 100644
index 0000000..b4b1b1b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_12_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.12.1/log4j-to-slf4j-2.12.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
new file mode 100644
index 0000000..1a446fb
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi:3.17">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/3.17/poi-3.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
new file mode 100644
index 0000000..c706d5b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi/4.1.2/poi-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
new file mode 100644
index 0000000..d50f385
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml:3.17">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
new file mode 100644
index 0000000..905ca0c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
new file mode 100644
index 0000000..d214d8b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml-schemas:3.17">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
new file mode 100644
index 0000000..93d965d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
new file mode 100644
index 0000000..5272a36
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-cache:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-cache/1.8.0/shiro-cache-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
new file mode 100644
index 0000000..4578d1b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-config-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-core/1.8.0/shiro-config-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
new file mode 100644
index 0000000..e699787
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-config-ogdl/1.8.0/shiro-config-ogdl-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
new file mode 100644
index 0000000..aa3fdcf
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-core/1.8.0/shiro-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
new file mode 100644
index 0000000..77a90b8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-cipher/1.8.0/shiro-crypto-cipher-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
new file mode 100644
index 0000000..dddd497
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-core/1.8.0/shiro-crypto-core-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
new file mode 100644
index 0000000..ece1eae
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-crypto-hash/1.8.0/shiro-crypto-hash-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml
new file mode 100644
index 0000000..c1049dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-ehcache:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-ehcache/1.8.0/shiro-ehcache-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
new file mode 100644
index 0000000..b7a65df
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-event:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-event/1.8.0/shiro-event-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
new file mode 100644
index 0000000..499eb00
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.shiro:shiro-lang:1.8.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/shiro/shiro-lang/1.8.0/shiro-lang-1.8.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml
new file mode 100644
index 0000000..c81f3df
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.30/tomcat-embed-core-9.0.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml
new file mode 100644
index 0000000..40b2b8c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.30/tomcat-embed-el-9.0.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml
new file mode 100644
index 0000000..5f184f9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.30/tomcat-embed-websocket-9.0.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
new file mode 100644
index 0000000..ea2816e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity-engine-core:2.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/velocity/velocity-engine-core/2.3/velocity-engine-core-2.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml b/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml
new file mode 100644
index 0000000..6b5c280
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_ws_commons_XmlSchema_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.ws.commons:XmlSchema:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/XmlSchema/1.1/XmlSchema-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/XmlSchema/1.1/XmlSchema-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/ws/commons/XmlSchema/1.1/XmlSchema-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
new file mode 100644
index 0000000..cb0f76d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
new file mode 100644
index 0000000..0695d4b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
new file mode 100644
index 0000000..f854ab0
--- /dev/null
+++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
new file mode 100644
index 0000000..1a387a4
--- /dev/null
+++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.aspectj:aspectjweaver:1.9.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
new file mode 100644
index 0000000..6222cc8
--- /dev/null
+++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_13_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.assertj:assertj-core:3.13.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.13.2/assertj-core-3.13.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml
new file mode 100644
index 0000000..56cfc40
--- /dev/null
+++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml
new file mode 100644
index 0000000..861cb28
--- /dev/null
+++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.bouncycastle:bcprov-jdk15on:1.64">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.64/bcprov-jdk15on-1.64.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.64/bcprov-jdk15on-1.64-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.64/bcprov-jdk15on-1.64-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml
new file mode 100644
index 0000000..6d622d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_checkerframework_checker_qual_2_11_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.checkerframework:checker-qual:2.11.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml b/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml
new file mode 100644
index 0000000..1f4c4b1
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.woodstox:wstx-asl:3.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/wstx-asl/3.2.0/wstx-asl-3.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/wstx-asl/3.2.0/wstx-asl-3.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/woodstox/wstx-asl/3.2.0/wstx-asl-3.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml b/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml
new file mode 100644
index 0000000..c3ded8b
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_xfire_xfire_core_1_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.xfire:xfire-core:1.2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/xfire/xfire-core/1.2.6/xfire-core-1.2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/xfire/xfire-core/1.2.6/xfire-core-1.2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/codehaus/xfire/xfire-core/1.2.6/xfire-core-1.2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
new file mode 100644
index 0000000..ae5020d
--- /dev/null
+++ b/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.glassfish:jakarta.el:3.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/jakarta.el/3.0.3/jakarta.el-3.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
new file mode 100644
index 0000000..b170293
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest:2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.1/hamcrest-2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
new file mode 100644
index 0000000..04cc804
--- /dev/null
+++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hdrhistogram:HdrHistogram:2.1.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hdrhistogram/HdrHistogram/2.1.9/HdrHistogram-2.1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
new file mode 100644
index 0000000..d035d9c
--- /dev/null
+++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_18_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.18.Final/hibernate-validator-6.0.18.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
new file mode 100644
index 0000000..09c4cf0
--- /dev/null
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.javassist:javassist:3.21.0-GA">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/javassist/javassist/3.21.0-GA/javassist-3.21.0-GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
new file mode 100644
index 0000000..0b76247
--- /dev/null
+++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml b/.idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml
new file mode 100644
index 0000000..74712ea
--- /dev/null
+++ b/.idea/libraries/Maven__org_jolokia_jolokia_core_1_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jolokia:jolokia-core:1.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jolokia/jolokia-core/1.6.2/jolokia-core-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jolokia/jolokia-core/1.6.2/jolokia-core-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jolokia/jolokia-core/1.6.2/jolokia-core-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
new file mode 100644
index 0000000..7171153
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter:5.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.6.2/junit-jupiter-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
new file mode 100644
index 0000000..ef160d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.6.2/junit-jupiter-api-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
new file mode 100644
index 0000000..fc4c644
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.6.2/junit-jupiter-engine-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
new file mode 100644
index 0000000..45b4af3
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.6.2/junit-jupiter-params-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
new file mode 100644
index 0000000..f2699b9
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-commons:1.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.6.2/junit-platform-commons-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
new file mode 100644
index 0000000..c13a302
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.platform:junit-platform-engine:1.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.6.2/junit-platform-engine-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml b/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
new file mode 100644
index 0000000..697c91f
--- /dev/null
+++ b/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/junit/vintage/junit-vintage-engine/5.6.2/junit-vintage-engine-5.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
new file mode 100644
index 0000000..bf68169
--- /dev/null
+++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.latencyutils:LatencyUtils:2.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml b/.idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml
new file mode 100644
index 0000000..6c12b62
--- /dev/null
+++ b/.idea/libraries/Maven__org_locationtech_jts_jts_core_1_18_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.locationtech.jts:jts-core:1.18.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/locationtech/jts/jts-core/1.18.0/jts-core-1.18.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/locationtech/jts/jts-core/1.18.0/jts-core-1.18.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/locationtech/jts/jts-core/1.18.0/jts-core-1.18.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
new file mode 100644
index 0000000..87cb599
--- /dev/null
+++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mapstruct:mapstruct:1.2.0.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
new file mode 100644
index 0000000..c18526d
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_core_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-core:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/3.1.0/mockito-core-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
new file mode 100644
index 0000000..d4e6643
--- /dev/null
+++ b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mockito:mockito-junit-jupiter:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/3.1.0/mockito-junit-jupiter-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_bson_3_11_2.xml b/.idea/libraries/Maven__org_mongodb_bson_3_11_2.xml
new file mode 100644
index 0000000..86ba873
--- /dev/null
+++ b/.idea/libraries/Maven__org_mongodb_bson_3_11_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mongodb:bson:3.11.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/bson/3.11.2/bson-3.11.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml
new file mode 100644
index 0000000..1465f4b
--- /dev/null
+++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_11_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mongodb:mongodb-driver:3.11.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver/3.11.2/mongodb-driver-3.11.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml
new file mode 100644
index 0000000..eaabec5
--- /dev/null
+++ b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_11_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mongodb:mongodb-driver-core:3.11.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mongodb/mongodb-driver-core/3.11.2/mongodb-driver-core-3.11.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
new file mode 100644
index 0000000..fab1459
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_5_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis:3.5.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.7/mybatis-3.5.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
new file mode 100644
index 0000000..a359305
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis-spring:2.0.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/2.0.6/mybatis-spring-2.0.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
new file mode 100644
index 0000000..879dc41
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/2.2.0/mybatis-spring-boot-autoconfigure-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
new file mode 100644
index 0000000..8161289
--- /dev/null
+++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/2.2.0/mybatis-spring-boot-starter-2.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
new file mode 100644
index 0000000..af41e3b
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:2.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
new file mode 100644
index 0000000..fbc1b16
--- /dev/null
+++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.opentest4j:opentest4j:1.2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
new file mode 100644
index 0000000..0bf8cf2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm:5.0.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/5.0.4/asm-5.0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml
new file mode 100644
index 0000000..4b68109
--- /dev/null
+++ b/.idea/libraries/Maven__org_postgresql_postgresql_42_2_9.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.postgresql:postgresql:42.2.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.9/postgresql-42.2.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.9/postgresql-42.2.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.9/postgresql-42.2.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
new file mode 100644
index 0000000..8503cb4
--- /dev/null
+++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.16.18">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.18/lombok-1.16.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml
new file mode 100644
index 0000000..0ce7ba6
--- /dev/null
+++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.18.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
new file mode 100644
index 0000000..f17253b
--- /dev/null
+++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.reactivestreams:reactive-streams:1.0.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
new file mode 100644
index 0000000..d8b2fb5
--- /dev/null
+++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.reflections:reflections:0.9.11">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/reflections/reflections/0.9.11/reflections-0.9.11-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
new file mode 100644
index 0000000..c4c54d6
--- /dev/null
+++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
new file mode 100644
index 0000000..27229ce
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.30/jul-to-slf4j-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
new file mode 100644
index 0000000..02b6812
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.30">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..c65abab
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.2.4.RELEASE/spring-boot-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..810e1a7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-actuator:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.2.4.RELEASE/spring-boot-actuator-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.2.4.RELEASE/spring-boot-actuator-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator/2.2.4.RELEASE/spring-boot-actuator-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..c18bb6a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.2.4.RELEASE/spring-boot-actuator-autoconfigure-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.2.4.RELEASE/spring-boot-actuator-autoconfigure-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-actuator-autoconfigure/2.2.4.RELEASE/spring-boot-actuator-autoconfigure-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..57a62cc
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.2.4.RELEASE/spring-boot-autoconfigure-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..4a36a8d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.2.4.RELEASE/spring-boot-starter-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..d78233c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.2.4.RELEASE/spring-boot-starter-actuator-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.2.4.RELEASE/spring-boot-starter-actuator-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-actuator/2.2.4.RELEASE/spring-boot-starter-actuator-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..6a063f7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.4.RELEASE/spring-boot-starter-aop-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.4.RELEASE/spring-boot-starter-aop-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.2.4.RELEASE/spring-boot-starter-aop-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..7aad73f
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-mongodb/2.2.4.RELEASE/spring-boot-starter-data-mongodb-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..719c72f
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.4.RELEASE/spring-boot-starter-data-redis-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.4.RELEASE/spring-boot-starter-data-redis-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-redis/2.2.4.RELEASE/spring-boot-starter-data-redis-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..e04ee5c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.4.RELEASE/spring-boot-starter-jdbc-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.4.RELEASE/spring-boot-starter-jdbc-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.2.4.RELEASE/spring-boot-starter-jdbc-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..16a9599
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.2.4.RELEASE/spring-boot-starter-json-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..305a667
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.2.4.RELEASE/spring-boot-starter-logging-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..4564546
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_reactor_netty_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-reactor-netty/2.2.4.RELEASE/spring-boot-starter-reactor-netty-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-reactor-netty/2.2.4.RELEASE/spring-boot-starter-reactor-netty-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-reactor-netty/2.2.4.RELEASE/spring-boot-starter-reactor-netty-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..096f45f
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.2.4.RELEASE/spring-boot-starter-test-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..10d5e5a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.2.4.RELEASE/spring-boot-starter-tomcat-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..01224af
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.2.4.RELEASE/spring-boot-starter-validation-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..30201ae
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.2.4.RELEASE/spring-boot-starter-web-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..4dfd8d4
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_webflux_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-webflux/2.2.4.RELEASE/spring-boot-starter-webflux-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-webflux/2.2.4.RELEASE/spring-boot-starter-webflux-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-webflux/2.2.4.RELEASE/spring-boot-starter-webflux-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..f4649dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.2.4.RELEASE/spring-boot-starter-websocket-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.2.4.RELEASE/spring-boot-starter-websocket-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-websocket/2.2.4.RELEASE/spring-boot-starter-websocket-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..635fdf8
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.2.4.RELEASE/spring-boot-test-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml
new file mode 100644
index 0000000..4e26fa6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_2_4_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.2.4.RELEASE/spring-boot-test-autoconfigure-2.2.4.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..7a3477e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-commons/2.2.5.RELEASE/spring-cloud-commons-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-commons/2.2.5.RELEASE/spring-cloud-commons-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-commons/2.2.5.RELEASE/spring-cloud-commons-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..f7eb169
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-context/2.2.5.RELEASE/spring-cloud-context-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-context/2.2.5.RELEASE/spring-cloud-context-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-context/2.2.5.RELEASE/spring-cloud-context-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..76b7e7c
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_gateway_core_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-gateway-core:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-gateway-core/2.2.5.RELEASE/spring-cloud-gateway-core-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-gateway-core/2.2.5.RELEASE/spring-cloud-gateway-core-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-gateway-core/2.2.5.RELEASE/spring-cloud-gateway-core-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..1f971e4
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-archaius/2.2.5.RELEASE/spring-cloud-netflix-archaius-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..eccd43a
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-netflix-ribbon/2.2.5.RELEASE/spring-cloud-netflix-ribbon-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..a02663e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-openfeign-core/2.2.5.RELEASE/spring-cloud-openfeign-core-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..3a0def6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter/2.2.5.RELEASE/spring-cloud-starter-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter/2.2.5.RELEASE/spring-cloud-starter-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter/2.2.5.RELEASE/spring-cloud-starter-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..7901dea
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_gateway_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-gateway/2.2.5.RELEASE/spring-cloud-starter-gateway-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-gateway/2.2.5.RELEASE/spring-cloud-starter-gateway-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-gateway/2.2.5.RELEASE/spring-cloud-starter-gateway-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..3e290d6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.5.RELEASE/spring-cloud-starter-netflix-archaius-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.5.RELEASE/spring-cloud-starter-netflix-archaius-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-archaius/2.2.5.RELEASE/spring-cloud-starter-netflix-archaius-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..a132e78
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.5.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.5.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-netflix-ribbon/2.2.5.RELEASE/spring-cloud-starter-netflix-ribbon-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml
new file mode 100644
index 0000000..c82c24e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/cloud/spring-cloud-starter-openfeign/2.2.5.RELEASE/spring-cloud-starter-openfeign-2.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..c06da98
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.2.RELEASE/spring-data-commons-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.2.RELEASE/spring-data-commons-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.3.2.RELEASE/spring-data-commons-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..e2154b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.2.RELEASE/spring-data-keyvalue-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.2.RELEASE/spring-data-keyvalue-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-keyvalue/2.3.2.RELEASE/spring-data-keyvalue-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_2_RELEASE.xml
new file mode 100644
index 0000000..844e9e6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_3_0_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-mongodb:3.0.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.2.RELEASE/spring-data-mongodb-3.0.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.2.RELEASE/spring-data-mongodb-3.0.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/3.0.2.RELEASE/spring-data-mongodb-3.0.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml
new file mode 100644
index 0000000..7478632
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.2.RELEASE/spring-data-redis-2.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.2.RELEASE/spring-data-redis-2.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/2.3.2.RELEASE/spring-data-redis-2.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml
new file mode 100644
index 0000000..db373d4
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.integration:spring-integration-core:5.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-core/5.3.2.RELEASE/spring-integration-core-5.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-core/5.3.2.RELEASE/spring-integration-core-5.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-core/5.3.2.RELEASE/spring-integration-core-5.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml
new file mode 100644
index 0000000..2f942b5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_integration_spring_integration_ip_5_3_2_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.integration:spring-integration-ip:5.3.2.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-ip/5.3.2.RELEASE/spring-integration-ip-5.3.2.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-ip/5.3.2.RELEASE/spring-integration-ip-5.3.2.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/integration/spring-integration-ip/5.3.2.RELEASE/spring-integration-ip-5.3.2.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
new file mode 100644
index 0000000..fbc0452
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
new file mode 100644
index 0000000..7e6f096
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
new file mode 100644
index 0000000..3077cc0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/retry/spring-retry/1.2.5.RELEASE/spring-retry-1.2.5.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml
new file mode 100644
index 0000000..7917663
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.3.3.RELEASE/spring-security-crypto-5.3.3.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.3.3.RELEASE/spring-security-crypto-5.3.3.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.3.3.RELEASE/spring-security-crypto-5.3.3.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml
new file mode 100644
index 0000000..6097256
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-rsa/1.0.9.RELEASE/spring-security-rsa-1.0.9.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..000f9ff
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-aop:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.2.8.RELEASE/spring-aop-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ca7aa33
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-beans:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.2.8.RELEASE/spring-beans-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..3194e8e
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.2.8.RELEASE/spring-context-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..19410b2
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context-support/5.2.8.RELEASE/spring-context-support-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..e7d5de5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_core_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.2.8.RELEASE/spring-core-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..2d2456d
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-expression:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.2.8.RELEASE/spring-expression-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..4fea859
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.2.8.RELEASE/spring-jcl-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..a1290a5
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.2.8.RELEASE/spring-jdbc-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ce343d6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-messaging/5.2.8.RELEASE/spring-messaging-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..e6727a6
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.8.RELEASE/spring-oxm-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.8.RELEASE/spring-oxm-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-oxm/5.2.8.RELEASE/spring-oxm-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..5fa25dc
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_test_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-test:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.2.8.RELEASE/spring-test-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..6c8bcb7
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-tx:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.2.8.RELEASE/spring-tx-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..ae46cf0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_web_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-web:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.2.8.RELEASE/spring-web-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..652fb1b
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webflux_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webflux:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webflux/5.2.8.RELEASE/spring-webflux-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webflux/5.2.8.RELEASE/spring-webflux-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webflux/5.2.8.RELEASE/spring-webflux-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..d584e24
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.2.8.RELEASE/spring-webmvc-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
new file mode 100644
index 0000000..139eee0
--- /dev/null
+++ b/.idea/libraries/Maven__org_springframework_spring_websocket_5_2_8_RELEASE.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-websocket/5.2.8.RELEASE/spring-websocket-5.2.8.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml
new file mode 100644
index 0000000..d22b326
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api/2.0.1/magic-api-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml
new file mode 100644
index 0000000..58fbee2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_plugin_swagger_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-plugin-swagger/2.0.1/magic-api-plugin-swagger-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml
new file mode 100644
index 0000000..be2a716
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-api-spring-boot-starter/2.0.1/magic-api-spring-boot-starter-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml b/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml
new file mode 100644
index 0000000..5eedcb2
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-editor:2.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-editor/2.0.1/magic-editor-2.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml b/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml
new file mode 100644
index 0000000..87ef154
--- /dev/null
+++ b/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ssssssss:magic-script:1.8.5">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ssssssss/magic-script/1.8.5/magic-script-1.8.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml b/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml
new file mode 100644
index 0000000..1a8ebe7
--- /dev/null
+++ b/.idea/libraries/Maven__org_synchronoss_cloud_nio_multipart_parser_1_1_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.synchronoss.cloud:nio-multipart-parser:1.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-multipart-parser/1.1.0/nio-multipart-parser-1.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml b/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml
new file mode 100644
index 0000000..3897687
--- /dev/null
+++ b/.idea/libraries/Maven__org_synchronoss_cloud_nio_stream_storage_1_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.synchronoss.cloud:nio-stream-storage:1.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/synchronoss/cloud/nio-stream-storage/1.1.3/nio-stream-storage-1.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
new file mode 100644
index 0000000..aed7fe2
--- /dev/null
+++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.xmlunit:xmlunit-core:2.6.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.6.3/xmlunit-core-2.6.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
new file mode 100644
index 0000000..495fc06
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.25">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
new file mode 100644
index 0000000..0b13335
--- /dev/null
+++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: stax:stax-api:1.0.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/stax/stax-api/1.0.1/stax-api-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..602a0dd
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..79b0e75
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/feign-client-api/feign-client-api.iml" filepath="$PROJECT_DIR$/feign-client-api/feign-client-api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-base/mosty-base.iml" filepath="$PROJECT_DIR$/mosty-base/mosty-base.iml" />
+      <module fileurl="file://$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml" filepath="$PROJECT_DIR$/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-bkzx/mosty-bkzx.iml" filepath="$PROJECT_DIR$/mosty-bkzx/mosty-bkzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-dyga-cloud.iml" filepath="$PROJECT_DIR$/mosty-dyga-cloud.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-gateway/mosty-gateway.iml" filepath="$PROJECT_DIR$/mosty-gateway/mosty-gateway.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-hczx/mosty-hczx.iml" filepath="$PROJECT_DIR$/mosty-hczx/mosty-hczx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-jcgl/mosty-jcgl.iml" filepath="$PROJECT_DIR$/mosty-jcgl/mosty-jcgl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-other/mosty-other.iml" filepath="$PROJECT_DIR$/mosty-other/mosty-other.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-qwzx/mosty-qwzx.iml" filepath="$PROJECT_DIR$/mosty-qwzx/mosty-qwzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-rwzx/mosty-rwzx.iml" filepath="$PROJECT_DIR$/mosty-rwzx/mosty-rwzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-rzzx/mosty-rzzx.iml" filepath="$PROJECT_DIR$/mosty-rzzx/mosty-rzzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-sjzx/mosty-sjzx.iml" filepath="$PROJECT_DIR$/mosty-sjzx/mosty-sjzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-spxl/mosty-spxl.iml" filepath="$PROJECT_DIR$/mosty-spxl/mosty-spxl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-websocket/mosty-websocket.iml" filepath="$PROJECT_DIR$/mosty-websocket/mosty-websocket.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-wzzx/mosty-wzzx.iml" filepath="$PROJECT_DIR$/mosty-wzzx/mosty-wzzx.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-yjzl/mosty-yjzl.iml" filepath="$PROJECT_DIR$/mosty-yjzl/mosty-yjzl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mosty-yszx/mosty-yszx.iml" filepath="$PROJECT_DIR$/mosty-yszx/mosty-yszx.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..446d78b
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="2fe7d933-c25c-4b0a-af9e-56f23f2ef2b9" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.6.2" />
+        <option name="userSettingsFile" value="C:\tools\apache-maven-3.6.2\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="ProjectId" id="2j8LCmsPSMSw6m0U64A1M18PIQK" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
+    <property name="RequestMappingsPanelOrder0" value="0" />
+    <property name="RequestMappingsPanelOrder1" value="1" />
+    <property name="RequestMappingsPanelWidth0" value="75" />
+    <property name="RequestMappingsPanelWidth1" value="75" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../mosty-common" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+  </component>
+  <component name="ReactorSettings">
+    <option name="notificationShown" value="true" />
+  </component>
+  <component name="RebelAgentSelection">
+    <selection>jr</selection>
+  </component>
+  <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
+  </component>
+  <component name="RunManager" selected="Spring Boot.MostyJcglApplication">
+    <configuration name="MostyBaseApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-base" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.base.MostyBaseApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyBkzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-bkzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.bkzx.MostyBkzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-gateway" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.base.gateway.MostyGatewayApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyHczxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-hczx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.hczx.MostyHczxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyJcglApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-jcgl" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.base.manager.MostyJcglApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyLzotherApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-other" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.lzother.MostyLzotherApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyQwzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-qwzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.qwzx.MostyQwzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyRwzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-rwzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.rwzx.MostyRwzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyRzzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-rzzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.rzzx.MostyRzzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostySjzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-sjzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.sjzx.MostySjzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostySpxlApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-spxl" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.spxl.MostySpxlApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyWebSocketApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-websocket" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.websocket.MostyWebSocketApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyWzzxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-wzzx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.wzzx.MostyWzzxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyYjzlApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-yjzl" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.yjzl.MostyYjzlApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="MostyYszxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="mosty-yszx" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.mosty.yszx.MostyYszxApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="ServiceViewManager">
+    <option name="viewStates">
+      <list>
+        <serviceView>
+          <option name="contentProportion" value="0.21969697" />
+          <treeState>
+            <expand>
+              <path>
+                <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+                <item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              </path>
+              <path>
+                <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+                <item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+                <item name="Not Started" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              </path>
+            </expand>
+            <select />
+          </treeState>
+        </serviceView>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="2fe7d933-c25c-4b0a-af9e-56f23f2ef2b9" name="Default Changelist" comment="" />
+      <created>1720763631448</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1720763631448</updated>
+      <workItem from="1720763633425" duration="11748000" />
+      <workItem from="1721024351740" duration="3431000" />
+      <workItem from="1721030332706" duration="629000" />
+      <workItem from="1721096988080" duration="11364000" />
+      <workItem from="1721217813815" duration="1604000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="414" y="171" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1721200773966">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="414" y="171" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1032@0.0.1920.1032" timestamp="1721200773966" />
+    <state x="690" y="262" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1721099753608">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="690" y="262" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1032@0.0.1920.1032" timestamp="1721099753608" />
+    <state width="400" height="466" key="DebuggerActiveHint" timestamp="1720773394275">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="400" height="466" key="DebuggerActiveHint/0.0.1920.1040@0.0.1920.1040" timestamp="1720773394275" />
+    <state x="740" y="276" key="FileChooserDialogImpl" timestamp="1721098449014">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="740" y="276" key="FileChooserDialogImpl/0.0.1920.1032@0.0.1920.1032" timestamp="1721098449014" />
+    <state x="740" y="278" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1720766296237" />
+    <state width="1877" height="258" key="GridCell.Tab.0.bottom" timestamp="1721220333412">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="258" key="GridCell.Tab.0.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1721220333412" />
+    <state width="1877" height="436" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1721031754393" />
+    <state width="1877" height="258" key="GridCell.Tab.0.center" timestamp="1721220333412">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="258" key="GridCell.Tab.0.center/0.0.1920.1032@0.0.1920.1032" timestamp="1721220333412" />
+    <state width="1877" height="436" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1721031754392" />
+    <state width="1877" height="258" key="GridCell.Tab.0.left" timestamp="1721220333411">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="258" key="GridCell.Tab.0.left/0.0.1920.1032@0.0.1920.1032" timestamp="1721220333411" />
+    <state width="1877" height="436" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1721031754392" />
+    <state width="1877" height="258" key="GridCell.Tab.0.right" timestamp="1721220333412">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1877" height="258" key="GridCell.Tab.0.right/0.0.1920.1032@0.0.1920.1032" timestamp="1721220333412" />
+    <state width="1877" height="436" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1721031754392" />
+    <state width="1441" height="485" key="GridCell.Tab.1.bottom" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.1.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.1.center" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.1.center/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.1.left" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.1.left/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.1.right" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.1.right/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.2.bottom" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.2.bottom/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101151" />
+    <state width="1441" height="485" key="GridCell.Tab.2.center" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.2.center/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.2.left" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.2.left/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101150" />
+    <state width="1441" height="485" key="GridCell.Tab.2.right" timestamp="1721200831730">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state width="1441" height="485" key="GridCell.Tab.2.right/0.0.1920.1032@0.0.1920.1032" timestamp="1721200831730" />
+    <state width="1441" height="431" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1721027101151" />
+    <state x="463" y="164" key="SettingsEditor" timestamp="1721097023215">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="463" y="164" key="SettingsEditor/0.0.1920.1032@0.0.1920.1032" timestamp="1721097023215" />
+    <state x="463" y="165" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1721025944334" />
+    <state width="498" height="508" key="SwitcherDM" timestamp="1720775463977">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="498" height="508" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1720775463977" />
+    <state x="652" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1721217812771">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="652" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1032@0.0.1920.1032" timestamp="1721217812771" />
+    <state x="652" y="347" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1721030333233" />
+    <state x="647" y="273" width="807" height="632" key="find.popup" timestamp="1721099603614">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="647" y="273" width="807" height="632" key="find.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1721099603614" />
+    <state x="647" y="275" width="759" height="548" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1720778049389" />
+    <state x="616" y="172" width="672" height="671" key="search.everywhere.popup" timestamp="1721198306647">
+      <screen x="0" y="0" width="1920" height="1032" />
+    </state>
+    <state x="616" y="172" width="672" height="671" key="search.everywhere.popup/0.0.1920.1032@0.0.1920.1032" timestamp="1721198306647" />
+    <state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1720773084606" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/feign-client-api/feign-client-api.iml b/feign-client-api/feign-client-api.iml
new file mode 100644
index 0000000..f409c0e
--- /dev/null
+++ b/feign-client-api/feign-client-api.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml b/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml
new file mode 100644
index 0000000..f023110
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/mosty-base-feign-sdk.iml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353923" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/pom.xml b/feign-client-api/mosty-base-feign-sdk/pom.xml
new file mode 100644
index 0000000..a958f34
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>feign-client-api</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-base-feign-sdk</artifactId>
+    <dependencies>
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>mosty-jcgl</artifactId>-->
+        <!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-hystrix</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.2.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-hystrix</artifactId>
+            <version>10.10.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.feign</groupId>
+            <artifactId>feign-slf4j</artifactId>
+            <version>8.14.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-core-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hikvision.ga</groupId>
+            <artifactId>artemis-http-client</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.18.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKCSTypeEnum.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKCSTypeEnum.java
new file mode 100644
index 0000000..e5cf2fe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKCSTypeEnum.java
@@ -0,0 +1,39 @@
+package com.mosty.base.enums;
+
+import lombok.Getter;
+
+/**
+ * 布控数据库厂商
+ */
+@Getter
+public enum BKCSTypeEnum {
+    DAHUA("大华","dahua","DaHuaService",true),
+    HAIKANG("海康","haikang","HaiKangService",true),
+    ;
+
+    private  String name;
+    private  String value;
+    private  String beanName;
+    private  boolean enable;
+
+    private BKCSTypeEnum(String name, String value, String beanName, boolean enable){
+        this.name = name;
+        this.value =value;
+        this.enable = enable;
+        this.beanName = beanName;
+    }
+
+    /**
+     * 根据值转换为枚举类型
+     * @param value
+     * @return
+     */
+    public  static BKCSTypeEnum toValue(String value){
+        for (BKCSTypeEnum _tmp : BKCSTypeEnum.values()){
+            if(value.toLowerCase().equals(_tmp.getValue())){
+                return  _tmp;
+            }
+        }
+        return  null;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKDbTypeEnum.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKDbTypeEnum.java
new file mode 100644
index 0000000..e77f5d6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BKDbTypeEnum.java
@@ -0,0 +1,44 @@
+package com.mosty.base.enums;
+
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * 布控数据库类型
+ */
+@Getter
+public enum BKDbTypeEnum implements Serializable {
+    All("所有","All",false),        //所有默认
+    Personnel("人员","Personnel",false),  //人员
+    Car("车辆","Car",true);         //车辆
+
+    private String name;
+    private String code;
+    private boolean hidden;
+
+    private BKDbTypeEnum(String name, String code, boolean hidden){
+        this.name = name;
+        this.code = code;
+        this.hidden = hidden;
+
+    }
+
+    /**
+     * 根据代码转换成枚举类型
+     * @param value
+     * @return
+     */
+    public  static BKDbTypeEnum toCode(String value){
+        if(StringUtils.isEmpty(value)){
+            return  null;
+        }
+        for (BKDbTypeEnum _tmp : BKDbTypeEnum.values()){
+            if(_tmp.getCode().toLowerCase().equals(value.toLowerCase())){
+                return  _tmp;
+            }
+        }
+        return  null;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BkTypeEnum.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BkTypeEnum.java
new file mode 100644
index 0000000..7bfb4b4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/BkTypeEnum.java
@@ -0,0 +1,38 @@
+package com.mosty.base.enums;
+
+import lombok.Getter;
+
+/**
+ * 布控类型
+ */
+@Getter
+public enum BkTypeEnum {
+    JTRL("静态人脸","5100"),
+    ZPRL("抓拍人脸","5200"),
+    BKRL("布控人脸","5300"),
+    BKCP("布控车牌","7300"),
+    ;
+
+    private  String  value;
+    private  String  name;
+
+    private BkTypeEnum(String name, String value){
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * 根据value转换成相关对应的枚举类型
+     * @param value
+     * @return
+     */
+    public static BkTypeEnum toValue(String value){
+        for (BkTypeEnum _tmp : BkTypeEnum.values()){
+            if(value.equals(_tmp.getValue())){
+                return _tmp;
+            }
+        }
+        return  null;
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/PlateClassEnum.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/PlateClassEnum.java
new file mode 100644
index 0000000..d36c23a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/enums/PlateClassEnum.java
@@ -0,0 +1,66 @@
+package com.mosty.base.enums;
+
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 号牌种类枚举
+ */
+@Getter
+public enum PlateClassEnum {
+    DC("大型汽车号牌","01","yellow","truck"),
+    XC("小型汽车号牌","02","blue","vehicle"),
+    SGQC("使馆汽车号牌","03","black","vehicle"),
+    LSGQC("领馆汽车号牌","04","black","vehicle"),
+    JWQC("境外汽车号牌","05","black","vehicle"),
+    WJQC("外籍汽车号牌","06","black","vehicle"),
+    PTMT("普通摩托车号牌","07","blue",""),
+    QBMT("轻便摩托车号牌","08","blue",""),
+    SGMT("使馆摩托车号牌","09","black",""),
+    LSGMT("领馆摩托车号牌","10","black",""),
+    JWMT("境外摩托车号牌","11","black",""),
+    WJMT("外籍摩托车号牌","12","black",""),
+    JYQC("警用汽车","23","white","vehicle"),
+    CDDQC("纯电动新能源小车","102","green","vehicle"),
+    HHXNYQC("混合新能源小车","103","green","vehicle"),
+    CDDXNYDC("纯电动新能源大车","104","green","truck"),
+    HHXNYDC("混合新能源大车","105","green","truck"),
+    ;
+    private  String  name;
+    private  String  value;
+    private  String  color;
+    private  String  vehicleType;
+    private PlateClassEnum(String name, String value, String color, String vehicleType){
+        this.name = name;
+        this.value = value;
+        this.color = color;
+        this.vehicleType = vehicleType;
+    }
+
+    /**
+     * 根据值转换成枚举类型
+     * @param value
+     * @return
+     */
+    public  static PlateClassEnum toValue(String value){
+        for (PlateClassEnum _tp : PlateClassEnum.values()){
+            if((_tp.getValue().equals(value))){
+                return  _tp;
+            }
+        }
+        return  null;
+    }
+
+    /**
+     * 根据值取枚举类型，后返回枚举类型的名字
+     * @param value
+     * @return
+     */
+    public  static  String   getNameByValue(String value){
+        PlateClassEnum _tpEnum = toValue(value);
+        if(null == _tpEnum){
+            return StringUtils.EMPTY;
+        }
+        return  _tpEnum.getName();
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/FeignAutoConfiguration.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/FeignAutoConfiguration.java
new file mode 100644
index 0000000..8773cc2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/FeignAutoConfiguration.java
@@ -0,0 +1,17 @@
+package com.mosty.base.feign;
+
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ *
+ * @author kevin
+ * @date 2022/2/3 7:28 PM
+ * @since 1.0.0
+ */
+@Configuration
+@EnableFeignClients("com.mosty.base.feign.service")
+public class FeignAutoConfiguration {
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/OpenFeignLogConfig.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/OpenFeignLogConfig.java
new file mode 100644
index 0000000..9e40a29
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/OpenFeignLogConfig.java
@@ -0,0 +1,36 @@
+package com.mosty.base.feign.config;
+
+import feign.Logger;
+import feign.codec.Decoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringDecoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:tangtongda@gmail.com">Tino.Tang</a>
+ * @version ${project.version} - 2021/11/29
+ */
+@Configuration
+public class OpenFeignLogConfig {
+
+    @Bean
+    public Logger.Level feignLoggerLeave() {
+        return Logger.Level.FULL;
+    }
+
+
+    @Bean
+    public Decoder feignDecoder() {
+        WxMessageConverter wxConverter = new WxMessageConverter();
+        ObjectFactory<HttpMessageConverters> objectFactory = () -> new HttpMessageConverters(wxConverter);
+        return new SpringDecoder(objectFactory);
+    }
+
+}
+
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/WxMessageConverter.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/WxMessageConverter.java
new file mode 100644
index 0000000..d3fc6d8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/config/WxMessageConverter.java
@@ -0,0 +1,17 @@
+package com.mosty.base.feign.config;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WxMessageConverter extends MappingJackson2HttpMessageConverter {
+    public WxMessageConverter() {
+        List<MediaType> mediaTypes = new ArrayList<>();
+        mediaTypes.add(MediaType.TEXT_PLAIN);
+        mediaTypes.add(MediaType.TEXT_HTML);
+        setSupportedMediaTypes(mediaTypes);
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/fallback/SysDeptRemoteServiceFallback.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/fallback/SysDeptRemoteServiceFallback.java
new file mode 100644
index 0000000..7227a52
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/fallback/SysDeptRemoteServiceFallback.java
@@ -0,0 +1,179 @@
+package com.mosty.base.feign.fallback;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.config.entity.vo.SysDictVO;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * 部门信息 rpc服务 降级处理
+ *
+ * @author kevin
+ * @date 2022/7/6 10:30 上午
+ * @since 1.0.0
+ */
+@Component
+@Slf4j
+public class SysDeptRemoteServiceFallback implements FallbackFactory<MostyBaseFeignService> {
+
+    @Override
+    public MostyBaseFeignService create(Throwable throwable) {
+        return new MostyBaseFeignService() {
+            @GetMapping("/sysDept/getChildDeptList")
+            @Override
+            public ResponseResult<SysDeptDTO> getDeptByOrgCode(String orgCode) {
+                log.error("查询部门信息异常，{}", throwable.getMessage());
+
+                return null;
+            }
+
+            @Override
+            public ResponseResult<DeptInfoVo> getOrgByDeptId(String deptid) {
+                log.error("查询部门信息异常，{}", throwable.getMessage());
+
+                return null;
+            }
+
+            @Override
+            public ResponseResult<DeptInfoVo> getOrgByOrgcode(String orgcode) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<SysUserDeptVO>> getUserAll(String deptId) {
+                log.error("查询部门信息异常，{}", throwable.getMessage());
+                return null;
+            }
+
+            @Override
+            public ResponseResult<Integer> getUserCount(String deptid) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<DeptInfoVo>> getDeptAll() {
+                log.error("查询所有的部门信息集合失败，{}", throwable.getMessage());
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<String>> getChildDept(String deptid) {
+                log.error("查询部门下的所有子部门信息失败，{}", throwable.getMessage());
+                return null;
+            }
+
+            @GetMapping("/mosty-base/sysDept/getChildDeptByOrgCode/{orgcode}")
+            @Override
+            public ResponseResult<List<String>> getChildDeptByOrgCode(String orgcode) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<DeptInfoVo>> getChildDept(GetDeptListDTO dto) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<Integer> sendMsg(SysMessageInfoInsertDto dto) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<SysUserDeptVO>> getUserList(String deptid) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<DeptInfoVo> getDeptInfoByUserId(String userId) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<SysUser> getUserInfo(String userId) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<String> getValue(String pzj) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<SysDictVO> getSysDictByCode(String dictCode) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<SysDeptDTO>> getPcsByFxjdm(String orgcode) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<SysUser> getUserInfoBySfzh(String sfzh) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<JSONObject> getAddress(String jd, String wd) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<JSONObject> getLzAddress(String jd, String wd) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<SysDept>> getOrg(SysDeptQuery deptQuery) {
+                return null;
+            }
+
+            @GetMapping("/mosty-base/userDeptFeign/getDataPermission")
+            @Override
+            public ResponseResult<Boolean> getDataPermission(String sfz, String deptcode) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<String> getSsbm(GetSsbmDto dto) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<List<SysDept>> getOrganizationList(GetSysDeptListQuery query) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<SysDept> getSysDeptBySsbmdm(String ssbmdm) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<DeptInfoVo> getDeptInfoBySfzh(String sfzh) {
+                return null;
+            }
+
+            @Override
+            public ResponseResult<String> downloadBaes64(String id) {
+                return null;
+            }
+        };
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/AbstractGeometryTypeHandler.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/AbstractGeometryTypeHandler.java
new file mode 100644
index 0000000..047707f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/AbstractGeometryTypeHandler.java
@@ -0,0 +1,92 @@
+package com.mosty.base.feign.handle;
+
+import com.mosty.base.utils.JtsUtils;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.io.WKTReader;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * 字符串转为JTS对应的几何类型
+ */
+@MappedJdbcTypes({ JdbcType.OTHER })
+public abstract class AbstractGeometryTypeHandler<T extends Geometry> extends BaseTypeHandler<T> {
+	/**
+	 * 把Java类型参数转换为对应的数据库类型
+	 *
+	 * @param ps        当前的PreparedStatement对象
+	 * @param i         当前参数位置
+	 * @param parameter 当前参数的Java对象
+	 * @param jdbcType  当前参数的数据库类型
+	 * @throws SQLException
+	 */
+	public void setNonNullParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbcType) throws SQLException {
+		String wkt = JtsUtils.toEwkt(parameter);
+		ps.setObject(i, wkt);
+	}
+
+	/**
+	 * 获取数据结果集时把数据库类型转换为对应的Java类型
+	 *
+	 * @param rs         当前的结果集
+	 * @param columnName 当前的字段名称
+	 * @return 转换后的Java对象
+	 * @throws SQLException
+	 */
+	public T getNullableResult(ResultSet rs, String columnName) throws SQLException {
+		String wkt = (String) rs.getObject(columnName);
+		return (T) getGeometryFromWkt(wkt);
+	}
+
+	/**
+	 * 通过字段位置获取字段数据时把数据库类型转换为对应的Java类型
+	 *
+	 * @param rs          当前的结果集
+	 * @param columnIndex 当前字段的位置
+	 * @return 转换后的Java对象
+	 * @throws SQLException
+	 */
+	public T getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+		String wkt = (String) rs.getObject(columnIndex);
+		return (T) getGeometryFromWkt(wkt);
+	}
+
+	/**
+	 * 调用存储过程后把数据库类型的数据转换为对应的Java类型
+	 *
+	 * @param cs          当前的CallableStatement执行后的CallableStatement
+	 * @param columnIndex 当前输出参数的位置
+	 * @return
+	 * @throws SQLException
+	 */
+	public T getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+		String wkt = (String) cs.getObject(columnIndex);
+		return (T) getGeometryFromWkt(wkt);
+	}
+
+	// 从WKT中获取几何
+	private Geometry getGeometryFromWkt(String wkt) {
+		WKTReader reader = new WKTReader();
+		Geometry geometry = null;
+		if(wkt == null) return null;
+		try {
+			geometry = reader.read(wkt);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if (geometry == null) {
+			return null;
+		}
+		return geometry;
+	}
+
+
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/LineStringTypeHandler.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/LineStringTypeHandler.java
new file mode 100644
index 0000000..6d50c72
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/LineStringTypeHandler.java
@@ -0,0 +1,12 @@
+package com.mosty.base.feign.handle;
+
+import com.vividsolutions.jts.geom.LineString;
+import org.apache.ibatis.type.MappedTypes;
+
+/**
+ * WKT转为LineString
+ */
+@MappedTypes(LineString.class)
+public class LineStringTypeHandler extends AbstractGeometryTypeHandler<LineString> {
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PointTypeHandler.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PointTypeHandler.java
new file mode 100644
index 0000000..d2a61c2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PointTypeHandler.java
@@ -0,0 +1,12 @@
+package com.mosty.base.feign.handle;
+
+import com.vividsolutions.jts.geom.Point;
+import org.apache.ibatis.type.MappedTypes;
+
+/**
+ * WKT转为Point
+ */
+@MappedTypes(Point.class)
+public class PointTypeHandler extends AbstractGeometryTypeHandler<Point> {
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PolygonTypeHandler.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PolygonTypeHandler.java
new file mode 100644
index 0000000..2d3b580
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/handle/PolygonTypeHandler.java
@@ -0,0 +1,11 @@
+package com.mosty.base.feign.handle;
+
+import com.vividsolutions.jts.geom.Polygon;
+import org.apache.ibatis.type.MappedTypes;
+
+/**
+ * WKT转为Polygon
+ */
+@MappedTypes(Polygon.class)
+public class PolygonTypeHandler extends AbstractGeometryTypeHandler<Polygon> {
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyBaseFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyBaseFeignService.java
new file mode 100644
index 0000000..15beb02
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyBaseFeignService.java
@@ -0,0 +1,138 @@
+package com.mosty.base.feign.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.feign.fallback.SysDeptRemoteServiceFallback;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.config.entity.vo.SysDictVO;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 基础服务对外调用接口 feign
+ **/
+@SuppressWarnings("unused")
+@FeignClient(value = "mosty-base",
+        fallbackFactory = SysDeptRemoteServiceFallback.class,
+        contextId = "com.mosty.base.feign.service.SysDeptRemoteService")
+public interface MostyBaseFeignService {
+
+    // 根据组织机构编码查询部门信息
+    @GetMapping("/sysDept/getChildDeptList")
+    ResponseResult<SysDeptDTO> getDeptByOrgCode(@RequestParam("orgCode") String orgCode);
+
+    // 根据部门deptid获取所属分县局、所属地市州
+    @GetMapping("/mosty-base/deptFeign/getOrgByDeptId/{deptid}")
+    ResponseResult<DeptInfoVo> getOrgByDeptId(@PathVariable("deptid") String deptid);
+
+    // 根据部门orgcode获取所属分县局、所属地市州
+    @GetMapping("/mosty-base/deptFeign/getOrgByOrgcode/{orgcode}")
+    ResponseResult<DeptInfoVo> getOrgByOrgcode(@PathVariable("orgcode") String orgcode);
+
+    // 查询所有的用户数据（包含对应的部门信息）
+    @GetMapping("/mosty-base/userDeptFeign/getUserAll/{deptid}")
+    ResponseResult<List<SysUserDeptVO>> getUserAll(@PathVariable("deptid") String deptid);
+
+    // 查询部门下的总人数（包含子部门）
+    @GetMapping("/mosty-base/userDeptFeign/getUserCount/{deptid}")
+    ResponseResult<Integer> getUserCount(@PathVariable("deptid") String deptid);
+
+    // 查询所有的部门信息列表
+    @GetMapping("/mosty-base/deptFeign/getDeptAll")
+    ResponseResult<List<DeptInfoVo>> getDeptAll();
+
+    // 查询部门下的所有的子部门信息列表
+    @GetMapping("/mosty-base/sysDept/getChildDept/{deptid}")
+    ResponseResult<List<String>> getChildDept(@PathVariable("deptid") String deptid);
+
+    // 查询部门下的所有的子部门信息列表
+    @GetMapping("/mosty-base/sysDept/getChildDeptByOrgCode/{orgcode}")
+    ResponseResult<List<String>> getChildDeptByOrgCode(@PathVariable("orgcode") String orgcode);
+
+    // 查询部门下的所有的子部门信息列表
+    @PostMapping("/mosty-base/deptFeign/getChildDept")
+    ResponseResult<List<DeptInfoVo>> getChildDept(@RequestBody GetDeptListDTO dto);
+
+    // 给人员发送消息
+    @PostMapping("/mosty-base/sysMessage/sendMsg")
+    ResponseResult<Integer> sendMsg(@RequestBody SysMessageInfoInsertDto dto);
+
+    // 查询部门下的人员信息，不包含子部门
+    @GetMapping("/mosty-base/userDeptFeign/getUserList/{deptid}")
+    ResponseResult<List<SysUserDeptVO>> getUserList(@PathVariable("deptid") String deptid);
+
+    // 根据用户ID，获取用户部门信息
+    @GetMapping("/mosty-base/userDeptFeign/getDeptInfoByUserId/{userId}")
+    ResponseResult<DeptInfoVo> getDeptInfoByUserId(@PathVariable("userId") String userId);
+
+    // 根据用户ID，获取用户详情信息
+    @GetMapping("/mosty-base/userFeign/getUserInfo/{userId}")
+    ResponseResult<SysUser> getUserInfo(@PathVariable("userId") String userId);
+
+    // 通过key获取配置信息
+    @GetMapping("/mosty-base/sysConfigNew/getValue/{pzj}")
+    ResponseResult<String> getValue(@PathVariable("pzj") String pzj);
+
+    // 通过字典名称获取词条列表
+    @GetMapping("/mosty-base/sysDict/getSysDictByCode")
+    ResponseResult<SysDictVO> getSysDictByCode(@RequestParam("dictCode") String dictCode);
+
+    // 查询分局下的所有的派出所信息
+    @PostMapping("/mosty-base/deptFeign/getPcsByFxjdm/{orgcode}")
+    ResponseResult<List<SysDeptDTO>> getPcsByFxjdm(@PathVariable("orgcode") String orgcode);
+
+    // 通过身份证号获取用户信息
+    @GetMapping("/mosty-base/userFeign/getUserInfoBySfzh/{sfzh}")
+    ResponseResult<SysUser> getUserInfoBySfzh(@PathVariable("sfzh") String sfzh);
+
+    // 根据经纬度获取地址信息
+    @GetMapping("/mosty-base/other/getAddress")
+    ResponseResult<JSONObject> getAddress(@RequestParam("jd") String jd, @RequestParam("wd") String wd);
+
+    // 根据经纬度获取地址信息（泸州）
+    @GetMapping("/mosty-base/other/getLzAddress")
+    ResponseResult<JSONObject> getLzAddress(@RequestParam("jd") String jd, @RequestParam("wd") String wd);
+
+    // 获取部门信息
+    @PostMapping("/mosty-base/deptFeign/getOrg")
+    ResponseResult<List<SysDept>> getOrg(@RequestBody SysDeptQuery deptQuery);
+
+    // 查询用户是否有该部门的数据权限
+    @GetMapping("/mosty-base/userDeptFeign/getDataPermission")
+    ResponseResult<Boolean> getDataPermission(@RequestParam("sfz") String sfz, @RequestParam("deptcode") String deptcode);
+
+    // 获取查询条件
+    @PostMapping("/mosty-base/deptFeign/getSsbm")
+    ResponseResult<String> getSsbm(@RequestBody GetSsbmDto dto);
+
+    // 获取组织机构信息列表
+    @PostMapping("/mosty-base/deptFeign/getOrganizationList")
+    ResponseResult<List<SysDept>> getOrganizationList(@RequestBody GetSysDeptListQuery query);
+
+    //查询部门详情
+    @GetMapping("/mosty-base/deptFeign/getSysDeptBySsbmdm")
+    ResponseResult<SysDept> getSysDeptBySsbmdm(@RequestParam String ssbmdm);
+
+    // 根据身份证，获取用户部门信息
+    @GetMapping("/mosty-base/userDeptFeign/getDeptInfoBySfzh/{sfzh}")
+    ResponseResult<DeptInfoVo> getDeptInfoBySfzh(@PathVariable("sfzh") String sfzh);
+
+    //获取华为minio图片base64
+    @PostMapping("/mosty-base/minio/image/downloadBaes64/{id}")
+    ResponseResult<String> downloadBaes64(@PathVariable("id") String id);
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyHczxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyHczxFeignService.java
new file mode 100644
index 0000000..e162323
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyHczxFeignService.java
@@ -0,0 +1,32 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 核查中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-hczx")
+public interface MostyHczxFeignService {
+
+    // 实际盘查人数
+    @PostMapping("/mosty-hczx/tbHcBpcry/getSjpcr")
+    ResponseResult<Integer> getSjpcr(@RequestParam("ssbmdm") String ssbmdm, @RequestParam("time") String time);
+
+    // 实际盘查车数
+    @PostMapping("/mosty-hczx/tbHcBpccl/getSjpcc")
+    ResponseResult<Integer> getSjpcc(@RequestParam("ssbmdm") String ssbmdm, @RequestParam("time") String time);
+
+    // 实际盘查物品
+    @PostMapping("/mosty-hczx/tbHcBpccl/getPcWptj")
+    ResponseResult<Integer> getPcWptj(@RequestParam("ssbmdm") String ssbmdm, @RequestParam("time") String time);
+
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyJcglFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyJcglFeignService.java
new file mode 100644
index 0000000..bf88f6e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyJcglFeignService.java
@@ -0,0 +1,92 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.base.model.dto.jcgl.*;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 基础管理对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-jcgl")
+public interface MostyJcglFeignService {
+
+    // 根据deptid获取所有的辅警信息
+    @PostMapping("/mosty-jcgl/tbJcglXfll/getFjList/{deptid}")
+    ResponseResult<List<TbJcglXfllVo>> getFjList(@PathVariable("deptid") String deptid);
+
+    // 根据deptid获取所有的巡逻力量信息
+    @PostMapping("/mosty-jcgl/tbJcglXfll/getXfll")
+    ResponseResult<List<TbJcglXfllVo>> getXfll(@RequestBody TbJcglXfllQueryAllDto dto);
+
+    // 根据code获取第三方信息
+    @GetMapping("/mosty-jcgl/dsf/getDsfInfo/{code}")
+    ResponseResult<TbJcglDsfVo> getDsfInfo(@PathVariable("code") String code);
+
+    // 根据ID查询巡防区域
+    @GetMapping("/mosty-jcgl/tbJcglXfqy/selectById")
+    ResponseResult<TbJcglXfqyDto> getxfqById(@RequestParam String id);
+
+    // 根据ID查询快反点
+    @GetMapping("/mosty-jcgl/tpJcglKfd/selectByid")
+    ResponseResult<TbJcglKfdDto> getKfdById(@RequestParam String id);
+
+    // 根据ID查询警务站
+    @GetMapping("/mosty-jcgl/tbJcglJwz/selectByid")
+    ResponseResult<TbJcglJwz> getJwzById(@RequestParam String id);
+
+    // 根据身份证查询巡组力量信息
+    @PostMapping("/mosty-jcgl/tbJcglXfll/getXfllBySfz/{sfzh}")
+    ResponseResult<TbJcglXfllDto> getXfllBySfz(@PathVariable("sfzh") String sfzh);
+
+    // 根据身份证查询巡组力量信息
+    @PostMapping("/mosty-jcgl/tbJcglXfll")
+    ResponseResult<Boolean> addXfll(@RequestBody TbJcglXfllDto dto);
+
+    // 根据身份证查询巡组力量信息
+    @PutMapping("/mosty-jcgl/tbJcglXfll")
+    ResponseResult<Boolean> editXfll(@RequestBody TbJcglXfllDto dto);
+
+    // 删除巡防力量
+    @PostMapping("/mosty-jcgl/tbJcglXfll/delXfll/{id}")
+    ResponseResult<Void> delXfll(@PathVariable("id") String id);
+
+    // 查询重点区域配置分值列表
+    @GetMapping("/mosty-jcgl/fzpz/selectPzfzwtj")
+    ResponseResult<List<TbJcglPzfzDto>> getFzList();
+
+    // 添加计算出来的必巡点的数据
+    @PostMapping("/mosty-jcgl/tbJcglBxd/createdBxd")
+    ResponseResult<Void> createdBxd(@RequestBody List<Map<String, Object>> rList);
+
+
+    // 查询部门下面人员数量
+    @GetMapping("/mosty-jcgl/tbJcglXfll/getRysl")
+    ResponseResult<Integer> getRysl(@RequestParam String ssbmdm);
+
+    // 查询感知接入列表
+    @PostMapping("/mosty-jcgl/gzjr/getList")
+    ResponseResult<List<TbSbGzjr>> getGzjrList(@RequestBody TbSbGzjr dto);
+
+    // 查询巡防部门
+    @GetMapping("/mosty-jcgl/tbJcglXfll/getBmAll")
+    ResponseResult<List<TbJcglXfll>> getBmAll();
+
+    // 获取所有快反点
+    @PostMapping("/mosty-jcgl/tpJcglKfd/getListAll")
+    ResponseResult<List<TbJcglKfdDto>> getListKfdAll();
+
+    // 查询所有巡防区域数据
+    @PostMapping("/mosty-jcgl/tbJcglXfqy/getListAll")
+    ResponseResult<List<TbJcglXfqyDto>> getListXfqyAll();
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyLzotherFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyLzotherFeignService.java
new file mode 100644
index 0000000..b92449c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyLzotherFeignService.java
@@ -0,0 +1,39 @@
+package com.mosty.base.feign.service;
+
+
+import com.mosty.base.model.entity.lzother.*;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author dw
+ * @since 2022/12/15
+ * 泸州其他服务对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-other")
+public interface MostyLzotherFeignService {
+
+    // 根据身份证查询是否是在逃人员
+    @GetMapping("/mosty-other/trsZtry/selectBySfzh")
+    ResponseResult<TAlarmZtry> selectBySfzh(@RequestParam String sfzh);
+
+    // 根据身份证查询是否是常控人员
+    @GetMapping("/mosty-other/trsZtry/selectCkBySfzh")
+    ResponseResult<TAlarmCkxx> selectCkBySfzh(@RequestParam String sfzh);
+
+
+    // 根据身份证查询是否是布控人员
+    @GetMapping("/mosty-other/trsZtry/selectBkBySfzh")
+    ResponseResult<TAlarmBkxxRy> selectBkBySfzh(@RequestParam String sfzh);
+
+    // 根据信息查询是否处警
+    @PostMapping("/mosty-other/BphJlxx/getjlxxCz")
+    @ResponseBody
+    ResponseResult<BphJlxx> getjlxxCz(@RequestBody BphJlxx bphJlxx);
+
+    // 根据身份证查询是否有接警数据
+    @GetMapping("/mosty-other/BphJlxx/getjlxx")
+    ResponseResult<BphJlxx> getjlxx(@RequestParam String sfzh);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyQwzxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyQwzxFeignService.java
new file mode 100644
index 0000000..ae5ea5f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyQwzxFeignService.java
@@ -0,0 +1,57 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/29
+ * 勤务中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-qwzx")
+public interface MostyQwzxFeignService {
+
+    // 根据报备ID获取报备详情
+    @GetMapping("/mosty-qwzx/tbQwXfbb/{id}")
+    ResponseResult<TbQwXfbbVo> getBbInfo(@PathVariable("id") String id);
+
+    // 根据报备ID查询巡组下的人员列表
+    @GetMapping("/mosty-qwzx/tbQwXfbb/getJlxxByBbid/{id}")
+    ResponseResult<List<TbQwJlDto>> getJlxxByBbid(@PathVariable("id") String id);
+
+    // 查询范围内的最近的巡组信息
+    @GetMapping("/mosty-qwzx/tbQwXfbb/getBbxxByJi")
+    ResponseResult<TbQwXfbb> getBbxxByJi(@RequestBody TbQwXfbbQueryByJlDto dto);
+
+    // 根据设备ID查询该设备所在的巡组
+    @PostMapping("/mosty-qwzx/tbQwXfbb/getBbList/{sbid}")
+    ResponseResult<List<TbQwXfbb>> getBbList(@PathVariable("sbid") String sbid);
+
+    // 根据设备ID查询该设备所在的巡组
+    @PostMapping("/mosty-qwzx/tbQwXfbb/getClBbList/{gpsId}")
+    ResponseResult<List<TbQwXfbb>> getClBbList(@PathVariable("gpsId") String gpsId);
+
+    // 查询报备信息详情
+    @GetMapping("/mosty-qwzx/tbQwXfbb/getBbxxInfo")
+    ResponseResult<TbQwXfbb> getBbxxInfo(@RequestParam String id);
+
+    // 查询部门的报备的数量
+    @PostMapping("/mosty-qwzx/tbQwXfbb/getBbCount")
+    ResponseResult<Integer> getBbCount(@RequestParam("ssbmdm") String ssbmdm, @RequestParam("time") String time);
+
+    // 根据巡区获取报备id
+    @GetMapping("/mosty-qwzx/tbQwXfbb/getBbidByXq")
+    ResponseResult<List<TbQwXfbb>> getBbidByXq(@RequestParam String xqid);
+
+    // 查询部门时长、里程
+    @PostMapping("/mosty-qwzx/tbQwXfbb/getScLc")
+    ResponseResult<Map<String, Integer>> getScLc(@RequestParam("ssbmdm") String ssbmdm, @RequestParam("time") String time);
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRwzxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRwzxFeignService.java
new file mode 100644
index 0000000..a98c840
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRwzxFeignService.java
@@ -0,0 +1,38 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author dw
+ * @since 2022/10/05
+ * 任务中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-rwzx")
+public interface MostyRwzxFeignService {
+
+    // 根据内容信息查询地理要素数据
+    @PostMapping("/mosty-rwzx/tbRwTask/addRw")
+    @ResponseBody
+    ResponseResult<Integer> addRw(@RequestBody TbRwTaskDto dto);
+
+    // 根据任务ID和任务系类查询任务信息
+    @PostMapping("/mosty-rwzx/tbRwTask/inner/getRwByYwid")
+    @ResponseBody
+    ResponseResult<TbRwTask> getRwByYwid(@RequestBody TbRwTaskByYwidQuery query);
+
+    // 修改旧的指令任务状态为未读
+    @PostMapping("/mosty-rwzx/tbRwTask/inner/changeTaskStateByZlid")
+    @ResponseBody
+    ResponseResult<Void> changeTaskStateByZlid(@RequestBody TbZlxx zlxx);
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRzzxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRzzxFeignService.java
new file mode 100644
index 0000000..a6f4df0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyRzzxFeignService.java
@@ -0,0 +1,24 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 日志中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-rzzx")
+public interface MostyRzzxFeignService {
+    /**
+     *  根据来源id修改数据
+     * @param lyId 来源id
+     * @return
+     */
+    @PostMapping("/mosty-rzzx/tbSpxlSpxlfaSxt/updateLyId")
+    @ResponseBody
+    ResponseResult updateLyId(@RequestBody String lyId);
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostySjzxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostySjzxFeignService.java
new file mode 100644
index 0000000..7ed6b1e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostySjzxFeignService.java
@@ -0,0 +1,91 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.xinzhi.GxCjdb;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.model.vo.xinzhi.GxAlarmAllVo;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 数据中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-sjzx")
+public interface MostySjzxFeignService {
+
+    // 根据内容信息查询数据
+    @PostMapping("/mosty-sjzx/tbJq/selectVigilantList")
+    ResponseResult selectVigilant(@RequestBody String jsnr);
+
+    // 视频播放
+    @PostMapping("/mosty-sjzx/tbSjSpbf/add")
+    ResponseResult tbSjSpbfAdd(@RequestBody TbSjSpbfDTO tbSjSpbf);
+
+    // 添加新稚警情信息到数据库中
+    @PostMapping("/mosty-sjzx/tbJq/addXzjq")
+    ResponseResult<Void> addXzjq(@RequestBody GxAlarmAllVo entity);
+
+    // 添加高新新稚警情信息到数据库中
+    @PostMapping("/mosty-sjzx/tbJq/addXzJqCjdb")
+    ResponseResult<Void> addXzJqCjdb(@RequestBody GxCjdb cjdb);
+
+    // 添加仁寿警情信息到数据库中
+    @PostMapping("/mosty-sjzx/tbJq/addRsJq")
+    ResponseResult<Void> addRsJq(@RequestBody TbJq entity);
+
+    // 获取最新的一条警情信息
+    @GetMapping("/mosty-sjzx/tbJq/getLastJq")
+    ResponseResult<TbJqVo> getLastJq();
+
+    // 获取最新一条处警单数据
+    @GetMapping("/mosty-sjzx/tbJq/getLastJqCjdb")
+    ResponseResult<TbJqCjdb> getLastJqCjdb();
+
+    // 添加仁寿处警单数据
+    @PostMapping("/mosty-sjzx/tbJq/addRsCjdb")
+    ResponseResult<TbJqCjdb> addRsCjdb(@RequestBody TbJqCjdb cjdb);
+
+    // 添加泸州感知源信息
+    @PostMapping("/mosty-sjzx/tbJq/addLzGzy")
+    ResponseResult<TbJqCjdb> addLzGzy(ZhjmxfXfqwXfqyGzdw dto);
+
+    // 添加泸州警情信息
+    @PostMapping("/mosty-sjzx/tbJq/addLzJq")
+    ResponseResult<Void> addLzJq(@RequestBody VLz110Txj lz110);
+
+    // 添加宜宾警情信息
+    @PostMapping("/mosty-sjzx/tbJq/addYbJq")
+    ResponseResult<Void> addYbJq(@RequestBody Jjdb jjdb);
+
+    // 添加泸州海能达警情信息
+    @PostMapping("/mosty-sjzx/tbJq/addLzHndJq")
+    ResponseResult<Void> addLzHndJq(@RequestBody Jjdb jjdb);
+
+    // 查询警情详情
+    @GetMapping("/mosty-sjzx/tbJq/{id}")
+    ResponseResult<TbJqVo> queryById(@PathVariable("id") String id);
+
+    // 修改警情处置状态
+    @PostMapping("/mosty-sjzx/tbJq/updateJqCzzt")
+    ResponseResult<TbJq> updateJqCzzt(@RequestParam("id") String id, @RequestParam("czzt") String czzt);
+
+    // 查询没得经纬度的接警单编号
+    @GetMapping("/mosty-sjzx/tbJq/selectJjdbh")
+    ResponseResult<List<String>> selectJjdbh();
+
+
+    // 修改经纬度
+    @PostMapping("/mosty-sjzx/tbJq/updateJqJwd")
+    ResponseResult<Void> updateJqJwd(@RequestBody Jjdb jjdb);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyWebSocketFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyWebSocketFeignService.java
new file mode 100644
index 0000000..7793e1d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyWebSocketFeignService.java
@@ -0,0 +1,26 @@
+package com.mosty.base.feign.service;
+
+
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * websocket对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-websocket")
+public interface MostyWebSocketFeignService {
+
+    // 发送websocket信息
+    @PostMapping("/mosty-websocket/socket/sendMessage")
+    ResponseResult<Void> sendMessage(@RequestBody WebSocketObject obj);
+
+    // 发送报备数据websocket信息
+    @PostMapping("/mosty-websocket/socket/sendBbMessage")
+    ResponseResult<Void> sendBbMessage(@RequestBody WebSocketObject obj);
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYjzlFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYjzlFeignService.java
new file mode 100644
index 0000000..77b21fa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYjzlFeignService.java
@@ -0,0 +1,99 @@
+package com.mosty.base.feign.service;
+
+import com.mosty.base.model.dto.yjzl.GetLastYjDto;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.entity.lzother.TAlarmYjZl;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.entity.trs.VwAlermYjgl;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.lzother.TAlarmYjZlVo;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import com.mosty.base.model.vo.wzzx.TbWzSblswzVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 预警指令对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-yjzl")
+public interface MostyYjzlFeignService {
+
+    // 根据内容信息查询预警数据
+    @PostMapping("/mosty-yjzl/tbYjxx/getPageList")
+    ResponseResult getPageList(@RequestBody TbYjxxQuery dto);
+
+    // 根据内容信息查询警情数据
+    @PostMapping("/mosty-yjzl/tbZl/selectInstructList")
+    ResponseResult selectInstructList(@RequestBody TbZlxxQuery dto);
+
+    // 同步拓尔思预警指令
+    @PostMapping("/mosty-yjzl/tbZl/addTrsZl")
+    ResponseResult<Void> addTrsZl(@RequestBody VwAlermYjzlVo dto);
+
+    // 获取最后一条TRS推送的指令信息
+    @PostMapping("/mosty-yjzl/tbZl/getLastZlxx")
+    ResponseResult<TbZlxx> getLastZlxx();
+
+    // 根据条件查询最新的预警信息
+    @PostMapping("/mosty-yjzl/tbYjxx/getLastYj")
+    ResponseResult<TbYjxx> getLastYj(@RequestBody GetLastYjDto dto);
+
+    // 同步拓尔思预警指令
+    @PostMapping("/mosty-yjzl/tbZl/addTrsYj")
+    ResponseResult<Void> addTrsYj(@RequestBody VwAlermYjgl dto);
+
+    // 添加泸州拓尔思预警信息
+    @PostMapping("/mosty-yjzl/tbYjxxLz/addYjxx")
+    ResponseResult<Void> addYjxx(@RequestBody TAlarmYjgj item);
+
+    // 添加指令信息
+    @PostMapping("/mosty-yjzl/tbZl/addZl")
+    ResponseResult<Void> addZl(@RequestBody TbZlxxInsertDto dto);
+
+    // 修改预警信息是否发送指令
+    @PostMapping("/mosty-yjzl/tbYjxx/updateYjxxSffszl/{id}")
+    ResponseResult<Void> updateYjxxSffszl(@PathVariable("id") String id);
+
+    // 查询预警信息
+    @PostMapping("/mosty-yjzl/tbYjxx/getYjxx30Day")
+    ResponseResult<List<TbYjxx>> getYjxx30Day(@RequestBody TbYjxxQuery dto);
+
+    // 查询犯罪预测数量
+    @GetMapping("/mosty-yjzl/tbFzyc/getFzyjCount")
+    ResponseResult<Integer> getFzyjCount(@RequestParam("ssbmdm") String ssbmdm,
+                                         @RequestParam("time") String time, @RequestParam("sfxl") String sfxl);
+
+    // 查询指令的数量
+    @GetMapping("/mosty-yjzl/tbZl/getZlCount")
+    ResponseResult<Integer> getZlCount(@RequestParam("ssbmdm") String ssbmdm,
+                                       @RequestParam("time") String time, @RequestParam("zlzxzt") String zlzxzt);
+
+
+    // 修改预警信息是否发送指令
+    @PostMapping("/mosty-yjzl/tbFzycXljl/addBySbwz")
+    ResponseResult<Void> addBySbwz(@RequestBody TbFzJlVo vo);
+
+
+    // 添加融合数据
+    @PostMapping("/mosty-yjzl/tbYjxx/saveHryj")
+    ResponseResult<Void> saveHryj(@RequestBody RhMyhtWarn dto);
+
+    // 下发警情指令
+    @GetMapping("/mosty-yjzl/tbZl/andJqZl")
+    ResponseResult<Void> andJqZl(@RequestParam("ssbmid") String ssbmid,@RequestParam("jqid") String jqid, @RequestParam("bbids") String bbids, @RequestParam("zlxflx") String zlxflx);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYszxFeignService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYszxFeignService.java
new file mode 100644
index 0000000..7c93d90
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/feign/service/MostyYszxFeignService.java
@@ -0,0 +1,112 @@
+package com.mosty.base.feign.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.*;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.model.vo.yszx.*;
+import com.mosty.common.base.domain.ResponseResult;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 要素中心对外调用接口 feign
+ **/
+@FeignClient(value = "mosty-yszx")
+public interface MostyYszxFeignService {
+
+    // 根据内容信息查询地理要素数据
+    @GetMapping("/mosty-yszx/tbYsDl/selectGeography")
+    ResponseResult queryAll(@RequestBody TbYsDlQuery dto);
+
+    // 添加公安机关要素
+    @PostMapping("/mosty-yszx/tbYsGajg/add")
+    ResponseResult<Integer> add(@RequestBody TbYsGajgDto dto);
+
+    // 编辑公安机关要素
+    @PutMapping("/mosty-yszx/tbYsGajg/update")
+    ResponseResult<Void> update(@RequestBody TbYsGajgDto dto);
+
+    // 公安机关要素详情查询
+    @GetMapping("/mosty-yszx/tbYsGajg/{id}")
+    ResponseResult<TbYsGajgVo> getInfo(@PathVariable("id") String id);
+
+    // 删除公安机关要素
+    @DeleteMapping("/mosty-yszx/tbYsGajg/{id}")
+    ResponseResult<Void> delEntity(@PathVariable("id") String id);
+
+    // 根据必巡点id 和来源表名 删除公安机关要素
+    @DeleteMapping("/mosty-yszx/tbYsGajg")
+    ResponseResult<Void> delEntity(@RequestBody TbYsGajgDto dto);
+
+    // 根据条件查询公安机关要素
+    @PostMapping("/mosty-yszx/tbYsGajg/getList")
+    ResponseResult getGajgAll(@RequestBody TbYsGajgQuery dto);
+
+    // 查询摄像头要素详情
+    @GetMapping("/mosty-yszx/tbYsSxt/{id}")
+    ResponseResult<TbYsSxtDto> getSxtInfoVo(@PathVariable("id") String id);
+
+    // 根据设备编号查询摄像头详情
+    @GetMapping("/mosty-yszx/tbYsSxt/getInfoBySbbh/{sbbh}")
+    ResponseResult<TbYsSxtDto> getInfoBySbbh(@PathVariable("sbbh") String sbbh);
+
+    // 返回要素表中不存在的感知源
+    @PostMapping("/mosty-yszx/tbYsSxt/getSxtBhList")
+    ResponseResult<List<String>> getInfoBySbbh(@RequestBody List<String> ids);
+
+    // 添加感知源信息
+    @PostMapping("/mosty-yszx/tbYsSxt/add")
+    ResponseResult<Integer> addSxt(@RequestBody TbYsSxtDto dto);
+
+    // 根据点位判断所属派出所
+    @PostMapping("/mosty-yszx/tbYsGajg/getGajgByJwd")
+    ResponseResult<TbYsGajgVo> getGajgByJwd(@RequestBody TbYsGajgByJwdDto dto);
+
+    // 获取公安机关要素列表
+    @PostMapping("/mosty-yszx/tbYsGajg/getGajgList")
+    ResponseResult<List<TbYsGajgGlbmVo>> getGajgList(@RequestBody TbYsGajgQuery dto);
+
+    // 添加泸州感知源数据
+    @PostMapping("/mosty-yszx/tbYsSxt/addLzGzy")
+    ResponseResult<Void> addLzGzy(@RequestBody ZhjmxfXfqwXfqyGzdw dto);
+
+    // 查询人员详情信息
+    @GetMapping("/mosty-yszx/tbYsRy/getRyInfo")
+    ResponseResult<TbYsRyVo> getRyInfo(@RequestParam("sfzh") String sfzh);
+
+    // 添加人员要素
+    @PostMapping("/mosty-yszx/tbYsRy/addRyYs")
+    ResponseResult<Void> addRyYs(@RequestBody TbYsRyDto dto);
+
+    // 修改人员要素
+    @PostMapping("/mosty-yszx/tbYsRy/updateRyYs")
+    ResponseResult<Void> updateRyYs(@RequestBody TbYsRyDto dto);
+
+    // 修改人员标签要素
+    @PostMapping("/mosty-yszx/tbYsRy/updateRyBqYs")
+    ResponseResult<Void> updateRyBqYs(@RequestBody TbYsRyBqUpdateDto dto);
+
+    // 修改人员标签要素
+    @PostMapping("/mosty-yszx/tbYsRy/updateRyDhys")
+    ResponseResult<Void> updateRyDhys(@RequestBody TbYsRyDhUpdateDto dto);
+
+    // 查询摄像头信息
+    @PostMapping("/mosty-yszx/tbYsSxt/selectGzy")
+    ResponseResult<TbYsSxtDto> selectGzy(@RequestBody TbYsSxtPageOneQuery dto);
+
+    // 添加地理要素信息
+    @PostMapping("/mosty-yszx/tbYsDl")
+    ResponseResult<Integer> addDlYs(@RequestBody TbYsDlDto dto);
+
+    //根据名称查询地理要素
+    @GetMapping("/mosty-yszx/tbYsDl/selectDlys")
+    ResponseResult<TbYsDl> selectDlys(@RequestParam String ysmc);
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BaseEntity.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BaseEntity.java
new file mode 100644
index 0000000..c1cf1c0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BaseEntity.java
@@ -0,0 +1,95 @@
+package com.mosty.base.model;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.yjzl.TbFzycJsdx;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 基础系统字段
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "数据来源：1、PC，2、手机端", name = "xtSjly")
+    private String xtSjly;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "数据状态：0、注销，1、正常，-1、封存", name = "xtSjzt")
+    private String xtSjzt;
+
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "删除标识：0、未删除，1、已删除", name = "xtScbz")
+    private String xtScbz;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建IP", name = "xtCjip")
+    private String xtCjip;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", name = "xtCjsj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Timestamp xtCjsj;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人ID", name = "xtCjrId")
+    private String xtCjrId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人名称", name = "xtCjr")
+    private String xtCjr;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门代码", name = "xtCjbmdm")
+    private String xtCjbmdm;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门名称", name = "xtCjbmmc")
+    private String xtCjbmmc;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新IP", name = "xtZhgxip")
+    private String xtZhgxip;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新时间", name = "xtZhgxsj")
+    private Timestamp xtZhgxsj;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人ID", name = "xtZhgxrid")
+    private String xtZhgxrid;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人名称", name = "xtZhgxr")
+    private String xtZhgxr;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门代码", name = "xtZhgxbmdm")
+    private String xtZhgxbmdm;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门名称", name = "xtZhgxbm")
+    private String xtZhgxbm;
+
+    @ApiModelProperty(value = "备注", name = "bz")
+    private String bz;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BasePage.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BasePage.java
new file mode 100644
index 0000000..b90e849
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/BasePage.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "每页显示数量", notes = "",name = "pageSize")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "页码", notes = "",name = "pageCurrent")
+    private Integer pageCurrent;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GajgSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GajgSearchDto.java
new file mode 100644
index 0000000..e3ffaa6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GajgSearchDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.dto.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 公安机关查询
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GajgSearchDto 对象", description = "公安机关查询DTO")
+public class GajgSearchDto implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("所属部门id")
+    private String ssbmid;
+
+//    @ApiModelProperty("要素小类")
+//    private String ysxl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetDeptListDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetDeptListDTO.java
new file mode 100644
index 0000000..6f20bc8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetDeptListDTO.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.dto.base;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 获取部门信息DTO
+ *
+ * @author kevin
+ * @date 2022/2/17 8:48 PM
+ * @since 1.0.0
+ */
+@Data
+public class GetDeptListDTO {
+
+    @ApiModelProperty("部门id")
+    private String deptid;
+
+    @ApiModelProperty("除开这些部门不查询")
+    private List<String> inDeptids;
+
+    @ApiModelProperty("查询这里类型")
+    private List<String> levels;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetSsbmDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetSsbmDto.java
new file mode 100644
index 0000000..33f16ff
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetSsbmDto.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "GetSsbmDto 对象", description = "获取部门查询权限DTO")
+public class GetSsbmDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty("是否包含下级 0.不包含 1.包含  默认包含")
+    private String isChild;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetYqListDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetYqListDto.java
new file mode 100644
index 0000000..266cc28
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/GetYqListDto.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.dto.base;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/*
+ * @author dw
+ * @since 2022/7/20
+ * 查询舆情列表DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GetYqListDto 对象", description = "查询舆情列表DTO")
+public class GetYqListDto implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("当前页")
+    private Integer currPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer pageSize;
+
+    @ApiModelProperty("查询开始时间")
+    private String starTime;
+
+    @ApiModelProperty("查询结束时间")
+    private String endTime;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/RsHjyjSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/RsHjyjSearchDto.java
new file mode 100644
index 0000000..93a3254
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/RsHjyjSearchDto.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.dto.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/*
+ * @author dw
+ * @since 2022/7/20
+ * 仁寿户籍预警查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RsHjyjSearchDto 对象", description = "仁寿户籍预警查询DTO")
+public class RsHjyjSearchDto implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("查询")
+    private String api_userid;
+
+    @ApiModelProperty("查询人员身份证号")
+    private String zjhm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysDeptDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysDeptDTO.java
new file mode 100644
index 0000000..7067d9a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysDeptDTO.java
@@ -0,0 +1,158 @@
+package com.mosty.base.model.dto.base;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ *  部门信息
+ * @author kevin
+ * @date 2022/2/17 8:48 PM
+ * @since 1.0.0
+ */
+@Data
+public class SysDeptDTO {
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty("部门id")
+    private Long id;
+
+    /**
+     * 部门代码
+     */
+    @ApiModelProperty("部门代码")
+    @NotBlank(message = "部门代码不能为空！")
+    private String orgCode;
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty("部门名称")
+    @NotBlank(message = "部门名称不能为空！")
+    private String orgName;
+
+
+    /**
+     * 部门类型
+     */
+    @ApiModelProperty("部门类型")
+    @NotNull(message = "部门类型不能为空！")
+    private String orgType;
+
+    /**
+     * 部门等级
+     */
+    @ApiModelProperty("部门等级")
+    @NotNull(message = "部门等级不能为空！")
+    private String orgLevel;
+
+    /**
+     * 部门业务类型
+     */
+    @ApiModelProperty("部门业务类型")
+    @NotNull(message = "部门业务类型不能为空！")
+    private String orgBizType;
+
+    /**
+     * 部门顺序号
+     */
+    @ApiModelProperty("部门顺序号")
+    @NotNull(message = "部门顺序号不能为空！")
+    private String orgNo;
+
+    /**
+     * 上级部门主键
+     */
+    @ApiModelProperty("上级部门主键")
+//    @NotNull(message = "上级部门主键不能为空！")
+    private Long parentId;
+
+    /**
+     * 部门名称拼音首字母
+     */
+    @ApiModelProperty("部门名称拼音首字母")
+    private String bmpyszm;
+
+    /**
+     * 部门简称
+     */
+    @ApiModelProperty("部门简称")
+    @NotBlank(message = "部门简称不能为空！")
+    private String orgJc;
+
+    /**
+     * 部门全称
+     */
+    @ApiModelProperty("部门全称")
+    @NotBlank(message = "部门全称不能为空！")
+    private String orgQc;
+
+    /**
+     * 部门地址
+     */
+    @ApiModelProperty("部门地址")
+    @NotBlank(message = "部门地址不能为空！")
+    private String address;
+
+    /**
+     * 部门电话
+     */
+    @ApiModelProperty("部门电话")
+    @NotBlank(message = "部门电话不能为空！")
+    private String linkTel;
+
+    /**
+     * 部门联系人
+     */
+    @ApiModelProperty("部门联系人")
+    @NotBlank(message = "部门联系人不能为空！")
+    private String linkMan;
+
+    /**
+     * 部门联系人电话
+     */
+    @ApiModelProperty("部门联系人电话")
+    @NotBlank(message = "部门联系人电话不能为空！")
+    private String linkManTel;
+
+    /**
+     * 部门主页
+     */
+    @ApiModelProperty("部门主页")
+    private String webUrl;
+
+    /**
+     * 部门邮箱
+     */
+    @ApiModelProperty("部门邮箱")
+    private String email;
+
+    /**
+     * 部门所属行政区划
+     */
+    @ApiModelProperty("部门所属行政区划")
+    @NotBlank(message = "部门所属行政区划电话不能为空！")
+    private String xzqh;
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String bz;
+
+    /**
+     * 根目录地址
+     */
+    @JsonInclude
+    private String rootPath;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfo.java
new file mode 100644
index 0000000..a6edc96
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfo.java
@@ -0,0 +1,102 @@
+package com.mosty.base.model.dto.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+//import com.mosty.common.generator.config.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 消息内容实体类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_message_info")
+@ApiModel(value = "SysMessageInfo 对象", description = "消息内容实体类")
+public class SysMessageInfo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "消息内容")
+    private String xxnr;
+
+    @ApiModelProperty(value = "消息类型：1-文字，2-语音，3-图片，4-小视频，5-系统URL,6-文件")
+    private String xxlx;
+
+    @ApiModelProperty(value = "url")
+    private String url;
+
+    @ApiModelProperty(value = "消息状态 1，未下发 2.已下发")
+    private String xxzt;
+
+    @ApiModelProperty(value = "群id")
+    private Integer groupId;
+
+    @ApiModelProperty(value = "采集时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfoInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfoInsertDto.java
new file mode 100644
index 0000000..b70a509
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageInfoInsertDto.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.dto.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 发送消息 DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SysMessageInfoInsertDto 对象", description = "发送消息 DTO")
+public class SysMessageInfoInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Integer id;
+
+    @ApiModelProperty(value = "消息内容")
+    private String xxnr;
+
+    @ApiModelProperty(value = "消息类型：1-文字，2-语音，3-图片，4-小视频，5-系统URL,6-文件")
+    private String xxlx;
+
+    @ApiModelProperty(value = "url")
+    private String url;
+
+    @ApiModelProperty(value = "消息状态 1，未下发 2.已下发")
+    private String xxzt;
+
+    @ApiModelProperty(value = "群id")
+    private Integer groupId;
+
+    @ApiModelProperty("消息接收人集合")
+    private List<SysMessageItemInsertDto> itemList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItem.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItem.java
new file mode 100644
index 0000000..4caa3ed
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItem.java
@@ -0,0 +1,106 @@
+package com.mosty.base.model.dto.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 消息接收人实体类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_message_item")
+@ApiModel(value = "SysMessageItem 对象", description = "消息接收人实体类")
+public class SysMessageItem implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "消息接收部门id")
+    private String xxjsbmId;
+
+    @ApiModelProperty(value = "消息接收部门")
+    private String xxjsbm;
+
+    @ApiModelProperty(value = "消息接受人id")
+    private String xxjsrId;
+
+    @ApiModelProperty(value = "消息接受人")
+    private String xxjsrXm;
+
+    @ApiModelProperty(value = "消息接受人身份证")
+    private String xxjsrSfzh;
+
+    @ApiModelProperty(value = "消息id")
+    private Integer messageId;
+
+    @ApiModelProperty(value = "群id")
+    private Integer groupId;
+
+    @ApiModelProperty(value = "采集时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志0正常 1.注销")
+    private Integer xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItemInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItemInsertDto.java
new file mode 100644
index 0000000..b538d44
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/base/SysMessageItemInsertDto.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.dto.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 消息接收人新增dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_message_item")
+@ApiModel(value = "SysMessageItemInsertDto 对象", description = "消息接收人新增dto")
+public class SysMessageItemInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Integer id;
+
+    @ApiModelProperty(value = "消息接收部门id")
+    private String xxjsbmId;
+
+    @ApiModelProperty(value = "消息接收部门")
+    private String xxjsbm;
+
+    @ApiModelProperty(value = "消息接受人id")
+    private String xxjsrId;
+
+    @ApiModelProperty(value = "消息接受人")
+    private String xxjsrXm;
+
+    @ApiModelProperty(value = "消息接受人身份证")
+    private String xxjsrSfzh;
+
+    @ApiModelProperty(value = "消息id")
+    private Integer messageId;
+
+    @ApiModelProperty(value = "群id")
+    private Integer groupId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClInsertDto.java
new file mode 100644
index 0000000..92dee46
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClInsertDto.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控车辆新增 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkClInsertDto对象", description = "布控车辆新增dto")
+public class TbBkClInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "车辆号牌类型")
+    private String cplxdm;
+
+    @ApiModelProperty(value = "车牌号")
+    private String cphm;
+
+    @ApiModelProperty(value = "布控级别 10-红，20-橙色，30-黄色，40-蓝色")
+    private String bkjb;
+
+    @ApiModelProperty(value = "布控开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkkssj;
+
+    @ApiModelProperty(value = "布控结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkjssj;
+
+    @ApiModelProperty(value = "布控范围 1.全国  2.全省 3.全市 4.全县，5-本部门")
+    private String bkfw;
+
+    @ApiModelProperty(value = "布控事由")
+    private String bksy;
+
+    @ApiModelProperty(value = "处置方式 1.控制 2.管控 3.经营 4.关注 5.掌握轨迹")
+    private String czfs;
+
+    @ApiModelProperty(value = "处置说明")
+    private String czsm;
+
+    @ApiModelProperty(value = "是否短信通知 0.否  1.是")
+    private String sfdxtz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClJudgeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClJudgeDto.java
new file mode 100644
index 0000000..e4ccb4e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkClJudgeDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控车辆审批 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkClJudgeDto对象", description = "布控车辆审批dto")
+public class TbBkClJudgeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "审核状态")
+    private String shzt;
+
+    @ApiModelProperty(value = "审核说明")
+    private String shsm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbBkDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbBkDto.java
new file mode 100644
index 0000000..aa73e83
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbBkDto.java
@@ -0,0 +1,24 @@
+package com.mosty.base.model.dto.bkzx;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class TbBkDbBkDto {
+    private Long id;
+
+    @JsonProperty(value = "bkKassj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date            bkKssj;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date            bkJssj;
+
+
+    @ApiModelProperty(value = "布控时的信息接收手机号")
+    private  String         jgxxjssjhm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbInsertDto.java
new file mode 100644
index 0000000..3b52e64
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbInsertDto.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.dto.bkzx;
+
+/**
+ *
+ */
+
+import com.mosty.base.enums.BKDbTypeEnum;
+import com.mosty.common.base.exception.BusinessException;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控车辆审批 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbVBkDbInsertDto", description = "布控数据新建模型 ")
+public class TbBkDbInsertDto implements Serializable {
+
+    @NotBlank(message="创建布控数据库名无效！")
+    @ApiModelProperty(value = "布控库名")
+    private String  dbName;
+
+    @ApiModelProperty(value = "库描述信息")
+    private String description;
+
+    @NotNull(message = "创建布控数据库类型信息无效！")
+    @ApiModelProperty(value = "数据库类型：All所有(包含人车)，Personnel 人员，Car 车辆",hidden = true)
+    private BKDbTypeEnum dbType = BKDbTypeEnum.All;
+
+    @NotBlank(message = "所属市区域代码无效！")
+    @ApiModelProperty(value = "所属市区域代码无效")
+    private String  areaCode;
+
+    @ApiModelProperty(value = "所属市/区名字")
+    private String  areaName;
+
+    @ApiModelProperty(value = "布控开始时间，格式：yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkKassj;
+
+    @ApiModelProperty(value = "布控结束时间，格式：yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   bkJssj;
+
+
+    public void checkData() throws BusinessException {
+        if(StringUtils.isEmpty(dbName)){
+            throw  new BusinessException("创建布控数据库名无效！");
+        }
+        if(StringUtils.isEmpty(areaCode)){
+            throw  new BusinessException("所属市公安局代码无效！");
+        }
+        if(null == dbType){
+            throw  new BusinessException("创建布控数据库类型信息无效！");
+        }
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbSearchDto.java
new file mode 100644
index 0000000..c0d5939
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbSearchDto.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.bkzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkDbSearchDto 对象", description = "布控数据库分页查询")
+public class TbBkDbSearchDto extends BasePage implements Serializable, Cloneable{
+    @ApiModelProperty(value = "布控库名")
+    private String  dbName;
+
+    @ApiModelProperty(value = "所属市区域代码无效")
+    private String  areaCode;
+
+    @ApiModelProperty(value = "布控数据库厂商类型",hidden = true)
+    private String  dbCs;
+
+    @ApiModelProperty(value = "数据库类型：Personnel 人员，Car 车辆",hidden = true)
+    private String dbType;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbUpDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbUpDto.java
new file mode 100644
index 0000000..85a612e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkDbUpDto.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 修改数据库基础信息
+ */
+@Data
+public class TbBkDbUpDto implements Serializable {
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "布控库名")
+    private String  dbName;
+
+    @ApiModelProperty(value = "库描述信息")
+    private String description;
+
+    @ApiModelProperty(value = "布控开始时间，格式：yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkKassj;
+
+    @ApiModelProperty(value = "布控结束时间，格式：yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   bkJssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyInsertDto.java
new file mode 100644
index 0000000..5462d6c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyInsertDto.java
@@ -0,0 +1,83 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控人员新增 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkRyInsertDto对象", description = "布控人员新增dto")
+public class TbBkRyInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "布控类型 1.身份证布控 2.手机布控 3.护照布控 4.人脸布控")
+    private String bklx;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "手机号码")
+    private String sjhm;
+
+    @ApiModelProperty(value = "IMEI码")
+    private String imei;
+
+    @ApiModelProperty(value = "IMSI码")
+    private String imsi;
+
+    @ApiModelProperty(value = "护照号码")
+    private String hzhm;
+
+    @ApiModelProperty(value = "人像图片地址")
+    private String rxtpdz;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "联系方式")
+    private String lxfs;
+
+    @ApiModelProperty(value = "布控级别 10-红，20-橙色，30-黄色，40-蓝色")
+    private String bkjb;
+
+    @ApiModelProperty(value = "布控开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bkkssj;
+
+    @ApiModelProperty(value = "布控结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bkjssj;
+
+    @ApiModelProperty(value = "布控范围 1.全国  2.全省 3.全市 4.全县，5-本部门")
+    private String bkfw;
+
+    @ApiModelProperty(value = "布控事由")
+    private String bksy;
+
+    @ApiModelProperty(value = "处置方式 1.控制 2.管控 3.经营 4.关注 5.掌握轨迹")
+    private String czfs;
+
+    @ApiModelProperty(value = "处置说明")
+    private String czsm;
+
+    @ApiModelProperty(value = "是否短信通知 0.否  1.是")
+    private String sfdxtz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyJudgeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyJudgeDto.java
new file mode 100644
index 0000000..912dfdb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkRyJudgeDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控人员审批 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkRyJudgeDto对象", description = "布控人员审批dto")
+public class TbBkRyJudgeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "审核状态")
+    private String shzt;
+
+    @ApiModelProperty(value = "审核说明")
+    private String shsm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkzxGXDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkzxGXDto.java
new file mode 100644
index 0000000..7e035b8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/TbBkzxGXDto.java
@@ -0,0 +1,17 @@
+package com.mosty.base.model.dto.bkzx;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 布控中心：公共查询  行动信息
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbBkzxGXDto 对象", description="公共查询、行动信息DTO")
+public class TbBkzxGXDto {
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/XdxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/XdxxQuery.java
new file mode 100644
index 0000000..f0e0242
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/bkzx/XdxxQuery.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.dto.bkzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控人员新增 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XdxxQuery 对象", description = "行动信息查询对象")
+public class XdxxQuery extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "什么ID")
+    private String xdId;
+
+    @ApiModelProperty(value = "行动代码")
+    private String xdbm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcclSaveDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcclSaveDto.java
new file mode 100644
index 0000000..5acfe36
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcclSaveDto.java
@@ -0,0 +1,162 @@
+package com.mosty.base.model.dto.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-09-16
+ * 被盘查车辆到巡逻盘查保存对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "BpcclSaveDto 对象", description = "被盘查车辆到巡逻盘查保存对象")
+public class BpcclSaveDto {
+
+    
+    @ApiModelProperty("主键ID")
+    private String id;
+    
+    @ApiModelProperty("号牌种类代码")
+    private String hpzl;
+    
+    @ApiModelProperty("号牌号码")
+    private String hphm;
+    
+    @ApiModelProperty("车辆识别代号（车架号）")
+    private String clsbdh;
+    
+    @ApiModelProperty("机动车所有人身份证号")
+    private String jdcsyrsfzh;
+    
+    @ApiModelProperty("机动车所有人")
+    private String jdcsyr;
+    
+    @ApiModelProperty("盘查时间")
+    private String pcsj;
+    
+    @ApiModelProperty("盘查输入类型（1=自动识别;2=手工输入号牌;3=手工输入车辆识别号）")
+    private String pcsrlx;
+    
+    @ApiModelProperty("盘查地经度")
+    private Double pcdjd;
+    
+    @ApiModelProperty("盘查地纬度")
+    private Double pcdwd;
+    
+    @ApiModelProperty("车辆标签名称")
+    private String bqmc;
+    
+    @ApiModelProperty("标签详细数据")
+    private String bqxxsj;
+    
+    @ApiModelProperty("盘查处理结果")
+    private String pccljg;
+    
+    @ApiModelProperty("盘查处理结果名称")
+    private String pccljgmc;
+    
+    @ApiModelProperty("盘查处理移交单位")
+    private String pcclyjdw;
+    
+    @ApiModelProperty("盘查处理移交原因")
+    private String pcclyjyy;
+    
+    @ApiModelProperty("盘查民警帐号")
+    private String userid;
+    
+    @ApiModelProperty("盘查民警姓名")
+    private String username;
+    
+    @ApiModelProperty("盘查民警警号")
+    private String industrialid;
+    
+    @ApiModelProperty("盘查民警所属单位代码")
+    private String ssdwdm;
+    
+    @ApiModelProperty("盘查民警所属单位名称")
+    private String ssdwmc;
+    
+    @ApiModelProperty("盘查民警所属分市县代码")
+    private String ssfsxdm;
+    
+    @ApiModelProperty("盘查民警所属分市县名称")
+    private String ssfsxmc;
+    
+    @ApiModelProperty("盘查民警所属地市州代码")
+    private String ssdszdm;
+    
+    @ApiModelProperty("盘查民警所属地市州名称")
+    private String ssdszmc;
+    
+    @ApiModelProperty("卡口id")
+    private String kkid;
+    
+    @ApiModelProperty("卡口所属单位代码")
+    private String kkssdwdm;
+    
+    @ApiModelProperty("卡口所属单位名称")
+    private String kkssdwmc;
+    
+    @ApiModelProperty("卡口所属分市县代码")
+    private String kkssfsxdm;
+    
+    @ApiModelProperty("卡口所属分市县名称")
+    private String kkssfsxmc;
+    
+    @ApiModelProperty("卡口所属地市州代码")
+    private String kkssdszdm;
+    
+    @ApiModelProperty("卡口所属地市州名称")
+    private String kkssdszmc;
+    
+    @ApiModelProperty("卡口类型（1=公安检查站;2=自设卡点）")
+    private String kklx;
+    
+    @ApiModelProperty("卡口名称")
+    private String kkmc;
+    
+    @ApiModelProperty("卡口行政区划")
+    private String kkxzqh;
+    
+    @ApiModelProperty("卡口市州名称")
+    private String kkszmc;
+    
+    @ApiModelProperty("卡口环川，环蓉")
+    private String kkhchrlx;
+    
+    @ApiModelProperty("卡口是否涉藏")
+    private String kksfsz;
+    
+    @ApiModelProperty("数据来源（对应字典D_YDJW_SJLY）")
+    private String sjly;
+    
+    @ApiModelProperty("终端型号")
+    private String zdxh;
+    
+    @ApiModelProperty("终端串号")
+    private String zdch;
+    
+    @ApiModelProperty("终端SIM号")
+    private String zdsim;
+    
+    @ApiModelProperty("所属单位当月盘查次数")
+    private Long ssdwdycs;
+    
+    @ApiModelProperty("备注")
+    private String bz;
+    
+    @ApiModelProperty("关联系统代码")
+    private String glxtdm;
+    
+    @ApiModelProperty("关联系统ID")
+    private String glxtid;
+
+    
+    @ApiModelProperty("联系电话")
+    private String mobile;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcrySaveDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcrySaveDto.java
new file mode 100644
index 0000000..9982d9c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/BpcrySaveDto.java
@@ -0,0 +1,172 @@
+package com.mosty.base.model.dto.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-09-13
+ * 被盘查人员到巡逻盘查保存对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "BpcrySaveDto 对象", description = "被盘查人员到巡逻盘查保存对象")
+public class BpcrySaveDto {
+
+    @ApiModelProperty("主键ID")
+    private String id;
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    @ApiModelProperty("性别")
+    private String xbdm;
+
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    @ApiModelProperty("民族")
+    private String mzdm;
+
+    @ApiModelProperty("文化程度")
+    private String whcddm;
+
+    @ApiModelProperty("籍贯")
+    private String jgdm;
+
+    @ApiModelProperty("住址详址")
+    private String zzxz;
+
+    @ApiModelProperty("联系电话")
+    private String lxdh;
+
+    @ApiModelProperty("盘查时间")
+    private String pcsj;
+
+    @ApiModelProperty("盘查输入类型（1=刷身份证;2=手工输入身份证;3=电话号码查询;4=综合查询,5人像）")
+    private String pcsrlx;
+
+    @ApiModelProperty("盘查地经度")
+    private Double pcdjd;
+
+    @ApiModelProperty("盘查地纬度")
+    private Double pcdwd;
+
+    @ApiModelProperty("盘查车辆ID")
+    private String pcclid;
+
+    @ApiModelProperty("人员标签名称")
+    private String bqmc;
+
+    @ApiModelProperty("标签详细数据")
+    private String bqxxsj;
+
+    @ApiModelProperty("盘查处理结果")
+    private String pccljg;
+
+    @ApiModelProperty("盘查处理结果名称")
+    private String pccljgmc;
+
+    @ApiModelProperty("盘查处理移交单位")
+    private String pcclyjdw;
+
+    @ApiModelProperty("盘查处理移交原因")
+    private String pcclyjyy;
+
+    @ApiModelProperty("盘查民警帐号")
+    private String userid;
+
+    @ApiModelProperty("盘查民警姓名")
+    private String username;
+
+    @ApiModelProperty("盘查民警警号")
+    private String industrialid;
+
+    @ApiModelProperty("盘查民警所属单位代码")
+    private String ssdwdm;
+
+    @ApiModelProperty("盘查民警所属单位名称")
+    private String ssdwmc;
+
+    @ApiModelProperty("盘查民警所属分市县代码")
+    private String ssfsxdm;
+
+    @ApiModelProperty("盘查民警所属分市县名称")
+    private String ssfsxmc;
+
+    @ApiModelProperty("盘查民警所属地市州代码")
+    private String ssdszdm;
+
+    @ApiModelProperty("盘查民警所属地市州名称")
+    private String ssdszmc;
+
+    @ApiModelProperty("卡口id")
+    private String kkid;
+
+    @ApiModelProperty("卡口所属单位代码")
+    private String kkssdwdm;
+
+    @ApiModelProperty("卡口所属单位名称")
+    private String kkssdwmc;
+
+    @ApiModelProperty("卡口所属分市县代码")
+    private String kkssfsxdm;
+
+    @ApiModelProperty("卡口所属分市县名称")
+    private String kkssfsxmc;
+
+    @ApiModelProperty("卡口所属地市州代码")
+    private String kkssdszdm;
+
+    @ApiModelProperty("卡口所属地市州名称")
+    private String kkssdszmc;
+
+    @ApiModelProperty("卡口类型（1=公安检查站;2=自设卡点）")
+    private String kklx;
+
+    @ApiModelProperty("卡口名称")
+    private String kkmc;
+
+    @ApiModelProperty("卡口行政区划")
+    private String kkxzqh;
+
+    @ApiModelProperty("卡口市州名称")
+    private String kkszmc;
+
+    @ApiModelProperty("卡口环川，环蓉")
+    private String kkhchrlx;
+
+    @ApiModelProperty("卡口是否涉藏")
+    private String kksfsz;
+
+    @ApiModelProperty("数据来源（对应字典D_YDJW_SJLY）")
+    private String sjly;
+
+    @ApiModelProperty("终端型号")
+    private String zdxh;
+
+    @ApiModelProperty("终端串号")
+    private String zdch;
+
+    @ApiModelProperty("终端SIM号")
+    private String zdsim;
+
+    @ApiModelProperty("所属单位当月盘查次数")
+    private Long ssdwdycs;
+
+    @ApiModelProperty("备注")
+    private String bz;
+
+    @ApiModelProperty("关联系统代码")
+    private String glxtdm;
+
+    @ApiModelProperty("关联系统ID")
+    private String glxtid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Face.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Face.java
new file mode 100644
index 0000000..ba55e34
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Face.java
@@ -0,0 +1,333 @@
+package com.mosty.base.model.dto.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@ApiModel(value = "人脸对象")
+@Accessors(chain = true)
+public class Face {
+
+    public  FaceListObject FaceListObject;
+
+    @Data
+    public static class FaceListObject {
+        public List<FaceObject> FaceObject;
+
+        @Data
+        public static class FaceObject {
+            public String odeviceId;
+            public String FaceID;
+            public String SourceID;
+            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            public Date ShotTime;
+            public String DeviceID;
+            public Integer GenderCode;
+
+            public SubImageList SubImageList;
+
+            @Data
+            public static class SubImageList {
+                public List<SubImageInfoObject> SubImageInfoObject;
+
+                @Data
+                public static class SubImageInfoObject {
+                    public String ImageID;
+                    public String DeviceID;
+                    public String StoragePath;
+                    public String Type;
+                    public String FileFormat;
+                    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+                    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+                    public String ShotTime;
+                    public String Width;
+                    public String Height;
+                }
+
+            }
+
+            public FeatureList FeatureList;
+
+            @Data
+            public static class FeatureList {
+                public List<FeatureInfoObject> FeatureInfoObject;
+
+                @Data
+                public static class FeatureInfoObject {
+                    public String Vendor;
+                    public String AlgorithmVersion;
+                    public String FeatureData;
+                }
+            }
+
+            public Integer InfoKind;
+            public Integer LeftTopX;
+            public Integer LeftTopY;
+            public Integer RightBtmX;
+            public Integer RightBtmY;
+            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            public Date LocationMarkTime;
+            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            public Date FaceAppearTime;
+            public Integer AgeUpLimit;
+            public Integer AgeLowerLimit;
+            public Integer IsDriver;
+            public Integer IsForeigner;
+            public Integer IsSuspectedTerrorist;
+            public Integer IsCriminalInvolved;
+            public Integer IsDetainees;
+            public Integer IsVictim;
+            public Integer IsSuspiciousPerson;
+            public String Mask;
+
+
+        }
+
+    }
+//
+//
+//    @ApiModelProperty(value = "主键ID(32) GA/T 1400.1 图像信息内容要素 ID，人、人脸、机动车、非机动车、物品、场景等")
+//    public String FaceID;
+//
+//    @ApiModelProperty(value = "人工采集还是自动采集 0 其他 1 自动采集 2 人工采集")
+//    public int InfoKind;
+//
+//    @ApiModelProperty(value = "来源图像信息标识")
+//    public String SourceID;
+//
+//    @ApiModelProperty(value = "设备编码，自动采集必选")
+//    public String DeviceID;
+//
+//    @ApiModelProperty(value = "左上角 X 坐标")
+//    public int LeftTopX;
+//
+//    @ApiModelProperty(value = "左上角 Y 坐标 ")
+//    public int LeftTopY;
+//
+//    @ApiModelProperty(value = "右下角 X 坐标")
+//    public int RightBtmX;
+//
+//    @ApiModelProperty(value = "右下角 Y 坐标")
+//    public int RightBtmY;
+//
+//    @ApiModelProperty(value = "位置标记时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    public Date LocationMarkTime;
+//
+//    @ApiModelProperty(value = "人脸出现时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    public Date FaceAppearTime;
+//
+//    @ApiModelProperty(value = "人脸消失时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    public Date FaceDisAppearTime;
+//
+//    @ApiModelProperty(value = "证件种类")
+//    public String IDType;
+//
+//    @ApiModelProperty(value = "证件号码")
+//    public String IDNumber;
+//
+//    @ApiModelProperty(value = "姓名 ")
+//    public String Name;
+//
+//    @ApiModelProperty(value = "曾用名")
+//    public String UsedName;
+//
+//    @ApiModelProperty(value = "绰号")
+//    public String Alias;
+//
+//    @ApiModelProperty(value = "性别代码  0 未知的性别 1 男性 2 女性  9 未说明的性别")
+//    public String GenderCode;
+//
+//    @ApiModelProperty(value = "年龄上限")
+//    public int AgeUpLimit;
+//
+//    @ApiModelProperty(value = "年龄下限 ")
+//    public int AgeLowerLimit;
+//
+//    @ApiModelProperty(value = "民族代码 ")
+//    public String EthicCode;
+//
+//    @ApiModelProperty(value = "国籍代码 ")
+//    public String NationalityCode;
+//
+//    @ApiModelProperty(value = "籍贯省市县代码 ")
+//    public String NativeCityCode;
+//
+//    @ApiModelProperty(value = "居住地行政区划 ")
+//    public String ResidenceAdminDivision;
+//
+//    @ApiModelProperty(value = "汉语口音代码 ")
+//    public String ChineseAccentCode;
+//
+//    @ApiModelProperty(value = "单位名称 ")
+//    public String PersonOrg;
+//
+//    @ApiModelProperty(value = "职业类别代码 ")
+//    public String JobCategory;
+//
+//    @ApiModelProperty(value = "同行人数  ")
+//    public int AccompanyNumber;
+//
+//    @ApiModelProperty(value = "身高上限 ")
+//    public int HeightUpLimit;
+//
+//    @ApiModelProperty(value = "HeightLowerLimit ")
+//    public int HeightLowerLimit;
+//
+//    @ApiModelProperty(value = "体型 ")
+//    public String BodyType;
+//
+//    @ApiModelProperty(value = "肤色 ")
+//    public String SkinColor;
+//
+//    @ApiModelProperty(value = "发型 ")
+//    public String HairStyle;
+//
+//    @ApiModelProperty(value = "发色 ")
+//    public String HairColor;
+//
+//    @ApiModelProperty(value = "姿态 ")
+//    public String Gesture;
+//
+//    @ApiModelProperty(value = "状态 ")
+//    public String Status;
+//
+//    @ApiModelProperty(value = "脸型 ")
+//    public String FaceStyle;
+//
+//    @ApiModelProperty(value = "脸部特征 ")
+//    public String FacialFeature;
+//
+//    @ApiModelProperty(value = "体貌特征 ")
+//    public String PhysicalFeature;
+//
+//    @ApiModelProperty(value = "体表特征 ")
+//    public String BodyFeature;
+//
+//    @ApiModelProperty(value = "习惯动作")
+//    public String HabitualMovement;
+//
+//    @ApiModelProperty(value = "行为")
+//    public String Behavior;
+//
+//    @ApiModelProperty(value = "行为描述")
+//    public String BehaviorDescription;
+//
+//    @ApiModelProperty(value = "附属物 ")
+//    public String Appendant;
+//
+//    @ApiModelProperty(value = "附属物描述")
+//    public String AppendantDescription;
+//
+//    @ApiModelProperty(value = "伞颜色")
+//    public String UmbrellaColor;
+//
+//    @ApiModelProperty(value = "口罩颜色")
+//    public String RespiratorColor;
+//
+//    @ApiModelProperty(value = "帽子款式")
+//    public String CapStyle;
+//
+//    @ApiModelProperty(value = "帽子颜色")
+//    public String CapColor;
+//
+//    @ApiModelProperty(value = "眼镜款式 ")
+//    public String GlassStyle;
+//
+//    @ApiModelProperty(value = "眼镜颜色")
+//    public String GlassColor;
+//
+//    @ApiModelProperty(value = "围巾颜色")
+//    public String ScarfColor;
+//
+//    @ApiModelProperty(value = "包款式")
+//    public String BagStyle;
+//
+//    @ApiModelProperty(value = "包颜色 ")
+//    public String BagColor;
+//
+//    @ApiModelProperty(value = "上衣款式  ")
+//    public String CoatStyle;
+//
+//    @ApiModelProperty(value = "上衣长度  ")
+//    public String CoatLength;
+//
+//    @ApiModelProperty(value = "上衣颜色  ")
+//    public String CoatColor;
+//
+//    @ApiModelProperty(value = "裤子款式")
+//    public String TrousersStyle;
+//
+//    @ApiModelProperty(value = "裤子颜色 ")
+//    public String TrousersColor;
+//
+//    @ApiModelProperty(value = "裤子长度")
+//    public String TrousersLen;
+//
+//    @ApiModelProperty(value = "鞋子款式 ")
+//    public String ShoesStyleType;
+//
+//    @ApiModelProperty(value = "鞋子颜色 ")
+//    public String ShoesColor;
+//
+//    @ApiModelProperty(value = "是否驾驶员 0：否；1：是；2：不确定")
+//    public int IsDriver;
+//
+//    @ApiModelProperty(value = "是否涉外人员 0：否；1：是；2：不确定")
+//    public int IsForeigner;
+//
+//    @ApiModelProperty(value = "护照证件种类")
+//    public String PassportType;
+//
+//    @ApiModelProperty(value = "出入境人员类别代码")
+//    public String ImmigrantTypeCode;
+//
+//    @ApiModelProperty(value = "是否涉恐人员 0：否；1：是；2：不确定")
+//    public int IsSuspectedTerrorist;
+//
+//    @ApiModelProperty(value = "涉恐人员编号")
+//    public String SuspectedTerroristNumber;
+//
+//    @ApiModelProperty(value = "是否涉案人员 0：否；1：是；2：不确定")
+//    public int IsCriminalInvolved;
+//
+//
+//    @ApiModelProperty(value = "涉案人员专长代码")
+//    public String CriminalInvolvedSpecilisationCode;
+//
+//
+//    @ApiModelProperty(value = "体表特殊标记")
+//    public String BodySpeciallMark;
+//
+//
+//    @ApiModelProperty(value = "作案手段")
+//    public String CrimeMethod;
+//
+//
+//    @ApiModelProperty(value = "作案特点代码")
+//    public String CrimeCharacterCode;
+//
+//    @ApiModelProperty(value = "在逃人员编号")
+//    public String EscapedCriminalNumber;
+
+    public static void main(String[] args) {
+        Map map=new HashMap();
+        System.out.println(map.get("s"));
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Repository.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Repository.java
new file mode 100644
index 0000000..a0cb362
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/Repository.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.dto.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "依图人脸库")
+@Accessors(chain = true)
+public class Repository {
+
+    @ApiModelProperty(value = "返回结果的排序 方式支持similarity")
+    private order order;
+
+    @Data
+    public static class order {
+        @ApiModelProperty("字段similarity  -1倒叙")
+        private Integer similarity;
+    }
+
+    @ApiModelProperty("从第几个开始返回")
+    private Integer start;
+    @ApiModelProperty("条数")
+    private Integer limit;
+    @ApiModelProperty("如果此域不存在表示不进行检索过滤")
+    private retrieval retrieval;
+
+    @Data
+    public static class retrieval {
+        @ApiModelProperty("base64解码后的内容")
+        private String picture_image_content_base64;
+        @ApiModelProperty("库id列表  19常口 129重点")
+        private List<String> repository_ids;
+        @ApiModelProperty("相似度")
+        private Integer threshold;
+        @ApiModelProperty("是否开启加速")
+        private Boolean fast;
+    }
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcclInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcclInsertDto.java
new file mode 100644
index 0000000..ec26ff2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcclInsertDto.java
@@ -0,0 +1,58 @@
+package com.mosty.base.model.dto.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.vo.hczx.TbHcBpcclWpVo;
+import com.mosty.base.model.vo.hczx.TbHcBpcryWpVo;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-16
+ * 被盘查车辆保存对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcclInsertDto 对象", description = "被盘查车辆保存对象")
+public class TbHcBpcclInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "图片ID集合", name = "tpIdList")
+    private List<String> tpIdList;
+
+    @ApiModelProperty(value = "物品集合", name = "clWpList")
+    private List<TbHcBpcclWpVo> clWpList;
+
+    @ApiModelProperty(value = "人员盘查IdList", name = "rypcidList")
+    private List<String> rypcidList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcryInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcryInsertDto.java
new file mode 100644
index 0000000..19f1918
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcBpcryInsertDto.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.dto.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.hczx.TbHcBpcryTzbq;
+import com.mosty.base.model.vo.hczx.TbHcBpcryWpVo;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-13
+ * 被盘查人员保存对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcryInsertDto 对象", description = "被盘查人员保存对象")
+public class TbHcBpcryInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查车辆ID", name = "pcclId")
+    private String pcclId;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "图片ID集合", name = "tpIdList")
+    private List<String> tpIdList;
+
+    @ApiModelProperty(value = "物品集合", name = "ryWpList")
+    private List<TbHcBpcryWpVo> ryWpList;
+
+    @ApiModelProperty(value = "特征标签集合", name = "tzbqList")
+    private List<TbHcBpcryTzbq> tzbqList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcDtgzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcDtgzDto.java
new file mode 100644
index 0000000..d297d91
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcDtgzDto.java
@@ -0,0 +1,142 @@
+package com.mosty.base.model.dto.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-16
+ * 被盘查车辆到巡逻盘查保存对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcDtgzDto 对象", description = "核查动态感知对象")
+public class TbHcDtgzDto {
+
+    /**
+     * 设备编码
+     */
+    @ApiModelProperty("设备编码")
+    private String sbbm;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty("设备名称")
+    private String sbmc;
+
+    /**
+     * 关联库名
+     */
+    @ApiModelProperty("关联库名")
+    private String glkm;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String xb;
+
+    /**
+     * 性别代码
+     */
+    @ApiModelProperty("性别代码")
+    private String xbDm;
+
+    /**
+     * 出生日期
+     */
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty("民族")
+    private String mz;
+
+    /**
+     * 民族代码
+     */
+    @ApiModelProperty("民族代码")
+    private String mzDm;
+
+    /**
+     * 籍贯
+     */
+    @ApiModelProperty("籍贯")
+    private String jg;
+
+    /**
+     * 籍贯代码
+     */
+    @ApiModelProperty("籍贯代码")
+    private String jgDm;
+
+    /**
+     * 住址详址
+     */
+    @ApiModelProperty("住址详址")
+    private String zzxz;
+
+    /**
+     * 关联库id
+     */
+    @ApiModelProperty("关联库id")
+    private String glkid;
+
+    /**
+     * 标签
+     */
+    @ApiModelProperty("标签")
+    private String bq;
+
+    /**
+     * 标签名称
+     */
+    @ApiModelProperty("标签名称")
+    private String bqmc;
+
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("标签详细数据")
+    private String bqxxsj;
+
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("相似度")
+    private String xsd;
+
+    @ApiModelProperty("设备来源 1、海康 2、海能达")
+    private String sbly;
+
+    @ApiModelProperty("接入类型")
+    private String jrlx;
+
+    @ApiModelProperty("关联id")
+    private String glid;
+
+
+    @ApiModelProperty("标签列表")
+    private List<String> bqList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjQueryDto.java
new file mode 100644
index 0000000..b4f2c15
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjQueryDto.java
@@ -0,0 +1,19 @@
+package com.mosty.base.model.dto.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcSydjQueryDto 对象", description = "涉疫情登记查询DTO")
+public class TbHcSydjQueryDto {
+    @ApiModelProperty(value = "盘查id", name = "pcid")
+    private String pcid;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjSaveDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjSaveDto.java
new file mode 100644
index 0000000..c67d5d4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/hczx/TbHcSydjSaveDto.java
@@ -0,0 +1,56 @@
+package com.mosty.base.model.dto.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcSydjSave 对象", description = "涉疫情登记保存DTO")
+public class TbHcSydjSaveDto {
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查id", name = "pcid")
+    private String pcid;
+
+    @ApiModelProperty(value = "人员姓名", name = "ryxm")
+    private String ryxm;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "天府健康码状态", name = "jkmzt")
+    private String jkmzt;
+
+    @ApiModelProperty(value = "疫苗接种情况", name = "ymjzqk")
+    private String ymjzqk;
+
+    @ApiModelProperty(value = "通讯行程卡是否带*", name = "txxck")
+    private String txxck;
+
+    @ApiModelProperty(value = "14天内到达或途径城市", name = "ddhtjcs")
+    private String ddhtjcs;
+
+    @ApiModelProperty(value = "来自哪里", name = "lz")
+    private String lz;
+
+    @ApiModelProperty(value = "去往哪里", name = "qw")
+    private String qw;
+
+    @ApiModelProperty(value = "图片Id", name = "tpid")
+    private String tpid;
+
+    @ApiModelProperty(value = "添加时间", name = "tjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglAbfcDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglAbfcDto.java
new file mode 100644
index 0000000..6585b85
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglAbfcDto.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/27
+ * 安保风采添加和修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglAbfcDto 对象", description = "安保风采添加和修改DTO")
+public class TbJcglAbfcDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "标题")
+    private String bt;
+
+    @ApiModelProperty(value = "摘要")
+    private String zy;
+
+    @ApiModelProperty(value = "内容")
+    private String nr;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBqDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBqDto.java
new file mode 100644
index 0000000..a7d7481
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBqDto.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防警力标签表（技能/经验）;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防警力标签表", description = "")
+public class TbJcglBqDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID(新增时不填)",name = "id")
+    private String id;
+    /**
+     * 标签类型;EXP：经验标签，SKL：技能标签
+     */
+    @ApiModelProperty(value = "标签类型：EXP：经验标签，SKL：技能标签",name = "bqlx",required = true)
+    private String bqlx;
+    /**
+     * 标签中文名称
+     */
+    @ApiModelProperty(value = "标签中文名称",name = "bqmc",required = true)
+    private String bqmc;
+    /**
+     * 标签编号
+     */
+    @ApiModelProperty(value = "标签编号",name = "bqbh",required = true)
+    private String bqbh;
+    /**
+     * 标签图标url
+     */
+    @ApiModelProperty(value = "标签图标url",name = "bqtb")
+    private String bqtb;
+    /**
+     * 计算模型ID
+     */
+    @ApiModelProperty(value = "计算模型ID",name = "mxId")
+    private String mxId;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBxxDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBxxDto.java
new file mode 100644
index 0000000..993c0e7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglBxxDto.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 必巡线增加或修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglBxxDto对象", description = "必巡线增加或修改DTO")
+public class TbJcglBxxDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty(value = "巡防区域必巡点表标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "必巡线名称")
+    private String bxxMc;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLX（必巡点类型）必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String bxxLx;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "必巡线坐标", dataType = "java.util.List")
+    private List<BigDecimal[]> zb;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfDto.java
new file mode 100644
index 0000000..8c4431d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfDto.java
@@ -0,0 +1,53 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ * 第三方添加和修改实体
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglDsfDto 对象", description = "第三方添加和修改实体")
+public class TbJcglDsfDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "系统名称")
+    private String xtmc;
+
+    @ApiModelProperty(value = "服务类型 01.任务服务 02.位置服务 03.")
+    private String fwlx;
+
+    @ApiModelProperty(value = "责任人姓名")
+    private String zrrxm;
+
+    @ApiModelProperty(value = "责任人联系电话")
+    private String zrrlxdh;
+
+    @ApiModelProperty(value = "过期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date gqsj;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfJudgeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfJudgeDto.java
new file mode 100644
index 0000000..650a47b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglDsfJudgeDto.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ * 第三方审核实体
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglDsfJudgeDto 对象", description = "第三方审核实体")
+public class TbJcglDsfJudgeDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "状态 01.审核中 02.使用中 03.审核不通过 04.已停用 05.已过期")
+    private String zt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKfdDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKfdDto.java
new file mode 100644
index 0000000..71e9441
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKfdDto.java
@@ -0,0 +1,105 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 快反点增加或修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKfdDto对象", description = "快反点增加或修改DTO")
+public class TbJcglKfdDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty(value = "快反点标识ID")
+    private String kfdId;
+
+    @ApiModelProperty(value = "点位类型：01-快反点，02-重点机关岗位点，50-2022世乒赛保卫点")
+    private String dwlx;
+
+    @ApiModelProperty(value = "快返点名称")
+    private String kfdMc;
+
+    @ApiModelProperty(value = "快反点地址")
+    private String kfdDz;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "一分钟范围", dataType = "java.util.List")
+    private List<BigDecimal[]> yfzfw;
+
+    @ApiModelProperty(value = "三分钟范围", dataType = "java.util.List")
+    private List<BigDecimal[]> sfzfw;
+
+    @ApiModelProperty(value = "五分钟范围", dataType = "java.util.List")
+    private List<BigDecimal[]> wfzfw;
+
+    @ApiModelProperty(value = "快返点图片;逗号分隔")
+    private String kfdTp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+    @ApiModelProperty(value = "负责人身份证")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date cjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKhbmEditPzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKhbmEditPzDto.java
new file mode 100644
index 0000000..7be3f1a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglKhbmEditPzDto.java
@@ -0,0 +1,141 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhbmEditPzDto  对象", description = "绩效考核部门配置Dto")
+public class TbJcglKhbmEditPzDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+
+    @ApiModelProperty(value = "应报备")
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    private int zsbb;
+
+    @ApiModelProperty(value = "报备得分")
+    private double bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    private double bbkf;
+
+
+    @ApiModelProperty(value = "应查人")
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    private int zscr;
+
+    @ApiModelProperty(value = "查人分")
+    private double crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    private double crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    private int zscc;
+
+    @ApiModelProperty(value = "查车分")
+    private double ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    private double cckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    private int zscw;
+
+    @ApiModelProperty(value = "查物品得分")
+    private double cwf;
+
+    @ApiModelProperty(value = "查物品扣分")
+    private double cwkf;
+
+
+    @ApiModelProperty(value = "应巡逻")
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    private int zsxl;
+
+    @ApiModelProperty(value = "巡逻分")
+    private double xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    private double xlkf;
+
+
+    @ApiModelProperty(value = "应签收")
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收")
+    private int zsqs;
+
+    @ApiModelProperty(value = "签收分")
+    private double qsf;
+
+    @ApiModelProperty(value = "签收分")
+    private double qskf;
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "巡逻时长分")
+    private double xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    private double xlsckf;
+
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int yxllc;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int zsxllc;
+
+    @ApiModelProperty(value = "巡逻里程分")
+    private double xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+    private double xllckf;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglPzfzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglPzfzDto.java
new file mode 100644
index 0000000..86d11cf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglPzfzDto.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbjclPzfzDto 对象", description = "配置分值增删改查DTO")
+public class TbJcglPzfzDto extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "配置类型 01.刑事警情 02.行政警情 03.其他警情 04.预警人员 05.预警车辆 06.预警事件 07.盘查重点人员 08.盘查重点车辆")
+    private String pzlx;
+
+    @ApiModelProperty(value = "配置分值")
+    private Integer pzfz;
+
+    @ApiModelProperty(value = "事件范围（分钟）")
+    private String pzsjfw;
+
+    @ApiModelProperty(value = "配置人Id")
+    private String pzrid;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrxm;
+
+    @ApiModelProperty(value = "配置人身份证")
+    private String pzrsfzh;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglShabllInsertAndEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglShabllInsertAndEditDto.java
new file mode 100644
index 0000000..1155b3e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglShabllInsertAndEditDto.java
@@ -0,0 +1,79 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 社会安保力量添加和修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglShabllInsertAndEditDto对象", description = "社会安保力量新增DTO")
+public class TbJcglShabllInsertAndEditDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "安保力量类型")
+    private String ablllx;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "性别")
+    private String xbdm;
+
+    @ApiModelProperty(value = "民族代码")
+    private String mzdm;
+
+    @ApiModelProperty(value = "住址详址")
+    private String zzxz;
+
+    @ApiModelProperty(value = "学历代码")
+    private String xldm;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "所在单位")
+    private String szdw;
+
+    @ApiModelProperty(value = "工作内容")
+    private String gznr;
+
+    @ApiModelProperty(value = "掌握技能")
+    private String zwjn;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfZgDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfZgDto.java
new file mode 100644
index 0000000..a6a0962
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfZgDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访_战果", description = "")
+public class TbJcglXfZgDto extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "战果id", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "申报状态")
+    private String sbzt;
+
+    @ApiModelProperty(value = "审批意见")
+    private String spyj;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllDto.java
new file mode 100644
index 0000000..50d2f76
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllDto.java
@@ -0,0 +1,127 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表新增对象")
+public class TbJcglXfllDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -2578840484566953177L;
+
+    @ApiModelProperty(value = "警员管理表标识ID（新增时不填）",name ="id")
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）", notes = "")
+    private String ryid;
+
+    @ApiModelProperty(value = "警员分类：01、民警，02、辅警",name ="fl",required = true)
+    private String fl;
+
+    @ApiModelProperty(value = "警员类型：01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警",name ="lx",required = true)
+    private String lx;
+
+    @ApiModelProperty(value = "姓名",name ="xm",required = true)
+    private String xm;
+
+    @ApiModelProperty(value = "性别代码",name ="xbdm",required = true)
+    private String xbdm;
+
+    @ApiModelProperty(value = "身份证号",name ="sfzh",required = true)
+    private String sfzh;
+
+    @ApiModelProperty(value = "警号",name ="jh",required = true)
+    private String jh;
+
+    @ApiModelProperty(value = "警衔",name ="jx")
+    private String jx;
+
+    @ApiModelProperty(value = "政治面貌",name ="zzmm")
+    private String zzmm;
+
+    @ApiModelProperty(value = "婚姻状况：0、未婚，1、已婚，2、离异",name ="hyzk")
+    private String hyzk;
+
+    @ApiModelProperty(value = "入职时间",name ="rzsj")
+    private String rzsj;
+
+    @ApiModelProperty(value = "出生日期",name ="csrq")
+    private String csrq;
+
+    @ApiModelProperty(value = "民族编码",name ="mzdm",required = true)
+    private String mzdm;
+
+    @ApiModelProperty(value = "文化程度",name ="whcddm",required = true)
+    private String whcddm;
+
+    @ApiModelProperty(value = "籍贯",name ="jgdm")
+    private String jgdm;
+
+    @ApiModelProperty(value = "家庭住址",name ="jtzz")
+    private String jtzz;
+
+    @ApiModelProperty(value = "联系电话",name ="lxdh",required = true)
+    private String lxdh;
+
+    @ApiModelProperty(value = "电子邮箱",name ="dzyx")
+    private String dzyx;
+
+    @ApiModelProperty(value = "巡防力量图片，逗号分隔",name ="tp")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "技能标签ID集合",name ="bqId")
+    private List<String> bqId;
+
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+
+    @ApiModelProperty(value = "备注",name ="bz")
+    private String bz;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllSearchQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllSearchQuery.java
new file mode 100644
index 0000000..e5e61f7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllSearchQuery.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-02
+ * 寻访力量查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfllSearchQuery 对象", description = "寻访力量查询DTO")
+public class TbJcglXfllSearchQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty("查询类型 1.本部门 2.全部")
+    private String type;
+
+    @ApiModelProperty("关键字")
+    private String keyword;
+
+    @ApiModelProperty("警力类型 01.民警 02.辅警")
+    private String jllx;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllVo.java
new file mode 100644
index 0000000..06acfb5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfllVo.java
@@ -0,0 +1,119 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.common.base.entity.log.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表", description = "")
+public class TbJcglXfllVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+
+    @ApiModelProperty(name = "警员管理表标识ID", hidden = true)
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）")
+    private String ryid;
+
+    @ApiModelProperty(name = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(name = "警员类型", notes = "01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警")
+    private String lx;
+
+    @ApiModelProperty(name = "姓名")
+    private String xm;
+
+    @ApiModelProperty(name = "性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(name = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(name = "警号")
+    private String jh;
+
+    @ApiModelProperty(name = "警衔")
+    private String jx;
+
+    @ApiModelProperty(name = "政治面貌")
+    private String zzmm;
+
+    @ApiModelProperty(name = "婚姻状况", notes = "0、未婚，1、已婚，2、离异")
+    private String hyzk;
+
+    @ApiModelProperty(name = "入职时间")
+    private Date rzsj;
+
+    @ApiModelProperty(name = "出生日期")
+    private Date csrq;
+
+    @ApiModelProperty(name = "民族编码")
+    private String mzdm;
+
+    @ApiModelProperty(name = "文化程度")
+    private String whcddm;
+
+    @ApiModelProperty(name = "籍贯")
+    private String jgdm;
+
+    @ApiModelProperty(name = "家庭住址")
+    private String jtzz;
+
+    @ApiModelProperty(name = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(name = "电子邮箱")
+    private String dzyx;
+
+    @ApiModelProperty(name = "巡防力量图片")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfqyDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfqyDto.java
new file mode 100644
index 0000000..2ff076e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfqyDto.java
@@ -0,0 +1,102 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 快反点增加或修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfqyDto对象", description = "巡防区域增加或修改DTO")
+public class TbJcglXfqyDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty(value = "巡防区标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_XQLX（巡区类型）巡防区类型1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String xfqLx;
+
+    @ApiModelProperty(value = "--D_BZ_XFQDJ（巡防区等级）巡防区等级;")
+    private String xfqDj;
+
+    @ApiModelProperty(value = "巡防区名称")
+    private String xfqMc;
+
+    @ApiModelProperty(value = "巡防区面积（平方米）")
+    private Integer xfqMj;
+
+    @ApiModelProperty(value = "巡防区负责人")
+    private String xfqFzr;
+
+    @ApiModelProperty(value = "巡防区负责人ID")
+    private String xfqFzrId;
+
+    @ApiModelProperty(value = "巡防区负责人身份证号")
+    private String xfqFzrSfz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "多边形数据存储（JSON）", dataType = "java.util.List")
+    private List<BigDecimal[]> pgis;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "巡防部门类型")
+    private String xfbmlx;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfwgInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfwgInsertDto.java
new file mode 100644
index 0000000..7005010
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXfwgInsertDto.java
@@ -0,0 +1,60 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.SafeHtml;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbJcglXfwgInsertDto 对象", description="巡防网格")
+public class TbJcglXfwgInsertDto extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防网格表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "巡防网格名称")
+    private String wgMc;
+
+    @ApiModelProperty(value = "巡防网格编号")
+    private String wgBh;
+
+    @ApiModelProperty(value = "巡防网格类型")
+    private String wglx;
+
+    @ApiModelProperty(value = "巡防网格面积")
+    private BigDecimal wgMj;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "巡防网格图片;逗号分隔")
+    private String wgTp;
+
+    @ApiModelProperty(value = "多边形数据存储（JSON）")
+    private List<BigDecimal []> pgis;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaDto.java
new file mode 100644
index 0000000..5ec7a41
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaDto.java
@@ -0,0 +1,97 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ * 巡逻方案新增或修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXlfaDto对象", description = "巡逻方案新增或修改DTO")
+public class TbJcglXlfaDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "执行周期（01-每年执行，02-每月，03-每周,99-固定日期）")
+    private String zxzq;
+
+    @ApiModelProperty(value = "执行周期描述，如：每年6月6日至9日执行高考巡逻方案")
+    private String zxms;
+
+    @ApiModelProperty(value = "执行年月日（根据执行周期来）")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zxksyr;
+
+    @ApiModelProperty(value = "执行星期几")
+    private Integer zxxq;
+
+    @ApiModelProperty(value = "方案制定人ID")
+    private String fazdrId;
+
+    @ApiModelProperty(value = "方案制定人姓名")
+    private String fazdrXm;
+
+    @ApiModelProperty(value = "方案制定人身份证号")
+    private String fazdrSfzh;
+
+    @ApiModelProperty(value = "制定时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fazdsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "方案巡逻点位列表")
+    private List<TbJcglXlfaXldwDto> xldwList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaXldwDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaXldwDto.java
new file mode 100644
index 0000000..cc9cc35
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXlfaXldwDto.java
@@ -0,0 +1,72 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ * 巡逻方案点位新增或修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXlfaXldwDto对象", description = "巡逻方案点位新增或修改DTO")
+public class TbJcglXlfaXldwDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -1L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案id")
+    private String faId;
+
+    @ApiModelProperty(value = "巡逻点位类型10-巡逻点、20-巡逻区域")
+    private String dwlx;
+
+    @ApiModelProperty(value = "点位经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "点位纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "点位hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "点位区域", dataType = "java.util.List")
+    private List<BigDecimal[]> fw;
+
+    @ApiModelProperty(value = "点位描述")
+    private String dwmc;
+
+    @ApiModelProperty(value = "到位时间")
+    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "停留时长")
+    private Integer tlsc;
+
+    @ApiModelProperty(value = "要求盘查人员数量")
+    private Integer pcrys;
+
+    @ApiModelProperty(value = "要求盘查车辆数量")
+    private Integer pccls;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXljlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXljlDto.java
new file mode 100644
index 0000000..da08275
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglXljlDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.jcgl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 训练记录DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXljlDto 对象", description = "训练记录DTO")
+public class TbJcglXljlDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "警力表ID")
+    private String xfllId;
+
+    @ApiModelProperty(value = "训练日期")
+    private String xlrq;
+
+    @ApiModelProperty(value = "训练成绩（D_BZ_XLCJ）")
+    private String xlcj;
+
+    @ApiModelProperty(value = "训练时长")
+    private String xlsc;
+
+    @ApiModelProperty(value = "训练类型（D_BZ_XFXLLX）")
+    private String xllx;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZnzbSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZnzbSearchDto.java
new file mode 100644
index 0000000..923d885
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZnzbSearchDto.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-09-05
+ * 附近智能装备查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglZnzbSearchDto 对象", description = "附近智能装备查询DTO")
+public class TbJcglZnzbSearchDto extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty("经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty("纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty("所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty("范围(米)")
+    private BigDecimal radius;
+
+    @ApiModelProperty("是否专业装备")
+    private String sfzy;
+
+    @ApiModelProperty("是否融合")
+    private String sfrh;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZyjzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZyjzSearchDto.java
new file mode 100644
index 0000000..5c07a1c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/jcgl/TbJcglZyjzSearchDto.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.dto.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-02
+ * 附近专业警中搜索dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglZyjzSearchDto 对象", description = "附近专业警中搜索dto")
+public class TbJcglZyjzSearchDto extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty("经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty("纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty("所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty("警力状态 0.休假   1.在岗")
+    private String jlzt;
+
+    @ApiModelProperty("专业技能id集合")
+    private List<String> bqList;
+
+    @ApiModelProperty("范围(米)")
+    private BigDecimal radius;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/AppSearchQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/AppSearchQuery.java
new file mode 100644
index 0000000..42412c3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/AppSearchQuery.java
@@ -0,0 +1,46 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-11-14
+ * app公共组件查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "AppSearchQuery 对象", description = "app公共组件查询DTO")
+public class AppSearchQuery  extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty("查询类型 1.本部门 2.全部")
+    private String type;
+
+    @ApiModelProperty("关键字")
+    private String keyword;
+
+    @ApiModelProperty("--D_BZ_PBLX（排班类型）班次类型（01.勤务值班 02.巡防排班 03.上班排班）班次使用")
+    private String bclx;
+
+    @ApiModelProperty("点位类型(快反点使用)")
+    private String dwlx;
+
+    @ApiModelProperty("--D_BZ_ZNZBFL（智能装备分类）设备分类 关联设备类型表")
+    private String scode;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbCountDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbCountDto.java
new file mode 100644
index 0000000..5707866
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbCountDto.java
@@ -0,0 +1,26 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb")
+@ApiModel(value="TbQwBmjlbb对象", description="警力报备类别统计")
+public class TbQwBmjlbbCountDto implements Serializable,Cloneable{
+
+    @ApiModelProperty(value = "类别代码")
+    private String type;
+
+    @ApiModelProperty(value = "数量")
+    private Integer sl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbJlmxDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbJlmxDto.java
new file mode 100644
index 0000000..6cccec7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBmjlbbJlmxDto.java
@@ -0,0 +1,83 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb_jlmx")
+@ApiModel(value="TbQwBmjlbbJlmx对象", description="部门每日警力报备-警力明细")
+public class TbQwBmjlbbJlmxDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    private String id;
+
+
+    @ApiModelProperty(value = "警力ID")
+    private String jlId;
+
+    @ApiModelProperty(value = "警力报备ID")
+    private String jlbbId;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String sfzh;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "性别代码（0男 1女 2未知）")
+    private String xbdm;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer nl;
+
+    @ApiModelProperty(value = "警力状态（0 不在岗 1 在岗）")
+    private String jlzt;
+
+    @ApiModelProperty(value = "报备类型（1 在岗民警，2 在岗辅警 3 值班警力 4 不在岗民警 5 不在岗辅警）")
+    private String bblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBxfsqEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBxfsqEditDto.java
new file mode 100644
index 0000000..da36cbd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwBxfsqEditDto.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwBxfsqEditDto对象", description="不巡防申请修改dto")
+public class TbQwBxfsqEditDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "审核状态（0 未审核 1 审核通过 2 审核失败）")
+    private String shzt;
+
+    @ApiModelProperty(value = "审批意见")
+    private String spyj;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwClDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwClDto.java
new file mode 100644
index 0000000..223a13e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwClDto.java
@@ -0,0 +1,70 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-车辆表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_cl")
+@ApiModel(value="TbQwCl对象", description="巡防排班或报备或值班-车辆表")
+public class TbQwClDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "勤务车辆ID")
+    private String qwclId;
+
+    @ApiModelProperty(value = "车辆名称")
+    private String clmc;
+
+    @ApiModelProperty(value = "机动车号牌号码")
+    private String jdchphm;
+
+    @ApiModelProperty(value = "机动车号牌种类代码（字典）")
+    private String jdchpzldm;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwFjjlBbDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwFjjlBbDto.java
new file mode 100644
index 0000000..0f23672
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwFjjlBbDto.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-26
+ * 事件处置大屏-查询附近警力
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwFjjlBbDto 对象", description = "事件处置大屏-查询附近警力 DTO")
+public class TbQwFjjlBbDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Date time;
+    private BigDecimal jd;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJlDto.java
new file mode 100644
index 0000000..ac1cfed
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJlDto.java
@@ -0,0 +1,79 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-警力表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_jl")
+@ApiModel(value="TbQwJl对象", description="巡防排班或报备或值班-警力表")
+public class TbQwJlDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "警力ID")
+    private String jlId;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "性别代码（0男 1女 2未知）")
+    private String xbdm;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer nl;
+
+    @ApiModelProperty(value = "警力状态（0 不在岗 1 在岗）")
+    private String jlzt;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJmllSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJmllSearchDto.java
new file mode 100644
index 0000000..84f794d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJmllSearchDto.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwJmllSearchDto对象", description = "大屏-街面力量查询DTO")
+public class TbQwJmllSearchDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "01.民警  02.辅警", required = true)
+    private String jllx;
+
+    @ApiModelProperty(value = "巡防部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJyqxDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJyqxDto.java
new file mode 100644
index 0000000..fe29b16
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwJyqxDto.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_jyqx")
+@ApiModel(value="TbQwJyqx对象", description="巡防排班或报备或值班-警用器械表")
+public class TbQwJyqxDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "器械名称")
+    private String qxmc;
+
+    @ApiModelProperty(value = "器械类型（参考字典）")
+    private String qxlx;
+
+    @ApiModelProperty(value = "警用器械数量")
+    private Integer qxsl;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwMfjSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwMfjSearchDto.java
new file mode 100644
index 0000000..66f70df
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwMfjSearchDto.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-06-27
+ * 民辅警查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwMfjSearchDto 对象", description="民辅警查询DTO")
+public class TbQwMfjSearchDto extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "bbrq")
+    private String bbrq;
+
+    @ApiModelProperty(value = "ssbmid")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    // 后续增加的Dto===================================================================
+    @ApiModelProperty(value = "jlxm")
+    private String jlxm;
+
+    @ApiModelProperty(value = "jh")
+    private String jh;
+
+    @ApiModelProperty(value = "userName")
+    private String userName;
+
+    @ApiModelProperty(value = "kssj")
+    private String kssj;
+
+    @ApiModelProperty(value = "xm")
+    private String xm;
+
+    @ApiModelProperty(value = "jllx")
+    private String jllx;
+
+    @ApiModelProperty(value = "jssj")
+    private String jssj;
+
+    @ApiModelProperty(value = "qjrq")
+    private String qjrq;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwbcEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwbcEditDto.java
new file mode 100644
index 0000000..4ba72b5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwbcEditDto.java
@@ -0,0 +1,91 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Time;
+import java.util.Date;
+
+/**
+ * <p>
+ * 勤务等级DTO
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwQwbcEditDto对象", description="勤务班次修改DTO")
+public class TbQwQwbcEditDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "班次名称")
+    private String bcmc;
+
+    @ApiModelProperty(value = "班次开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Time kssj;
+
+    @ApiModelProperty(value = "班次结束时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Time jssj;
+
+    @ApiModelProperty(value = "排班级别（01 市级  02 县级 03 科所队 ）")
+    private String pbjb;
+
+    @ApiModelProperty(value = "跨天数")
+    private Integer kts;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "班次类型（01 勤务值班 02 巡防排班）")
+    private String bclx;
+
+    @ApiModelProperty(value = "班次颜色")
+    private String bcys;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjDto.java
new file mode 100644
index 0000000..14a56ba
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjDto.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qwdj")
+@ApiModel(value="TbQwQwdj对象", description="勤务等级表")
+public class TbQwQwdjDto extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjEditDto.java
new file mode 100644
index 0000000..87a1bb1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQwdjEditDto.java
@@ -0,0 +1,116 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwQwdjEditDto对象", description="勤务等级修改DTO")
+public class TbQwQwdjEditDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "勤务原因")
+    private String qwyy;
+
+    @ApiModelProperty(value = "勤务要求")
+    private String qwyq;
+
+    @ApiModelProperty(value = "执行范围执行范围：01-全省、02-全市、03-全县、04-部门")
+    private String zxfw;
+
+    @ApiModelProperty(value = "勤务开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qwkssj;
+
+    @ApiModelProperty(value = "勤务结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qwjssj;
+
+    @ApiModelProperty(value = "建议执勤人员比例 大于0小于100的正整数 ")
+    private String jyzqrybl;
+
+    @ApiModelProperty(value = "建议执勤车辆比例 大于0小于100的正整数 ")
+    private String jyzqclbl;
+
+    @ApiModelProperty(value = "附件地址")
+    private String fjdz;
+
+    @ApiModelProperty(value = "等级颜色")
+    private String djys;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrId;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrXm;
+
+    @ApiModelProperty(value = "配置人身份证号")
+    private String pzrSfzh;
+
+    @ApiModelProperty(value = "配置人所属部门名称")
+    private String pzrSsbm;
+
+    @ApiModelProperty(value = "配置人所属部门代码")
+    private String pzrSsbmdm;
+
+    @ApiModelProperty(value = "配置人所属部门id")
+    private String pzrSsbmid;
+
+    @ApiModelProperty(value = "发布状态（0 未发布  1已发布）")
+    private String fbzt;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQxjEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQxjEditDto.java
new file mode 100644
index 0000000..974dc94
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwQxjEditDto.java
@@ -0,0 +1,99 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwQxjEditDto对象", description="请休假修改dto")
+public class TbQwQxjEditDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "申请人类型（01-民警 02-辅警）")
+    private String sqrlx;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "申请部门名称")
+    private String sqbm;
+
+    @ApiModelProperty(value = "申请部门id")
+    private String sqbmid;
+
+    @ApiModelProperty(value = "申请部门代码")
+    private String sqbmdm;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrXm;
+
+    @ApiModelProperty(value = "申请人ID")
+    private String sqrId;
+
+    @ApiModelProperty(value = "请假类型（01 调休  02 事假 03 病假  04 年假 05婚假 06 产假 07 陪产假 08 丧假）字典")
+    private String qjlx;
+
+    @ApiModelProperty(value = "请假开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "请假结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+    @ApiModelProperty(value = "请假时长")
+    private Integer qjsc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchJlqdDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchJlqdDto.java
new file mode 100644
index 0000000..5c6f1ef
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchJlqdDto.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.mosty.base.model.BasePage;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-11-16
+ * 查询警力清单DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSearchJlqdDto 对象", description = "查询警力清单DTO")
+public class TbQwSearchJlqdDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "查询时间", required = true)
+    private String bbrq;
+
+    @ApiModelProperty(value = "查询范围(米)")
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchZgmfjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchZgmfjDto.java
new file mode 100644
index 0000000..4ce5867
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSearchZgmfjDto.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSearchZgmfjDto对象", description = "在岗民辅警列表查询dto")
+public class TbQwSearchZgmfjDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "01.民警  02.辅警", required = true)
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "警力身份证")
+    private String sfzh;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSpsHdgjChangeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSpsHdgjChangeDto.java
new file mode 100644
index 0000000..5b4bbb3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwSpsHdgjChangeDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtPz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-17
+ * 世乒赛队伍活动轨迹变更 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSpsHdgjChangeDto 对象", description = "世乒赛队伍活动轨迹变更 dto")
+public class TbQwSpsHdgjChangeDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("参赛队伍Id集合")
+    private List<String> ids;
+
+    @ApiModelProperty("活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地")
+    private String hdlx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkDto.java
new file mode 100644
index 0000000..18ffa95
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-08-01
+ * 巡防报备打卡新增DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfbbDkDto 对象", description = "巡防报备打卡新增DTO")
+public class TbQwXfbbDkDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "报备ID")
+    private String bbid;
+
+    @ApiModelProperty(value = "图片ID，多图片用逗号拼接")
+    private String tpid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkWzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkWzDto.java
new file mode 100644
index 0000000..ce01157
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDkWzDto.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.dto.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-08-01
+ * 巡防报备打卡位置DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfbbDkWzDto 对象", description = "巡防报备打卡位置DTO")
+public class TbQwXfbbDkWzDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "报备ID")
+    private String bbid;
+
+    @ApiModelProperty(value = "当前经度")
+    private double jd;
+
+    @ApiModelProperty(value = "当前纬度")
+    private double wd;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDto.java
new file mode 100644
index 0000000..349d221
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbDto.java
@@ -0,0 +1,243 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+//import com.mosty.base.manager.bean.vo.TbJcglJzVo;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfbb")
+@ApiModel(value = "TbQwXfbb对象", description = "巡防报备表")
+public class TbQwXfbbDto extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_QWLX(勤务类型) 00-日常巡防 01-处突 02-维稳 03-警卫 04-安保 05-展会 06-设卡 07-加巡 99-其他")
+    private String qwlx;
+
+    @ApiModelProperty(value = "报备类型  01.正常报备  02.特殊勤务报备")
+    private String bblx;
+
+    @ApiModelProperty(value = "方案类型  01.日常方案  02 特殊方案")
+    private String xlfaLx;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaId;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaMc;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "巡防部门ID")
+    private String xfbmid;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "间隔天数")
+    private Integer jgts;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "巡逻状态（0 巡逻中、1 处警中、2 执行指令中）（字典）")
+    private String xfzt;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(value = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "坐标更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zbsj;
+
+    @ApiModelProperty(value = "巡防时长")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "巡防范围类型")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围id")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "查询距离")
+    @TableField(exist = false)
+    private Integer cxjl = 10;
+
+    @ApiModelProperty(value = "是否打卡，仁寿专用")
+    @TableField(exist = false)
+    private boolean sfDk;
+
+    @ApiModelProperty(value = "负责人员 人员类型")
+    @TableField(exist = false)
+    private String lx;
+
+    @ApiModelProperty(value = "组员类型")
+    private String zylx;
+
+    @ApiModelProperty(value = "动中备勤")
+    private String dzbq;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbQueryByJlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbQueryByJlDto.java
new file mode 100644
index 0000000..aa56cbc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbQueryByJlDto.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.dto.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-08-01
+ * 根据距离查询最近的巡组
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfbbQueryByJlDto 对象", description = "根据距离查询最近的巡组")
+public class TbQwXfbbQueryByJlDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "距离（米）")
+    private BigDecimal radius;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbStartOrEndBbDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbStartOrEndBbDto.java
new file mode 100644
index 0000000..606fde5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbStartOrEndBbDto.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfbbStartOrEndBbDto对象", description = "开始或结束报备DTO")
+public class TbQwXfbbStartOrEndBbDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbVo.java
new file mode 100644
index 0000000..08faaea
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfbbVo.java
@@ -0,0 +1,256 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.qwzx.TbQwCl;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.qwzx.TbQwJyqx;
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防报备表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfbb")
+@ApiModel(value = "TbQwXfbb对象", description = "巡防报备表")
+public class TbQwXfbbVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_QWLX(勤务类型) 00-日常巡防 01-处突 02-维稳 03-警卫 04-安保 05-展会 06-设卡 07-加巡 99-其他")
+    private String qwlx;
+
+    @ApiModelProperty(value = "报备类型  01.正常报备  02.特殊勤务报备")
+    private String bblx;
+
+    @ApiModelProperty(value = "方案类型  01.日常方案  02 特殊方案")
+    private String xlfaLx;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaId;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaMc;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "巡防部门")
+    private String xfbm;
+
+    @ApiModelProperty(value = "巡防部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "巡防部门ID")
+    private String xfbmid;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "间隔天数")
+    private Integer jgts;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "巡逻状态（0 巡逻中、1 处警中、2 执行指令中）（字典）")
+    private String xfzt;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "坐标更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zbsj;
+
+    @ApiModelProperty(value = "巡防时长")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "巡防范围类型")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围id")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "警力集合")
+    List<TbQwJl> jlList;
+
+    @ApiModelProperty(value = "车辆集合")
+    List<TbQwCl> clList;
+
+    @ApiModelProperty(value = "智能装备集合")
+    List<TbQwZnzb> znzbList;
+
+    @ApiModelProperty(value = "警用器械集合")
+    List<TbQwJyqx> jyqxList;
+
+    @ApiModelProperty(value = "巡防范围List")
+    List<TbQwXffwDto> xffwList;
+
+    @ApiModelProperty(value = "组员类型")
+    private String zylx;
+
+    @ApiModelProperty(value = "动中备勤")
+    private String dzbq;
+
+    @ApiModelProperty(value = "武器装备")
+    private String wqzb;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXffwDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXffwDto.java
new file mode 100644
index 0000000..eb1d746
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXffwDto.java
@@ -0,0 +1,41 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXffwDto 对象", description = "巡防报备-巡防范围添加DTO")
+public class TbQwXffwDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "巡防区标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "关联业务ID（值班或报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "关联表ID（巡防区或快反点ID）")
+    private String glbid;
+
+    @ApiModelProperty(value = "勤务类型（1 巡防排班  2 巡防报备）")
+    private String qwlx;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围名称（巡防区或快反点名称）")
+    private String fwMc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbAddAndEditDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbAddAndEditDto.java
new file mode 100644
index 0000000..e07b90c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbAddAndEditDto.java
@@ -0,0 +1,77 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ * 巡防排班新增和修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbAddAndEditDto对象", description = "巡防排班新增和修改DTO")
+public class TbQwXfpbAddAndEditDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班名称")
+    private String pbmc;
+
+    @ApiModelProperty(value = "排班描述")
+    private String pbms;
+
+    @ApiModelProperty(value = "排班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "排班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmid;
+
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "排班周期列表")
+    private List<TbQwXfpbZqDto> zqList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbZqDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbZqDto.java
new file mode 100644
index 0000000..2642d82
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXfpbZqDto.java
@@ -0,0 +1,144 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.qwzx.TbQwCl;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.qwzx.TbQwJyqx;
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ * 巡防排班周期DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbZqDto对象", description = "巡防排班周期DTO")
+public class TbQwXfpbZqDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班id")
+    private String pbId;
+
+    @ApiModelProperty(value = "巡防周期 存1,2,3")
+    private Integer xfzq;
+
+    @ApiModelProperty(value = "班次数 存1,2,3")
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "--D_BZ_WZLX（武装类型）武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "--D_BZ_ZZLX（着装类型）着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "--D_BZ_XLFS（巡逻方式）巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围ID（对应巡防区或快反点的ID）")
+    private List<TbQwXffwDto> xffwList;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "民辅警列表")
+    private List<TbQwJl> jlList;
+
+    @ApiModelProperty(value = "警车列表")
+    private List<TbQwCl> clList;
+
+    @ApiModelProperty(value = "通讯装备列表")
+    private List<TbQwZnzb> znzbList;
+
+    @ApiModelProperty(value = "警用器械列表")
+    private List<TbQwJyqx> jyqxList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXzSearchDto.java
new file mode 100644
index 0000000..40bea83
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwXzSearchDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXzSearchDto对象", description = "大屏-计划、实际街面巡组查询DTO")
+public class TbQwXzSearchDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("负责人姓名")
+    public String fzrXm;
+
+    @ApiModelProperty("所属部门ID")
+    public String ssbmid;
+
+    @ApiModelProperty("所属部门代码")
+    public String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbDto.java
new file mode 100644
index 0000000..c80733f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbDto.java
@@ -0,0 +1,108 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Time;
+import java.util.Date;
+
+/**
+ * <p>
+ * 值班表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbbb")
+@ApiModel(value="TbQwZb对象", description="值班表")
+public class TbQwZbDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "查询值班开始日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ksrq;
+
+    @ApiModelProperty(value = "查询值班结束日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jsrq;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbld;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbdlId;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "值班状态（01 未值班、02值班中、03 值班完成）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "是否确认（0 未确认 1 确认）")
+    private String sfqr;
+
+    @ApiModelProperty(value = "D_ZDY_PBMS排班模式（天模式、周模式、自定义模式）")
+    private String pbms;
+
+    @ApiModelProperty(value = "开始周")
+    private Integer ksz;
+
+    @ApiModelProperty(value = "结束周")
+    private Integer jsz;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "数据来源;1、PC，2、手机端")
+    private String xtSjly;
+
+    @ApiModelProperty(value = "数据状态;0、停用，1、正常")
+    private String xtSjzt;
+
+    @ApiModelProperty(value = "删除标识;0、未删除，1、已删除")
+    private String xtScbz;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbInsertOrUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbInsertOrUpdateDto.java
new file mode 100644
index 0000000..864ceb3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbInsertOrUpdateDto.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 值班排班新增或修改DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwZbpbInsertOrUpdateDto对象", description = "值班排班新增或修改DTO")
+public class TbQwZbpbInsertOrUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "值班名称")
+    private String zbmc;
+
+    @ApiModelProperty(value = "值班描述")
+    private String zbms;
+
+    @ApiModelProperty(value = "值班排班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbpbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "值班排班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbpbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "所属值班部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属值班部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属值班部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "值班排班周期集合")
+    private List<TbQwZbpbZqDto> pbzqList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbZqDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbZqDto.java
new file mode 100644
index 0000000..8aa9ddc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZbpbZqDto.java
@@ -0,0 +1,152 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 值班排班周期DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwZbpbZqDto对象", description = "值班排班周期DTO")
+public class TbQwZbpbZqDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "值班排班ID")
+    private String pbId;
+
+    @ApiModelProperty(value = "值班周期，存1，2，3")
+    private Integer zbzq;
+
+    @ApiModelProperty(value = "班次数，存1，2，3")
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "值班结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班领导身份证号")
+    private String zbldSfzh;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "值班电话")
+    private String zbldDh;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "值班指挥长身份证号")
+    private String zbzhzSfzh;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长电话")
+    private String zbzhzDh;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "专职指挥长身份证号")
+    private String zzzhzSfzh;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长电话")
+    private String zzzhzDh;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "法制值班身份证号")
+    private String fzzbSfzh;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班电话")
+    private String fzzbDh;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty("民辅警集合")
+    private List<TbQwJl> jlList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZnzbDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZnzbDto.java
new file mode 100644
index 0000000..c701c63
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/qwzx/TbQwZnzbDto.java
@@ -0,0 +1,73 @@
+package com.mosty.base.model.dto.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-通讯装备表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_znzb")
+@ApiModel(value="TbQwZnzb对象", description="巡防排班或报备或值班-智能装备表")
+public class TbQwZnzbDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "通讯装备ID")
+    private String txzbId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "通讯装备类型（01 移动警务终端  02 执法记录仪 03 对讲机）")
+    private String txzblx;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "组呼号")
+    private String zhh;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateByYwidDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateByYwidDto.java
new file mode 100644
index 0000000..3a876e6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateByYwidDto.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.dto.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 根据业务ID和业务类型修改任务状态 Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskChangeStateByYwidDto 对象", description = "根据业务ID和业务类型修改任务状态 Dto")
+public class TbRwTaskChangeStateByYwidDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.被驳回")
+    private String rwzt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateDto.java
new file mode 100644
index 0000000..55cec82
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateDto.java
@@ -0,0 +1,81 @@
+package com.mosty.base.model.dto.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务状态修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskGrChangeStateDto 对象", description = "任务状态修改Dto")
+public class TbRwTaskChangeStateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("任务状态 0.正常  1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "变更人")
+    private String bgrid;
+
+    @ApiModelProperty(value = "变更人姓名")
+    private String bgrxm;
+
+    @ApiModelProperty(value = "变更人身份证号")
+    private String bgrsfzh;
+
+    @ApiModelProperty(value = "变更人电话号码")
+    private String bgrdhhm;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateInnerDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateInnerDto.java
new file mode 100644
index 0000000..904cac4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskChangeStateInnerDto.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.dto.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务状态修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskChangeStateInnerDto 对象", description = "任务状态修改Dto(内部)")
+public class TbRwTaskChangeStateInnerDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("任务状态 0.正常  1.任务关闭 2.任务暂停")
+    private String rwzt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskDto.java
new file mode 100644
index 0000000..8d600ca
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskDto.java
@@ -0,0 +1,102 @@
+package com.mosty.base.model.dto.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务插入和返回类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskDto 对象", description = "任务插入和返回类")
+public class TbRwTaskDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一请求码")
+    private String code;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人联系电话")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "任务接收人员List")
+    private List<TbRwTaskUserDto> userDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateDto.java
new file mode 100644
index 0000000..aed0012
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateDto.java
@@ -0,0 +1,109 @@
+package com.mosty.base.model.dto.rwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务状态修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskGrChangeStateDto 对象", description = "任务状态修改Dto")
+public class TbRwTaskGrChangeStateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("个人状态  0.待查看 1.进行中 2.已完成 3.已转发  4.被驳回")
+    private String rwzt;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "转发转发接收人Id")
+    private String zfjsrId;
+
+    @ApiModelProperty(value = "转发接收人名称")
+    private String zfjsrmc;
+
+    @ApiModelProperty(value = "转发接收人身份证号")
+    private String zfjsrsfzh;
+
+    @ApiModelProperty(value = "转发接收人电话")
+    private String zfjsrlxdh;
+
+    @ApiModelProperty(value = "转发接收人变更人所属部门")
+    private String zfssbm;
+
+    @ApiModelProperty(value = "转发接收人变更人所属部门代码")
+    private String zfssbmdm;
+
+    @ApiModelProperty(value = "转发接收人变更人所属县公安局")
+    private String zfssxgaj;
+
+    @ApiModelProperty(value = "转发接收人变更人所属市公安局")
+    private String zfssxgajdm;
+
+    @ApiModelProperty(value = "转发接收人变更人所属市公安局")
+    private String zfsssgaj;
+
+    @ApiModelProperty(value = "转发接收人所属市公安局代码")
+    private String zfsssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateInnerDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateInnerDto.java
new file mode 100644
index 0000000..793c7dc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskGrChangeStateInnerDto.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.dto.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务状态修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskGrChangeStateInnerDto 对象", description = "任务状态修改Dto(内部)")
+public class TbRwTaskGrChangeStateInnerDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty("个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.被驳回")
+    private String rwzt;
+
+    @ApiModelProperty("转发接收人Id")
+    private String zfjsrid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskInnerDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskInnerDto.java
new file mode 100644
index 0000000..69bc5ed
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskInnerDto.java
@@ -0,0 +1,78 @@
+package com.mosty.base.model.dto.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务插入和返回类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskInnerDto 对象", description = "任务插入和返回类(内部请求)")
+public class TbRwTaskInnerDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务链接")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "任务接收人员List")
+    private List<TbRwTaskUserInnerDto> userDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskStatisticsDto.java
new file mode 100644
index 0000000..e032e58
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskStatisticsDto.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.dto.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskStatisticsDto 对象", description = "任务统计数据Dto")
+public class TbRwTaskStatisticsDto implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "数据类型 1.当天 2.近7天 3.近30天")
+    private String dateType;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserDto.java
new file mode 100644
index 0000000..a7b9ccc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserDto.java
@@ -0,0 +1,68 @@
+package com.mosty.base.model.dto.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务接收人员DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskUserDto 对象", description = "任务接收人员DTO")
+public class TbRwTaskUserDto extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收部门名称")
+    private String jsbmmc;
+
+    @ApiModelProperty(value = "接收巡组名称")
+    private String jsxzmc;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "接收人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "接收人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "接收人所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserInnerDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserInnerDto.java
new file mode 100644
index 0000000..27bced1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rwzx/TbRwTaskUserInnerDto.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.dto.rwzx;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务接收人员DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskUserInnerDto 对象", description = "任务接收人员DTO")
+public class TbRwTaskUserInnerDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "接收部门名称")
+    private String jsbmmc;
+
+    @ApiModelProperty(value = "接收巡组名称")
+    private String jsxzmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkInsertDto.java
new file mode 100644
index 0000000..9d28b07
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkInsertDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 接口对接日志添加Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzDyjkInsertDto对象", description = "接口对接日志添加Dto")
+public class TbRzDyjkInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "调用功能，存菜单名称")
+    private String dygn;
+
+    @ApiModelProperty(value = "接口系统")
+    private String jkxt;
+
+    @ApiModelProperty(value = "接口URL")
+    private String jkurl;
+
+    @ApiModelProperty(value = "接口入参")
+    private String jkrc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkUpdateDto.java
new file mode 100644
index 0000000..e99d615
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzDyjkUpdateDto.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.dto.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 接口对接日志修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzDyjkUpdateDto对象", description = "接口对接日志修改Dto")
+public class TbRzDyjkUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "接口返回")
+    private String jkfh;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否成功（字典：0-否，1-是）")
+    private String sfcg;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjInsertDto.java
new file mode 100644
index 0000000..c9dd8d8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjInsertDto.java
@@ -0,0 +1,64 @@
+package com.mosty.base.model.dto.rzzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 呼叫日志添加Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzHjInsertDto对象", description = "呼叫日志添加Dto")
+public class TbRzHjInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "--D_BZ_HJLY（呼叫来源）呼叫来源：01-巡组呼叫，02-事件呼叫")
+    private String hjly;
+
+    @ApiModelProperty(value = "来源ID")
+    private String lyId;
+
+    @ApiModelProperty(value = "--D_BZ_HJFS(呼叫方式)呼叫方式：01-对讲机，02-执法记录仪语音，03-执法记录仪语音视频")
+    private String fjfs;
+
+    @ApiModelProperty(value = "呼叫唯一号码")
+    private String hjhm;
+
+    @ApiModelProperty(value = "被呼叫人id")
+    private String bfjrId;
+
+    @ApiModelProperty(value = "被呼叫人身份证号")
+    private String bfjrSfzh;
+
+    @ApiModelProperty(value = "被呼叫人姓名")
+    private String bfjrXm;
+
+    @ApiModelProperty(value = "被呼叫人部门")
+    private String bfjrSsbm;
+
+    @ApiModelProperty(value = "被呼叫人部门id")
+    private String bfjrSsbmdm;
+
+    @ApiModelProperty(value = "被呼叫人县公安局")
+    private String bfjrSsxgaj;
+
+    @ApiModelProperty(value = "被呼叫人县公安局id")
+    private String bfjrSsxgajdm;
+
+    @ApiModelProperty(value = "被呼叫人市公安局")
+    private String bfjrSssgaj;
+
+    @ApiModelProperty(value = "被呼叫人市公安局id")
+    private String bfjrSssgajdm;
+
+    @ApiModelProperty(value = "附件ID")
+    private String tpId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjUpdateDto.java
new file mode 100644
index 0000000..74e7bba
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzHjUpdateDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.dto.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 呼叫日志修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzHjUpdateDto对象", description = "呼叫日志修改Dto")
+public class TbRzHjUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "呼叫结束时间")
+    private String sfcg;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzSpbfInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzSpbfInsertDto.java
new file mode 100644
index 0000000..276ccd8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzSpbfInsertDto.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.dto.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频播放日志新增DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzSpbfInsertDto对象", description = "视频播放日志新增DTO")
+public class TbRzSpbfInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "摄像头ID")
+    private String sxtid;
+
+    @ApiModelProperty(value = "摄像头名称")
+    private String sxtmc;
+
+    @ApiModelProperty(value = "播放说明（存通过什么功能播放的，如：勤务首页播放）")
+    private String bfsm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzXtfkInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzXtfkInsertDto.java
new file mode 100644
index 0000000..762e1c9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/rzzx/TbRzXtfkInsertDto.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.dto.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 系统反馈日志新增和修改Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzXtfkInsertDto对象", description = "系统反馈日志新增和修改Dto")
+public class TbRzXtfkInsertDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "反馈类型1-系统问题，2-功能改进建议，3-新需求")
+    private String fklx;
+
+    @ApiModelProperty(value = "反馈系统")
+    private String fkxt;
+
+    @ApiModelProperty(value = "反馈时间")
+    private String fksj;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "反馈附件")
+    private String fkfj;
+
+    @ApiModelProperty(value = "反馈人ID")
+    private String fkrid;
+
+    @ApiModelProperty(value = "反馈人身份证号")
+    private String fkrsfzh;
+
+    @ApiModelProperty(value = "反馈人姓名")
+    private String fkrxm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/BxdCreatedDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/BxdCreatedDto.java
new file mode 100644
index 0000000..29e8f1b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/BxdCreatedDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "BxdCreatedDto 对象", description = "必巡点计算返回结果DTO")
+public class BxdCreatedDto {
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "D_BZ_PZLX 配置类型 01.刑事警情 02.行政警情 03.其他警情 04.预警人员 " +
+            "05.预警车辆 06.预警事件 07.盘查重点人员 08.盘查重点车辆")
+    private String pzlx;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/NeighborDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/NeighborDTO.java
new file mode 100644
index 0000000..18b3afa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/NeighborDTO.java
@@ -0,0 +1,26 @@
+package com.mosty.base.model.dto.sjzx;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class NeighborDTO implements Comparable<NeighborDTO> {
+
+    @ApiModelProperty("点位")
+    private BxdCreatedDto point;
+
+    @ApiModelProperty("点位和附近点位的距离")
+    private Map<BxdCreatedDto, Long> neighbors;
+
+    @Override
+    public int compareTo(NeighborDTO o) {
+        return o.getNeighbors().size() - neighbors.size();
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbCaseTypeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbCaseTypeDto.java
new file mode 100644
index 0000000..c524bc7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbCaseTypeDto.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.dto.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 19:24:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_case_type")
+@ApiModel(value = "案由类型对象", description = "案由类型表")
+public class TbCaseTypeDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案由编码", name = "code")
+    private String code;
+
+    @ApiModelProperty(value = "案由名称", name = "name")
+    private String name;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqDTO.java
new file mode 100644
index 0000000..03b9e27
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqDTO.java
@@ -0,0 +1,364 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@TableName("tb_jq" )
+@ApiModel(value = "Entity Of tb_jq")
+@Accessors(chain = true)
+public class TbJqDTO {
+    /**
+     * 警情表ID
+     */
+    @ApiModelProperty(value = "警情表ID", name ="id",required = false)
+    private String id;
+    /**
+     * 警情ID（为110系统的警情表的ID）
+     */
+    @ApiModelProperty(value = "警情ID（为110系统的警情表的ID）", name ="jq110Id",required = false)
+    private String jq110Id;
+    /**
+     * 接警单编号
+     */
+    @ApiModelProperty(value = "接警单编号", name ="jjdbh",required = false)
+    private String jjdbh;
+    /**
+     * 接警单位编号
+     */
+    @ApiModelProperty(value = "接警单位编号", name ="jjdwbh",required = false)
+    private String jjdwbh;
+    /**
+     * 接警单位名称
+     */
+    @ApiModelProperty(value = "接警单位名称", name ="jjdwmc",required = false)
+    private String jjdwmc;
+    /**
+     * 关联接警单编号
+     */
+    @ApiModelProperty(value = "关联接警单编号", name ="gljjdbh",required = false)
+    private String gljjdbh;
+    /**
+     * 接警员编号
+     */
+    @ApiModelProperty(value = "接警员编号", name ="jjybh",required = false)
+    private String jjybh;
+    /**
+     * 接警员姓名
+     */
+    @ApiModelProperty(value = "接警员姓名", name ="jjyxm",required = false)
+    private String jjyxm;
+    /**
+     * 接警台编号
+     */
+    @ApiModelProperty(value = "接警台编号", name ="jjtbh",required = false)
+    private String jjtbh;
+    /**
+     * 接警台IP
+     */
+    @ApiModelProperty(value = "接警台IP", name ="jjtip",required = false)
+    private String jjtip;
+    /**
+     * 呼入时间
+     */
+    @ApiModelProperty(value = "呼入时间", name ="hrsj",required = false)
+    private String hrsj;
+    /**
+     * 来话类型编号
+     */
+    @ApiModelProperty(value = "来话类型编号", name ="lhlxbh",required = false)
+    private String lhlxbh;
+    /**
+     * 报警方式编号
+     */
+    @ApiModelProperty(value = "报警方式编号", name ="bjfsbh",required = false)
+    private String bjfsbh;
+    /**
+     * 报警日期
+     */
+    @ApiModelProperty(value = "报警日期", name ="bjrq",required = false)
+    private java.sql.Date bjrq;
+    /**
+     * 报警时间
+     */
+    @ApiModelProperty(value = "报警时间", name ="bjsj",required = false)
+    private String bjsj;
+    /**
+     * 接警时间
+     */
+    @ApiModelProperty(value = "接警时间", name ="jjsj",required = false)
+    private String jjsj;
+    /**
+     * 呼入时长
+     */
+    @ApiModelProperty(value = "呼入时长", name ="hrsc",required = false)
+    private long hrsc;
+    /**
+     * 接警时长
+     */
+    @ApiModelProperty(value = "接警时长", name ="jjsc",required = false)
+    private long jjsc;
+    /**
+     * 接警录音号
+     */
+    @ApiModelProperty(value = "接警录音号", name ="jjlyh",required = false)
+    private String jjlyh;
+    /**
+     * 报警电话
+     */
+    @ApiModelProperty(value = "报警电话", name ="bjdh",required = false)
+    private String bjdh;
+    /**
+     * 报警电话用户姓名
+     */
+    @ApiModelProperty(value = "报警电话用户姓名", name ="bjdhYhxm",required = false)
+    private String bjdhYhxm;
+    /**
+     * 报警电话用户地址
+     */
+    @ApiModelProperty(value = "报警电话用户地址", name ="bjdhYhdz",required = false)
+    private String bjdhYhdz;
+    /**
+     * 报警人身份证号
+     */
+    @ApiModelProperty(value = "报警人身份证号", name ="bjrSfzh",required = false)
+    private String bjrSfzh;
+    /**
+     * 报警人姓名
+     */
+    @ApiModelProperty(value = "报警人姓名", name ="bjrXm",required = false)
+    private String bjrXm;
+    /**
+     * 报警人性别
+     */
+    @ApiModelProperty(value = "报警人性别", name ="bjrXb",required = false)
+    private String bjrXb;
+    /**
+     * 报警人联系电话
+     */
+    @ApiModelProperty(value = "报警人联系电话", name ="bjrLxdh",required = false)
+    private String bjrLxdh;
+    /**
+     * 报警人住址单位
+     */
+    @ApiModelProperty(value = "报警人住址单位", name ="bjrZzdw",required = false)
+    private String bjrZzdw;
+    /**
+     * 事发地址行政区划
+     */
+    @ApiModelProperty(value = "事发地址行政区划", name ="sfdzxzqh",required = false)
+    private String sfdzxzqh;
+    /**
+     * 事发地址
+     */
+    @ApiModelProperty(value = "事发地址", name ="sfdz",required = false)
+    private String sfdz;
+    /**
+     * 报警内容
+     */
+    @ApiModelProperty(value = "报警内容", name ="bjnr",required = false)
+    private String bjnr;
+    /**
+     * 警情级别
+     */
+    @ApiModelProperty(value = "警情级别", name ="jqjb",required = false)
+    private String jqjb;
+    /**
+     * 报警类别
+     */
+    @ApiModelProperty(value = "报警类别", name ="bjlb",required = false)
+    private String bjlb;
+    /**
+     * 报警类型
+     */
+    @ApiModelProperty(value = "报警类型", name ="bjlx",required = false)
+    private String bjlx;
+    /**
+     * 报警细类
+     */
+    @ApiModelProperty(value = "报警细类", name ="bjxl",required = false)
+    private String bjxl;
+    /**
+     * 被困人数
+     */
+    @ApiModelProperty(value = "被困人数", name ="bkrs",required = false)
+    private long bkrs;
+    /**
+     * 受伤人数
+     */
+    @ApiModelProperty(value = "受伤人数", name ="ssrs",required = false)
+    private long ssrs;
+    /**
+     * 死亡人数
+     */
+    @ApiModelProperty(value = "死亡人数", name ="swrs",required = false)
+    private long swrs;
+    /**
+     * 有无危险物质(0：无，1：有，默认为无)
+     */
+    @ApiModelProperty(value = "有无危险物质(0：无，1：有，默认为无)", name ="ywwxwz",required = false)
+    private long ywwxwz;
+    /**
+     * 有无爆炸/泄漏(0：无，1：有，默认为无)
+     */
+    @ApiModelProperty(value = "有无爆炸/泄漏(0：无，1：有，默认为无)", name ="ywbzxl",required = false)
+    private long ywbzxl;
+    /**
+     *  有无被困人员(0：无，1：有，默认为无)
+     */
+    @ApiModelProperty(value = " 有无被困人员(0：无，1：有，默认为无)", name ="ywbkry",required = false)
+    private long ywbkry;
+    /**
+     * 是否涉外(0：无，1：有，默认为无)
+     */
+    @ApiModelProperty(value = "是否涉外(0：无，1：有，默认为无)", name ="sfsw",required = false)
+    private long sfsw;
+    /**
+     * 是否是外语报警(0：无，1：有，默认为无)
+     */
+    @ApiModelProperty(value = "是否是外语报警(0：无，1：有，默认为无)", name ="sfswybj",required = false)
+    private long sfswybj;
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度", name ="jd",required = false)
+    private double jd;
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度", name ="wd",required = false)
+    private double wd;
+    /**
+     * 坐标
+     */
+    @ApiModelProperty(value = "坐标", name ="zb",required = false)
+    private long zb;
+    /**
+     * 坐标hash值
+     */
+    @ApiModelProperty(value = "坐标hash值", name ="zbhash",required = false)
+    private String zbhash;
+    /**
+     * 处置状态 0.未处置 1.处置中 2.已完成
+     */
+    @ApiModelProperty(value = "处置状态 0.未处置 1.处置中 2.已完成", name ="czzt",required = false)
+    private String czzt;
+    /**
+     * 重大警情添加类型 01.系统推送 02.手动添加 03.一键报警
+     */
+    @ApiModelProperty(value = "重大警情添加类型 01.系统推送 02.手动添加 03.一键报警", name ="zdjqtjlx",required = false)
+    private String zdjqtjlx;
+    /**
+     * 管辖部门
+     */
+    @ApiModelProperty(value = "管辖部门", name ="ssbm",required = false)
+    private String ssbm;
+    /**
+     * 管辖部门代码
+     */
+    @ApiModelProperty(value = "管辖部门代码", name ="ssbmdm",required = false)
+    private String ssbmdm;
+    /**
+     * 管辖县公安局
+     */
+    @ApiModelProperty(value = "管辖县公安局", name ="ssxgaj",required = false)
+    private String ssxgaj;
+    /**
+     * 管辖县公安局代码
+     */
+    @ApiModelProperty(value = "管辖县公安局代码", name ="ssxgajdm",required = false)
+    private String ssxgajdm;
+    /**
+     * 管辖市公安局
+     */
+    @ApiModelProperty(value = "管辖市公安局", name ="sssgaj",required = false)
+    private String sssgaj;
+    /**
+     * 管辖市公安局代码
+     */
+    @ApiModelProperty(value = "管辖市公安局代码", name ="sssgajdm",required = false)
+    private String sssgajdm;
+    /**
+     * 数据来源;1、PC，2、手机端
+     */
+    @ApiModelProperty(value = "数据来源;1、PC，2、手机端", name ="xtSjly",required = false)
+    private String xtSjly;
+    /**
+     * 数据状态;0、停用，1、正常
+     */
+    @ApiModelProperty(value = "数据状态;0、停用，1、正常", name ="xtSjzt",required = false)
+    private String xtSjzt;
+    /**
+     * 删除标识;0、未删除，1、已删除
+     */
+    @ApiModelProperty(value = "删除标识;0、未删除，1、已删除", name ="xtScbz",required = false)
+    private String xtScbz;
+    /**
+     * 创建IP
+     */
+    @ApiModelProperty(value = "创建IP", name ="xtCjip",required = false)
+    private String xtCjip;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name ="xtCjsj",required = false)
+    private String xtCjsj;
+    /**
+     * 创建人ID
+     */
+    @ApiModelProperty(value = "创建人ID", name ="xtCjrId",required = false)
+    private String xtCjrId;
+    /**
+     * 创建人名称
+     */
+    @ApiModelProperty(value = "创建人名称", name ="xtCjr",required = false)
+    private String xtCjr;
+    /**
+     * 创建部门代码
+     */
+    @ApiModelProperty(value = "创建部门代码", name ="xtCjbmdm",required = false)
+    private String xtCjbmdm;
+    /**
+     * 创建部门名称
+     */
+    @ApiModelProperty(value = "创建部门名称", name ="xtCjbmmc",required = false)
+    private String xtCjbmmc;
+    /**
+     * 最后更新IP
+     */
+    @ApiModelProperty(value = "最后更新IP", name ="xtZhgxip",required = false)
+    private String xtZhgxip;
+    /**
+     * 最后更新时间
+     */
+    @ApiModelProperty(value = "最后更新时间", name ="xtZhgxsj",required = false)
+    private String xtZhgxsj;
+    /**
+     * 最后更新人ID
+     */
+    @ApiModelProperty(value = "最后更新人ID", name ="xtZhgxrid",required = false)
+    private String xtZhgxrid;
+    /**
+     * 最后更新人名称
+     */
+    @ApiModelProperty(value = "最后更新人名称", name ="xtZhgxr",required = false)
+    private String xtZhgxr;
+    /**
+     * 最后更新部门代码
+     */
+    @ApiModelProperty(value = "最后更新部门代码", name ="xtZhgxbmdm",required = false)
+    private String xtZhgxbmdm;
+    /**
+     * 最后更新部门名称
+     */
+    @ApiModelProperty(value = "最后更新部门名称", name ="xtZhgxbm",required = false)
+    private String xtZhgxbm;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", name ="bz",required = false)
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqGeohash.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqGeohash.java
new file mode 100644
index 0000000..351dd38
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqGeohash.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.dto.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 19:24:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq")
+@ApiModel(value = "TbJqGeohash对象", description = "警情表")
+public class TbJqGeohash implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 坐标hash
+     */
+    @ApiModelProperty(value = "坐标hash", name = "zbhash")
+    private String zbhash;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "数量", name = "sl")
+    private Integer sl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqYjbjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqYjbjDto.java
new file mode 100644
index 0000000..c462fc3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbJqYjbjDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.dto.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJqYjbjDto 对象", description = "一键报警警情DTO")
+public class TbJqYjbjDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjDto.java
new file mode 100644
index 0000000..c5f9f4a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjDto.java
@@ -0,0 +1,150 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 事件新增和修改 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjDto 对象", description = "事件新增和修改 dto")
+public class TbSjDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "来源ID", name = "ywId")
+    private String ywId;
+
+    @ApiModelProperty(value = "事件来源:01-感知预警，02-警情，03-一键增援，04-犯罪分析，99-自行发起", name = "sjFl")
+    private String sjFl;
+
+    @ApiModelProperty(value = "事件级别", name = "sjJb")
+    private String sjJb;
+
+    @ApiModelProperty(value = "发生时间", name = "sjFssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sjFssj;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String bjrxm;
+
+    @ApiModelProperty(value = "报警人电话")
+    private String bjrlxdh;
+
+    @ApiModelProperty(value = "事件标题", name = "sjBt")
+    private String sjBt;
+
+    @ApiModelProperty(value = "事件内容", name = "sjNr")
+    private String sjNr;
+
+    @ApiModelProperty(value = "事件初始经度", name = "csjd")
+    private BigDecimal csjd;
+
+    @ApiModelProperty(value = "事件初始纬度", name = "cswd")
+    private BigDecimal cswd;
+
+    @ApiModelProperty(value = "事件初始坐标hash", name = "cszbhash")
+    private String cszbhash;
+
+    @ApiModelProperty(value = "事件初始地址行政区划代码", name = "csdzxzqh")
+    private String csdzxzqh;
+
+    @ApiModelProperty(value = "事件初始地址", name = "csdz")
+    private String csdz;
+
+    @ApiModelProperty(value = "事件当前经度", name = "dqjd")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "事件当前纬度", name = "dqwd")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "事件当前坐标HASH", name = "dqzbhash")
+    private String dqzbhash;
+
+    @ApiModelProperty(value = "事件当前地址行政区划代码", name = "dqdzxzqh")
+    private String dqdzxzqh;
+
+    @ApiModelProperty(value = "事件当前地址", name = "dqdz")
+    private String dqdz;
+
+    @ApiModelProperty(value = "处置开始时间", name = "czkssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czkssj;
+
+    @ApiModelProperty(value = "处置结束时间", name = "czjssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czjssj;
+
+    @ApiModelProperty(value = "圈层-核心圈", name = "qcHx")
+    private Integer qcHx;
+
+    @ApiModelProperty(value = "圈层-警戒圈", name = "qcJj")
+    private Integer qcJj;
+
+    @ApiModelProperty(value = "圈层-关注圈", name = "qcGz")
+    private Integer qcGz;
+
+    @ApiModelProperty(value = "圈层更新次数", name = "qcGxcs")
+    private Integer qcGxcs;
+
+    @ApiModelProperty(value = "圈层更新时间", name = "qcGxsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qcGxsj;
+
+    @ApiModelProperty(value = "图片ID", name = "tpId")
+    private String tpId;
+
+    @ApiModelProperty(value = "处置状态 0.未处置  1.已处置", name = "czzt")
+    private String czzt;
+
+    @ApiModelProperty(value = "处置说明", name = "czsm")
+    private String czsm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjQcszDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjQcszDto.java
new file mode 100644
index 0000000..21b8f07
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjQcszDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-25
+ * 时间圈层设置 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjQcszDto 对象", description = "时间圈层设置 dto")
+public class TbSjQcszDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "圈层-核心圈", name = "qcHx")
+    private Integer qcHx;
+
+    @ApiModelProperty(value = "圈层-警戒圈", name = "qcJj")
+    private Integer qcJj;
+
+    @ApiModelProperty(value = "圈层-关注圈", name = "qcGz")
+    private Integer qcGz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzDto.java
new file mode 100644
index 0000000..166794f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzDto.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-25
+ * 日志记录新增 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjRzDto 对象", description = "日志记录新增 dto")
+public class TbSjRzDto implements Serializable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "日志内容")
+    private String rzms;
+
+    @ApiModelProperty(value = "操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date czsj;
+
+    @ApiModelProperty(value = "操作人员id")
+    private String czryId;
+
+    @ApiModelProperty(value = "操作人员身份证号")
+    private String czrySfzh;
+
+    @ApiModelProperty(value = "操作人员姓名")
+    private String czryXm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzInsertDto.java
new file mode 100644
index 0000000..47c8861
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjRzInsertDto.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-25
+ * 日志记录新增 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjRzInsertDto 对象", description = "日志记录新增 dto")
+public class TbSjRzInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "日志内容")
+    private String rzms;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjSpbfDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjSpbfDTO.java
new file mode 100644
index 0000000..0d682a6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjSpbfDTO.java
@@ -0,0 +1,83 @@
+package com.mosty.base.model.dto.sjzx;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import com.mosty.common.base.entity.log.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+
+/**
+ * @Author esacpe
+ * @Date 2022-8-01 09:45:42
+ */
+@EqualsAndHashCode(callSuper = false)
+@Data
+@TableName("tb_sj_spbf")
+@ApiModel(value = "SPBF对象", description = "视频播放")
+@Accessors(chain = true)
+public class TbSjSpbfDTO extends BasePage implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "标识ID", name = "id", required = false)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "事件ID", name = "sjId", required = false)
+    private String sjId;
+
+    @ApiModelProperty(value = "摄像头id", name = "sxtId", required = false)
+    private String sxtId;
+
+    @ApiModelProperty(value = "播放开始时间", name = "bfkssj", required = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bfkssj;
+
+    @ApiModelProperty(value = "播放结束时间", name = "bfjssj", required = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bfjssj;
+
+    @ApiModelProperty(value = "摆放位置", name = "wz", required = false)
+    private String wz;
+
+    @ApiModelProperty(value = "图片ID", name = "tpId", required = false)
+    private String tpId;
+
+	@ApiModelProperty(value = "所属部门id")
+	private String ssbmid;
+
+	@ApiModelProperty(value = "所属部门")
+	private String ssbm;
+
+	@ApiModelProperty(value = "所属部门代码")
+	private String ssbmdm;
+
+	@ApiModelProperty(value = "所属县公安局")
+	private String ssxgaj;
+
+	@ApiModelProperty(value = "所属县公安局id")
+	private String ssxgajid;
+
+	@ApiModelProperty(value = "所属县公安局代码")
+	private String ssxgajdm;
+
+	@ApiModelProperty(value = "所属市公安局id")
+	private String sssgajid;
+
+	@ApiModelProperty(value = "所属市公安局")
+	private String sssgaj;
+
+	@ApiModelProperty(value = "所属市公安局代码")
+	private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjUpdateJwdDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjUpdateJwdDto.java
new file mode 100644
index 0000000..9a88697
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/sjzx/TbSjUpdateJwdDto.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.dto.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-08-25
+ * 修改经纬度 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjUpdateJwdDto 对象", description = "修改经纬度 dto")
+public class TbSjUpdateJwdDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "当前经度")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "当前纬度")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "当前地址")
+    private String dqdz;
+
+    @ApiModelProperty(value = "当前行政区划")
+    private String dqdzxzqh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaInsertDto.java
new file mode 100644
index 0000000..7722b8f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaInsertDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.spxl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案修改 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaInsertDto对象", description = "视频巡逻方案摄像头配置dto")
+public class TbSpxlSpxlfaInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "方案ID")
+    private String faid;
+
+    @ApiModelProperty(value = "摄像头组数组")
+    private List<TbSpxlSpxlfaSxtzDto> sxtzList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtDto.java
new file mode 100644
index 0000000..3542486
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtDto.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.dto.spxl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtPz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案修改 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaSxtDto对象", description = "视频巡逻方案摄像头dto")
+public class TbSpxlSpxlfaSxtDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "摄像头ID（对应国标编号）")
+    private String sxtid;
+
+    @ApiModelProperty(value = "摄像头名称")
+    private String sxtmc;
+
+    @ApiModelProperty(value = "巡逻类型  1.定速巡航  2.定位看守  3.综合配置")
+    private String xllx;
+
+    @ApiModelProperty(value = "视频巡逻相关配置项")
+    private TbSpxlSpxlfaSxtPz sxtPz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtPlayDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtPlayDto.java
new file mode 100644
index 0000000..a793c69
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtPlayDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.spxl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案摄像头播放Dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaSxtPlayDto对象", description = "视频巡逻方案摄像头播放Dto")
+public class TbSpxlSpxlfaSxtPlayDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "方案ID")
+    private String faid;
+
+    @ApiModelProperty(value = "摄像头组数组")
+    private List<TbSpxlSpxlfaSxtzDto> sxtzList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtzDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtzDto.java
new file mode 100644
index 0000000..b7b1936
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaSxtzDto.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.dto.spxl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案修改 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaSxtzDto对象", description = "视频巡逻方案摄像头组dto")
+public class TbSpxlSpxlfaSxtzDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "摄像头组名称")
+    private String sxtzmc;
+
+    @ApiModelProperty(value = "摄像头列表")
+    private List<TbSpxlSpxlfaSxtDto> sxtList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaUpdateDto.java
new file mode 100644
index 0000000..e04b7f1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/spxl/TbSpxlSpxlfaUpdateDto.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.dto.spxl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案修改 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaUpdateDto对象", description = "视频巡逻方案修改dto")
+public class TbSpxlSpxlfaUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "方案类型")
+    private String falx;
+
+    @ApiModelProperty(value = "分屏数")
+    private String fps;
+
+    @ApiModelProperty(value = "间隔时间")
+    private Integer jgsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/websocket/WebSocketObject.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/websocket/WebSocketObject.java
new file mode 100644
index 0000000..130212f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/websocket/WebSocketObject.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.dto.websocket;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * websocket发送消息实体
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "WebSocketObject 对象", description = "websocket发送消息实体")
+@NoArgsConstructor
+@AllArgsConstructor
+public class WebSocketObject {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "消息类型 01.一键报警新增  02.一键报警处置完成 03.报备巡组位置新增 04.报备巡组位置修改 " +
+            "05.报备巡组位置删除 06 警情推送")
+    private String type;
+
+    @ApiModelProperty(value = "消息对象")
+    private Object obj;
+
+    @ApiModelProperty(value = "推送给身份证")
+    private List<String> sfzList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/AppLocationReceiveDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/AppLocationReceiveDto.java
new file mode 100644
index 0000000..f3a3e4a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/AppLocationReceiveDto.java
@@ -0,0 +1,115 @@
+package com.mosty.base.model.dto.wzzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @title: app位置接收
+ * @projectName mosty-rzzx
+ * @description:
+ * @date 2022/8/29 10:58
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "AppLocationReceive对象", description = "APP位置接收")
+public class AppLocationReceiveDto implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "数据来源", name = "sjly", required = false)
+    private String sjly;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid", required = false)
+    private String bbid;
+
+    @ApiModelProperty(value = "用户ID", name = "yhid", required = true)
+    private String yhid;
+
+    @ApiModelProperty(value = "用户姓名", name = "yhxm", required = false)
+    private String yhxm;
+
+    @ApiModelProperty(value = "用户身份证号", name = "yhSfzh", required = false)
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "经度", name = "jd", required = false)
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd", required = false)
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "国", name = "guo", required = false)
+    private String guo;
+
+    @ApiModelProperty(value = "省", name = "sheng", required = false)
+    private String sheng;
+
+    @ApiModelProperty(value = "市", name = "shi", required = false)
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码", name = "csbm", required = false)
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县", name = "ssqx", required = false)
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码", name = "qxbm", required = false)
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址", name = "dzxz", required = false)
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称", name = "dzjc", required = false)
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志", name = "dwbz", required = false)
+    private String dwbz;
+
+    @ApiModelProperty(value = "接入编号", name = "jrbh", required = false)
+    private String jrbh;
+
+    @ApiModelProperty(value = "所属部门", name = "ssbm", required = false)
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm", required = false)
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局", name = "ssxgaj", required = false)
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码", name = "ssxgajdm", required = false)
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局", name = "sssgaj", required = false)
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码", name = "sssgajdm", required = false)
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid", required = true)
+    private String jzid;
+
+    @ApiModelProperty(value = "警组名称", name = "jzmc", required = true)
+    private String jzmc;
+
+    /**
+     * 上次经度，单位度
+     */
+    @ApiModelProperty(value = "经度(转WGS84后的值)", name = "lng")
+    private Double lastLng;
+
+    /**
+     * 上次纬度，单位度
+     */
+    @ApiModelProperty(value = "纬度(转WGS84后的值)", name = "lat")
+    private Double lastLat;
+
+    @ApiModelProperty(value = "上次定位时间", name = "time")
+    private Date lastTime;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/LocationInfo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/LocationInfo.java
new file mode 100644
index 0000000..21d6b7b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/LocationInfo.java
@@ -0,0 +1,212 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author 晏大兵
+ * @ClassName: LocationInfo
+ * @Description: (位置信息主表)
+ * @date 2022年4月17日 下午11:29:43
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "位置信息实体", description = "位置信息实体")
+public class LocationInfo extends BaseEntity {
+
+    // eq查询
+    public static final transient String PAGE_PAR_EQ = "id,deptId,userId,sourceName,sourceCode,locationType,provider,accessNumberType,accessNumber";
+    // like查询
+    public static final transient String PAGE_PAR_LIKE = "deptName,userName,poiName,address";
+    public static final String[] PAR_EQ = PAGE_PAR_EQ.split(",");
+    public static final String[] PAR_LIKE = PAGE_PAR_LIKE.split(",");
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "id", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称", name = "sourceName")
+    private String sourceName;
+
+    @ApiModelProperty(value = "数据来源 默认为 融合计算", name = "sourceCode")
+    private String sourceCode;
+
+    @ApiModelProperty(value = "报送数据的用户名称", name = "userName")
+    private String userName;
+
+    @ApiModelProperty(value = "报送数据的用户ID(sfzh)", name = "userId")
+    private String userId;
+
+    @ApiModelProperty(value = "定位类型", name = "locationType")
+    private String locationType;
+
+    @ApiModelProperty(value = "坐标来源(1.GPS 2.融合通讯 3.对讲机 4.执法记录仪)", name = "zbly")
+    private String zbly;
+
+    @ApiModelProperty(value = "精度", name = "accuracy")
+    private Double accuracy;
+
+    @ApiModelProperty(value = "角度", name = "bearing")
+    private Double bearing;
+
+    @ApiModelProperty(value = "提供者", name = "provider")
+    private String provider;
+
+    @ApiModelProperty(value = "星数", name = "satellites")
+    private Integer satellites;
+
+    @ApiModelProperty(value = "国家", name = "country")
+    private String country;
+
+    @ApiModelProperty(value = "省", name = "provinc")
+    private String provinc;
+
+    @ApiModelProperty(value = "市", name = "city")
+    private String city;
+
+    @ApiModelProperty(value = "城市编码", name = "cityCode")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区", name = "district")
+    private String district;
+
+    @ApiModelProperty(value = "区域码", name = "adCode")
+    private String adCode;
+
+    @ApiModelProperty(value = "地址", name = "address")
+    private String address;
+
+    @ApiModelProperty(value = "地址简称", name = "poiName")
+    private String poiName;
+
+    @ApiModelProperty(value = "原始经度(上报的原始数据未进行转换)", name = "sourceLng")
+    private Double sourceLng;
+
+    @ApiModelProperty(value = "原始纬度(上报的原始数据未进行转换)", name = "sourceLat")
+    private Double sourceLat;
+
+    /** =====位置原始数据开始===== **/
+    @ApiModelProperty(value = "消息ID", name = "messageID")
+    protected short messageId;
+
+    @ApiModelProperty(value = "消息流水号", name = "serialNumber")
+    protected short serialNumber;
+
+    @ApiModelProperty(value = "消息包版本", name = "version")
+    protected byte version;
+
+    @ApiModelProperty(value = "接入编号编码类型，0:十六进制；1: ASCII编码；2: GBK编码；", name = "accessNumberType")
+    private int accessNumberType;
+
+    @ApiModelProperty(value = "接入编号", name = "accessNumber")
+    private String accessNumber;
+
+    @ApiModelProperty(value = "经度(转WGS84后的值)", name = "lng")
+    private Double lng;
+
+    @ApiModelProperty(value = "纬度(转WGS84后的值)", name = "lat")
+    private Double lat;
+
+    @ApiModelProperty(value = "高程，单位米", name = "altitude")
+    private Integer altitude;
+
+    @ApiModelProperty(value = "速度，单位Km/h", name = "speed")
+    private Float speed;
+
+    @ApiModelProperty(value = "方向，0-359，正北为0，顺时针", name = "direction")
+    private Integer direction;
+
+    @ApiModelProperty(value = "定位时间", name = "time")
+    private Date time;
+
+    @ApiModelProperty(value = "是否打开ACC", name = "openAcc")
+    private boolean openAcc;
+
+    @ApiModelProperty(value = "是否已定位", name = "located")
+    private boolean located;
+
+    @ApiModelProperty(value = "是否是西经(负值)", name = "westLng")
+    private boolean westLng;
+
+    @ApiModelProperty(value = "是否是南纬(负值)", name = "southLat")
+    private boolean southLat;
+
+    @ApiModelProperty(value = "是否是实时位置", name = "realtime")
+    private boolean realtime;
+
+    @ApiModelProperty(value = "是否紧急报警", name = "urgency")
+    private boolean urgency;
+
+    @ApiModelProperty(value = "是否超速报警", name = "overspeed")
+    private boolean overspeed;
+
+    @ApiModelProperty(value = "是否断电报警", name = "outage")
+    private boolean outage;
+
+    @ApiModelProperty(value = "是否碰撞报警", name = "crash")
+    private boolean crash;
+
+    @ApiModelProperty(value = "用户ID", name = "yhid")
+    private String yhid;
+
+    @ApiModelProperty(value = "报备ID,接入编号", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "警组名称", name = "jzmc")
+    private String jzmc;
+
+    @ApiModelProperty(value = "上次经度 经度(转WGS84后的值)", name = "lng")
+    private Double lastLng;
+
+    @ApiModelProperty(value = "上次纬度 纬度(转WGS84后的值)", name = "lat")
+    private Double lastLat;
+
+    @ApiModelProperty(value = "上次定位时间", name = "time")
+    private Date lastTime;
+
+    @ApiModelProperty(value = "部门Id", name = "deptId")
+    private String deptId;
+
+    @ApiModelProperty(value = "部门名称", name = "deptName")
+    private String deptName;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajId;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajId;
+
+    @ApiModelProperty(value = "唯一标识")
+    private String wybs;
+
+    @ApiModelProperty(value = "设备ID（UDP有才推送）")
+    private String sbid;
+
+    @ApiModelProperty(value = "设备名称（UDP有才推送）")
+    private String sbmc;
+
+    /** =====位置原始数据结束===== **/
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SjCyjlUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SjCyjlUpdateDto.java
new file mode 100644
index 0000000..dbd809e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SjCyjlUpdateDto.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author
+ * @title: SjCyjlUpdateDto
+ * @projectName gxag-location
+ * @description:
+ * @date 2022/10/5 11:30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SjCyjlUpdateDto对象", description = "位置参与警力更新DTO")
+public class SjCyjlUpdateDto implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(value = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "坐标更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zbsj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SswzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SswzQuery.java
new file mode 100644
index 0000000..dc16d1c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/SswzQuery.java
@@ -0,0 +1,20 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SswzQuery 对象", description = "位置查询DTO")
+public class SswzQuery implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "关键字查询")
+    private String keyword;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WzcxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WzcxQuery.java
new file mode 100644
index 0000000..ed5001b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WzcxQuery.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "WzcxQuery 对象", description = "位置统计DTO")
+public class WzcxQuery extends BasePage implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "报备id")
+    private String bbid;
+
+    @ApiModelProperty(value = "用户id")
+    private String yhid;
+
+    @ApiModelProperty(value = "用户sfzh")
+    private String yhsfzh;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WztjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WztjQuery.java
new file mode 100644
index 0000000..6afe383
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/WztjQuery.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "WztjQuery 对象", description = "位置统计DTO")
+public class WztjQuery extends BasePage implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "开始日期")
+    private String ksrq;
+
+    @ApiModelProperty(value = "结束日期")
+    private String jsrq;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhxm;
+
+    @ApiModelProperty(value = "开始里程")
+    private String kslc;
+
+    @ApiModelProperty(value = "结束里程")
+    private String jslc;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/XfbbUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/XfbbUpdateDto.java
new file mode 100644
index 0000000..88587bf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/wzzx/XfbbUpdateDto.java
@@ -0,0 +1,70 @@
+package com.mosty.base.model.dto.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author
+ * @title: XfbbUpdateDto
+ * @projectName gxag-location
+ * @description:
+ * @date 2022/10/5 11:30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XfbbUpdateDto对象", description = "报备更新DTO")
+public class XfbbUpdateDto implements Serializable, Cloneable {
+
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(value = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "坐标更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zbsj;
+
+    @ApiModelProperty(value = "巡防时长")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "备注", name = "bz")
+    private String bz;
+
+    @ApiModelProperty(value = "巡防状态")
+    private String xfzt;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/CyjlSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/CyjlSearchDto.java
new file mode 100644
index 0000000..ffb7df6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/CyjlSearchDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-09-08
+ * 参与警力查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "CyjlSearchDto 对象", description = "参与警力查询DTO")
+public class CyjlSearchDto extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/GetLastYjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/GetLastYjDto.java
new file mode 100644
index 0000000..685ab8c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/GetLastYjDto.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-11-20
+ * 获取最新一条预警DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GetLastYjDto 对象", description = "获取最新一条预警DTO")
+public class GetLastYjDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警来源ID")
+    private String yjlyid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/KafkaYjxxDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/KafkaYjxxDto.java
new file mode 100644
index 0000000..4823c2c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/KafkaYjxxDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-10-21
+ * kafka预警信息dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "KafkaYjxxDto 对象", description = "kafka预警信息dto")
+public class KafkaYjxxDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "kafka返回的预警信息")
+    private String message;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/MyZlSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/MyZlSearchDto.java
new file mode 100644
index 0000000..0413dfb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/MyZlSearchDto.java
@@ -0,0 +1,46 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-09-14
+ * 我的指令信息查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "MyZlSearchDto 对象", description = "我的指令信息查询DTO")
+public class MyZlSearchDto extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）逗号拼接多个")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令),逗号拼接多个")
+    private String zllx;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "第三方查询必须，身份证号")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/NewZxjlSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/NewZxjlSearchDto.java
new file mode 100644
index 0000000..35f8fa0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/NewZxjlSearchDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-10-17
+ * 最新指令执行记录查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "NewZxjlSearchDto 对象", description = "最新指令执行记录查询DTO")
+public class NewZxjlSearchDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令ID", required = true)
+    private String zlid;
+
+    @ApiModelProperty(value = "最后一条记录的时间,不传入时间则表示查询所有数据")
+    private String time;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycDto.java
new file mode 100644
index 0000000..d8f6eef
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycDto.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ *
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbFzycDto 对象", description = "犯罪预测查询DTO")
+public class TbFzycDto extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "开始日期")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束日期")
+    private String jssj;
+
+    @ApiModelProperty(value = "是否已巡逻")
+    private String sfxl;
+
+    @ApiModelProperty(value = "案发概率")
+    private BigDecimal prob;
+
+    @ApiModelProperty(value = "网格大小")
+    private String gridType;
+
+    @ApiModelProperty(value = "班次")
+    private String bc;
+
+    @ApiModelProperty(value = "班次bcList")
+    private List<String> bcList;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyWord;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycXljlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycXljlDto.java
new file mode 100644
index 0000000..2e1e9ca
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbFzycXljlDto.java
@@ -0,0 +1,111 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("tb_fzyc_xljl")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycXljlDto对象", description = "犯罪预测巡逻记录表")
+public class TbFzycXljlDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "巡逻报备ID")
+    private String xlbbId;
+
+    @ApiModelProperty(value = "犯罪预警预测指令ID")
+    private String fzyjyczlId;
+
+    @ApiModelProperty(value = "巡逻开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xlkssj;
+
+    @ApiModelProperty(value = "巡逻结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xljssj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "距离中心点距离（米）")
+    private BigDecimal zxJl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "报备部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "报备部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "巡防时长")
+    private int xfsc;
+
+    @ApiModelProperty(value = "巡防里程")
+    private int xflc;
+
+    @ApiModelProperty(value = "坐标线（保存redis使用）", dataType = "java.util.List")
+    @TableField(exist = false)
+    private List<BigDecimal[]> zbList;
+
+    @ApiModelProperty(value = "巡组名称")
+    private String xzmc;
+
+    @ApiModelProperty(value = "是否签收 0否 1是")
+    private String sfqs;
+
+    @ApiModelProperty(value = "盘查人员")
+    private int pcry;
+
+    @ApiModelProperty(value = "盘查车辆")
+    private int pccl;
+
+    @ApiModelProperty(value = "是否签收名称")
+    private String sfqsmc;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxDTO.java
new file mode 100644
index 0000000..54704a0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxDTO.java
@@ -0,0 +1,159 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("tb_yjxx" )
+@ApiModel(value = "Entity Of tb_yjxx")
+@Accessors(chain = true)
+public class TbYjxxDTO {
+
+    @ApiModelProperty(value = "预警表标识ID", name ="id",required = false)
+    private String id;
+
+    @ApiModelProperty(value = "预警来源类型 01.感知预警  02.派发预警", name = "yjLylx")
+    private String yjLylx;
+
+    @ApiModelProperty(value = "预警类型;01-人员预警，02-车辆预警，03-人员和车辆预警，04-事件预警（拉横幅、打架等），05-警情", name ="yjLx",required = false)
+    private String yjLx;
+
+    @ApiModelProperty(value = "感知源id", name ="yjGzyid",required = false)
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "发生日期", name ="yjFsrq",required = false)
+    private java.sql.Date yjFsrq;
+
+    @ApiModelProperty(value = "发生时间", name ="yjFssj",required = false)
+    private String yjFssj;
+
+    @ApiModelProperty(value = "预警时间", name ="yjSj",required = false)
+    private String yjSj;
+
+    @ApiModelProperty(value = "预警级别（10红、20橙、30黄、40蓝）", name ="yjJb",required = false)
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题", name ="yjBt",required = false)
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容", name ="yjNr",required = false)
+    private String yjNr;
+
+    @ApiModelProperty(value = "预警次数", name ="yjCs",required = false)
+    private long yjCs;
+
+    @ApiModelProperty(value = "经度", name ="jd",required = false)
+    private double jd;
+
+    @ApiModelProperty(value = "纬度", name ="wd",required = false)
+    private double wd;
+
+    @ApiModelProperty(value = "坐标", name ="zb",required = false)
+    private long zb;
+
+    @ApiModelProperty(value = "坐标hash值", name ="zbhash",required = false)
+    private String zbhash;
+
+    @ApiModelProperty(value = "预警地址-行政区划代码", name ="yjDzXzqh",required = false)
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "预警地址", name ="yjDz",required = false)
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警人员姓名", name ="yjRyxm",required = false)
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "相似度", name = "xsd")
+    private BigDecimal xsd;
+
+    @ApiModelProperty(value = "预警人员身份证号码（人员预警必填）", name ="yjRysfzh",required = false)
+    private String yjRysfzh;
+
+    @ApiModelProperty(value = "预警车辆车牌号;车辆预警必填", name ="yjClcph",required = false)
+    private String yjClcph;
+
+    @ApiModelProperty(value = "预警标签", name ="yjbq",required = false)
+    private String yjbq;
+
+    @ApiModelProperty(value = "是否发送指令", name ="sfFszl",required = false)
+    private String sfFszl;
+
+    @ApiModelProperty(value = "是否误报", name ="sfWb",required = false)
+    private String sfWb;
+
+    @ApiModelProperty(value = "预警图片", name ="yjTp",required = false)
+    private String yjTp;
+
+    @ApiModelProperty(value = "所属部门", name ="ssbm",required = false)
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码", name ="ssbmdm",required = false)
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局", name ="ssxgaj",required = false)
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码", name ="ssxgajdm",required = false)
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局", name ="sssgaj",required = false)
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码", name ="sssgajdm",required = false)
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "数据来源;1、PC，2、手机端", name ="xtSjly",required = false)
+    private String xtSjly;
+
+    @ApiModelProperty(value = "数据状态;0、停用，1、正常", name ="xtSjzt",required = false)
+    private String xtSjzt;
+
+    @ApiModelProperty(value = "删除标识;0、未删除，1、已删除", name ="xtScbz",required = false)
+    private String xtScbz;
+
+    @ApiModelProperty(value = "创建IP", name ="xtCjip",required = false)
+    private String xtCjip;
+
+    @ApiModelProperty(value = "创建时间", name ="xtCjsj",required = false)
+    private String xtCjsj;
+
+    @ApiModelProperty(value = "创建人ID", name ="xtCjrId",required = false)
+    private String xtCjrId;
+
+    @ApiModelProperty(value = "创建人名称", name ="xtCjr",required = false)
+    private String xtCjr;
+
+    @ApiModelProperty(value = "创建部门代码", name ="xtCjbmdm",required = false)
+    private String xtCjbmdm;
+
+    @ApiModelProperty(value = "创建部门名称", name ="xtCjbmmc",required = false)
+    private String xtCjbmmc;
+
+    @ApiModelProperty(value = "最后更新IP", name ="xtZhgxip",required = false)
+    private String xtZhgxip;
+
+    @ApiModelProperty(value = "最后更新时间", name ="xtZhgxsj",required = false)
+    private String xtZhgxsj;
+
+    @ApiModelProperty(value = "最后更新人ID", name ="xtZhgxrid",required = false)
+    private String xtZhgxrid;
+
+    @ApiModelProperty(value = "最后更新人名称", name ="xtZhgxr",required = false)
+    private String xtZhgxr;
+
+    @ApiModelProperty(value = "最后更新部门代码", name ="xtZhgxbmdm",required = false)
+    private String xtZhgxbmdm;
+
+    @ApiModelProperty(value = "最后更新部门名称", name ="xtZhgxbm",required = false)
+    private String xtZhgxbm;
+    
+    @ApiModelProperty(value = "备注", name ="bz",required = false)
+    private String bz;
+    @ApiModelProperty(value = "三方预警id", name ="sf_yjid",required = false)
+    private String sfYjid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxPageStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxPageStatisticsDto.java
new file mode 100644
index 0000000..5969591
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxPageStatisticsDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxStatisticsDto 对象", description="预警分页查询DTO")
+public class TbYjxxPageStatisticsDto extends BasePage implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "号牌号码")
+    private String hphm;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "预警级别")
+    private String yjjb;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyNyStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyNyStatisticsDto.java
new file mode 100644
index 0000000..e05ef3d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyNyStatisticsDto.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxRyNyStatisticsDto 对象", description="人员预警分页查询DTO")
+public class TbYjxxRyNyStatisticsDto extends BasePage implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "开始年月")
+    private String ksny;
+
+    @ApiModelProperty(value = "开始年月")
+    private String jsny;
+
+    @ApiModelProperty(value = "预警级别")
+    private String yjjb;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyPageStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyPageStatisticsDto.java
new file mode 100644
index 0000000..ac7d535
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyPageStatisticsDto.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxRyPageStatisticsDto 对象", description="人员预警分页查询DTO")
+public class TbYjxxRyPageStatisticsDto extends BasePage implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "身份证号")
+    private String rysfzh;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "预警级别")
+    private String yjjb;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "关键字")
+    private String kerword;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyStatisticsDto.java
new file mode 100644
index 0000000..ff67f30
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxRyStatisticsDto.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxRyStatisticsDto 对象", description="人员预警查询DTO")
+public class TbYjxxRyStatisticsDto extends BasePage implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsDto.java
new file mode 100644
index 0000000..9e18064
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsDto.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxStatisticsDto 对象", description="预警统计相关DTO")
+public class TbYjxxStatisticsDto implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsQueryDto.java
new file mode 100644
index 0000000..e38a82a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxStatisticsQueryDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxStatisticsQueryDto 对象", description="预警统计相关DTO")
+public class TbYjxxStatisticsQueryDto implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endDate;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYStatisticsDto.java
new file mode 100644
index 0000000..c0a9651
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYStatisticsDto.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxYStatisticsDto 对象", description="根据车牌号查询预警列表-月")
+public class TbYjxxYStatisticsDto implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "号牌号码")
+    private String hphm;
+
+    @ApiModelProperty(value = "开始时间")
+    private String ksny;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jsny;
+
+    @ApiModelProperty(value = "预警级别")
+    private String yjjb;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYyjStatisticsDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYyjStatisticsDto.java
new file mode 100644
index 0000000..ac2bf4f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbYjxxYyjStatisticsDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjxxYyjStatisticsDto 对象", description="预警年月统计相关DTO")
+public class TbYjxxYyjStatisticsDto implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "开始年月")
+    private String ksny;
+
+    @ApiModelProperty(value = "结束年月")
+    private String jsny;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxInsertDto.java
new file mode 100644
index 0000000..8072976
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxInsertDto.java
@@ -0,0 +1,106 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-01
+ * 指令新增或修改Dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxInsertDto 对象", description = "指令新增或修改Dto")
+public class TbZlxxInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令、08.事务指令、09.犯罪预测指令)")
+    private String zllx;
+
+    @ApiModelProperty(value = "人工指令类型：01-应急增援、02-巡逻、03-查找、04-盘查、05-抓捕、06-布防")
+    private String rgzlLx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工,07-人员管控，08-事务,09-犯罪预测）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "身份证号码,第三方指令新增必须")
+    private String sfzh;
+
+    @ApiModelProperty(value = "指令下发类型(1、指令下发 2 短信下发 3 警情指令下发 4 犯罪预测指令下发)")
+    private String zlxflx;
+
+    @ApiModelProperty(value = "指令人列表", notes = "指令人列表", required = true)
+    private List<TbZlxxZxrDtoInsertDto> zxrDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxPcryclInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxPcryclInsertDto.java
new file mode 100644
index 0000000..b96a704
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxPcryclInsertDto.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-10-18
+ * 指令添加人员车辆盘查信息表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbZlxxPcryclInsertDto 对象", description="指令添加人员车辆盘查信息表")
+public class TbZlxxPcryclInsertDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "盘查人员或车辆ID")
+    private String pcryclId;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "--D_BZ_PCLX（盘查类型）盘查类型（1-盘人;2-盘车）")
+    private String pclxdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeDto.java
new file mode 100644
index 0000000..2b1dbe2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeDto.java
@@ -0,0 +1,87 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-10-15
+ * 指令处置流程DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxZtChangeDto 对象", description = "指令处置流程DTO")
+public class TbZlxxZtChangeDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "指令接收对象类型--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-签收；02-到达现场，" +
+            "03-处置完成，04-完结，05-研判，06-再研判，07-反馈，08-转发")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令执行地点行政区划代码--D_BZ_XZQHDM")
+    private String zlzxddXzqhdm;
+
+    @ApiModelProperty(value = "指令执行地点")
+    private String zlzxdd;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zlzxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zlzxrId;
+
+    @ApiModelProperty(value = "指令执行人名称")
+    private String zlzxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zlzxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zlzxrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "是否手动点击到达现场,0-否1-是")
+    private String sfsddd;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "第三方处置必须--身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "转发指令人列表", notes = "转发指令人列表", required = true)
+    private List<TbZlxxZxrDtoInsertDto> zxrDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeRygkDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeRygkDto.java
new file mode 100644
index 0000000..be6cca2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZtChangeRygkDto.java
@@ -0,0 +1,72 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ * 指令处置流程DTO---人员管控
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxZtChangeRygkDto 对象", description = "指令处置流程DTO---人员管控")
+public class TbZlxxZtChangeRygkDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "指令接收对象类型--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（05-研判，06-再研判，07-反馈")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令执行地点行政区划代码--D_BZ_XZQHDM")
+    private String zlzxddXzqhdm;
+
+    @ApiModelProperty(value = "指令执行地点")
+    private String zlzxdd;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zlzxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zlzxrId;
+
+    @ApiModelProperty(value = "指令执行人名称")
+    private String zlzxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zlzxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zlzxrDh;
+
+    @ApiModelProperty(value = "附件ID,多附件用逗号拼接")
+    private String fjid;
+
+    @ApiModelProperty(value = "附件名称（多附件用逗号拼接，保持和附件id顺序一致）")
+    private String fjmc;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "研判意见 处置经过描述 ")
+    private String zxnr;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxjlInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxjlInsertDto.java
new file mode 100644
index 0000000..cb623b6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxjlInsertDto.java
@@ -0,0 +1,70 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-01
+ * 指令-执行记录表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbZlxxZxjlInsertDto 对象", description="指令-执行记录表添加对象")
+public class TbZlxxZxjlInsertDto implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "指令执行动作（00-接收指令，01-签收，02-到达现场，03-已处置，04-反馈，" +
+            "05-下发，06-转发，07-转发确认，08-转发退回，99-完结）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "执行内容")
+    private String zxnr;
+
+    @ApiModelProperty(value = "语音时长")
+    private Integer yysc;
+
+    @ApiModelProperty(value = "视频首帧图片")
+    private String sptpid;
+
+    @ApiModelProperty(value = "执行附件（图片）")
+    private String zxfj;
+
+    @ApiModelProperty(value = "指令执行地点行政区划代码--D_BZ_XZQHDM")
+    private String zlzxddXzqhdm;
+
+    @ApiModelProperty(value = "指令执行地点")
+    private String zlzxdd;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+
+    @ApiModelProperty(value = "身份证号--第三方指令必传")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxrDtoInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxrDtoInsertDto.java
new file mode 100644
index 0000000..dbcd6b0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZlxxZxrDtoInsertDto.java
@@ -0,0 +1,66 @@
+package com.mosty.base.model.dto.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-07
+ * 指令执行人添加或修改DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxZxrDtoInsertDto 对象", description = "指令执行人添加或修改DTO")
+public class TbZlxxZxrDtoInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "指令接收对象类型，如：01：人员，02：部门，03-巡组--D_BZ_ZLJSDX",
+            notes = "指令接收对象类型，如：01：人员，02：部门，03-巡组--D_BZ_ZLJSDX",required = true)
+    private String zxrLx;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zxrXzid;
+
+    @ApiModelProperty(value = "执行巡组名称")
+    private String zxrXzmc;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zxrId;
+
+    @ApiModelProperty(value = "指令执行人警力类型 01 民警  02 辅警")
+    private String zxrJllx;
+
+    @ApiModelProperty(value = "指令执行人姓名")
+    private String zxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zxrDh;
+
+    @ApiModelProperty(value = "所属部门Id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门名称")
+    private String ssbmmc;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/YjConvertZlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/YjConvertZlDto.java
new file mode 100644
index 0000000..849c9a4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/YjConvertZlDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-11-04
+ * 预警转指令DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "YjConvertZlDto 对象", description = "预警转指令DTO")
+public class YjConvertZlDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjid;
+
+    @ApiModelProperty(value = "接收人员、部门列表")
+    private List<TbZlxxZxrDtoInsertDto> zxrList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdMyZlSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdMyZlSearchDto.java
new file mode 100644
index 0000000..c10bcbe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdMyZlSearchDto.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.dto.yjzl.third;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-09-14
+ * 我的指令信息查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ThirdMyZlSearchDto 对象", description = "我的指令信息查询DTO")
+public class ThirdMyZlSearchDto extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）逗号拼接多个")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令)逗号拼接多个")
+    private String zllx;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "根据时间查询最新的指令列表")
+    private String time;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdTbZlxxInsertDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdTbZlxxInsertDto.java
new file mode 100644
index 0000000..016abe8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdTbZlxxInsertDto.java
@@ -0,0 +1,100 @@
+package com.mosty.base.model.dto.yjzl.third;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-12-14
+ * 第三方指令新增或修改Dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ThirdTbZlxxInsertDto 对象", description = "第三方指令新增或修改Dto")
+public class ThirdTbZlxxInsertDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令、08.事务指令)")
+    private String zllx;
+
+    @ApiModelProperty(value = "人工指令类型：01-应急增援、02-巡逻、03-查找、04-盘查、05-抓捕、06-布防")
+    private String rgzlLx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工,07-人员管控，08-事务）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String sfzh;
+
+    @ApiModelProperty(value = "指令人列表", notes = "指令人列表", required = true)
+    private List<TbZlxxZxrDtoInsertDto> zxrDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdZlInfoSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdZlInfoSearchDto.java
new file mode 100644
index 0000000..ed91f10
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/third/ThirdZlInfoSearchDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.dto.yjzl.third;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-09-14
+ * 指令信息详情查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ThirdZlInfoSearchDto 对象", description = "指令信息详情查询DTO")
+public class ThirdZlInfoSearchDto extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("指令ID")
+    private String zlid;
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/Cameras.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/Cameras.java
new file mode 100644
index 0000000..a41509f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/Cameras.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.dto.yszx;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class Cameras {
+    public String code;
+    public String msg;
+    public info data;
+
+    @Data
+    public static class info {
+        public Integer total;
+        public Integer pageSize;
+        public Integer pageNo;
+        public List<listInfo> list;
+
+    }
+
+    @Data
+    public static class listInfo {
+        public String cameraIndexCode;
+        public String name;
+        public String unitIndexCode;
+        public String gbIndexCode;
+        public String deviceIndexCode;
+        public String latitude;
+        public String longitude;
+        public String altitude;
+        public Integer pixel;
+        public Integer cameraType;
+        public String installPlace;
+        public String matrixCode;
+        public Integer chanNum;
+        public String viewshed;
+        public String capabilitySet;
+        public String intelligentSet;
+        public String recordLocation;
+        public String ptzController;
+        public String deviceResourceType;
+        public String channelType;
+        public Integer transType;
+        public Date updateTime;
+        public Date createTime;
+        public Integer status;
+        public String cameraTypeName;
+        public String capabilitySetName;
+        public String intelligentSetName;
+        public String recordLocationName;
+        public String ptzControllerName;
+        public String deviceResourceTypeName;
+        public String channelTypeName;
+        public String transTypeName;
+        public String treatyType;
+        public String treatyTypeName;
+        public String statusName;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDelDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDelDto.java
new file mode 100644
index 0000000..a60770c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDelDto.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 案件要素删除DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsAjDelDto对象", description = "案件要素删除DTO")
+public class TbYsAjDelDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID", required = true)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "案件类型  1-刑事案件，2-行政案件", required = true)
+    private String ajfl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDto.java
new file mode 100644
index 0000000..f2636dd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsAjDto.java
@@ -0,0 +1,87 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 案件要素DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsAjDto对象", description = "案件要素DTO")
+public class TbYsAjDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "案件类型  1-刑事案件，2-行政案件",required = true)
+    private String ajfl;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "发案日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date farq;
+
+    @ApiModelProperty(value = "发案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fasj;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "案件类别名称")
+    private String aymc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）发案地行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "发案地")
+    private String dzmc;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsDlDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsDlDTO.java
new file mode 100644
index 0000000..7f4f8d6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsDlDTO.java
@@ -0,0 +1,100 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("tb_ys_dl")
+@ApiModel(value = "要素-地理要素表")
+@Accessors(chain = true)
+public class TbYsDlDTO {
+
+    @ApiModelProperty(value = "唯一标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类", name = "ysdl")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类", name = "yszl")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类", name = "ysxl")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称", name = "ysmc")
+    private String ysmc;
+
+    @ApiModelProperty(value = "要素简称", name = "ysjc")
+    private String ysjc;
+
+    @ApiModelProperty(value = "要素位置行政区划代码", name = "yswzXzqh")
+    private String yswzXzqh;
+
+    @ApiModelProperty(value = "要素位置（行政区划名称+地址详址）", name = "yswzXz")
+    private String yswzXz;
+
+    @ApiModelProperty(value = "要素位置别称", name = "yswzBc")
+    private String yswzBc;
+
+    @ApiModelProperty(value = "地球经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "地图面，如：公安局、派出所、巡防区、快反点的面", name = "dtm")
+    private Polygon dtm;
+
+    @ApiModelProperty(value = "智能设备标识", name = "znsbbs")
+    private String znsbbs;
+
+    @ApiModelProperty(value = "来源表名", name = "lybm")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id", name = "lyid")
+    private String lyid;
+
+    @ApiModelProperty(value = "检索内容（存要素名称、简称、位置、别称）", name = "jsnr")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgAndGlbmDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgAndGlbmDto.java
new file mode 100644
index 0000000..8c3d115
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgAndGlbmDto.java
@@ -0,0 +1,86 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/11/03
+ * 公安机关要素和关联部门新增
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgAndGlbmDto 对象", description = "公安机关要素和关联部门新增")
+public class TbYsGajgAndGlbmDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String gajgjc;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）要素位置行政区划代码")
+    private String wzXzqh;
+
+    @ApiModelProperty(value = "位置（行政区划名称+地址详址）")
+    private String wzXz;
+
+    @ApiModelProperty(value = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "管辖区域，如：公安局、派出所、巡防区、快反点的面[x,y,x1,y1....]")
+    private List<BigDecimal> qy;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示2圈层")
+    private List<BigDecimal> qy1;
+
+    @ApiModelProperty(value = "如果是快反点  这里表示3圈层")
+    private List<BigDecimal> qy2;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "关联部门list")
+    private List<TbYsGajgGlbmDto> glbmDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgByJwdDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgByJwdDto.java
new file mode 100644
index 0000000..c3f3fbe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgByJwdDto.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.dto.yszx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/27
+ * 根据经纬度查询公安机关要素DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgDto对象", description = "根据经纬度查询公安机关要素DTO")
+public class TbYsGajgByJwdDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgDto.java
new file mode 100644
index 0000000..fd76252
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgDto.java
@@ -0,0 +1,88 @@
+package com.mosty.base.model.dto.yszx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 公安机关要素Dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgDto对象", description = "公安机关要素Dto")
+public class TbYsGajgDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String gajgjc;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）要素位置行政区划代码")
+    private String wzXzqh;
+
+    @ApiModelProperty(value = "位置（行政区划名称+地址详址）")
+    private String wzXz;
+
+    @ApiModelProperty(value = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "管辖区域，如：公安局、派出所、巡防区、快反点的面[x,y,x1,y1....]")
+    private List<BigDecimal> qy;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示2圈层")
+    private List<BigDecimal> qy1;
+
+    @ApiModelProperty(value = "如果是快反点  这里表示3圈层")
+    private List<BigDecimal> qy2;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "备注", name = "bz")
+    private String bz;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgGlbmDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgGlbmDto.java
new file mode 100644
index 0000000..c7bdc7e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsGajgGlbmDto.java
@@ -0,0 +1,41 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素-公安机关-关联部门要素表DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgGlbmDto 对象", description = "要素-公安机关-关联部门要素表DTO")
+public class TbYsGajgGlbmDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "备注 （现主要用于巡防区 判断特警）")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsRyDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsRyDto.java
new file mode 100644
index 0000000..2e07192
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsRyDto.java
@@ -0,0 +1,105 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员要素DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRy 对象", description = "要素-人员要素DTO")
+public class TbYsRyDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date csrq;
+
+    @ApiModelProperty(value = "--D_BZ_MZ（民族）民族")
+    private String mz;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）户籍地行政区划")
+    private String hjdXzqh;
+
+    @ApiModelProperty(value = "户籍地址")
+    private String hjdXz;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）居住地行政区划")
+    private String jzdXzqh;
+
+    @ApiModelProperty(value = "居住地址")
+    private String jzdXz;
+
+    @ApiModelProperty(value = "工作单位ID(实有单位id)")
+    private String gzdwid;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsSxtDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsSxtDto.java
new file mode 100644
index 0000000..69132c1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yszx/TbYsSxtDto.java
@@ -0,0 +1,114 @@
+package com.mosty.base.model.dto.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.awt.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 摄像头要素Dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsSxtDto对象", description = "摄像头要素Dto")
+public class TbYsSxtDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "监控点国标编号")
+    private String jkdbgbh;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "厂商名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "IP地址")
+    private String ipdz;
+
+    @ApiModelProperty(value = "IPV6地址")
+    private String ipv6dz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "-D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "地址名称")
+    private String dzmc;
+
+    @ApiModelProperty(value = "--D_BZ_GZSBLX（感知设备类型）感知设备类型代码（1 枪机 2 球机）")
+    private String sblxdm;
+
+    @ApiModelProperty(value = "--D_BZ_CJSJLX（采集数据类型）采集数据类型代码")
+    private String sjlxdm;
+
+    @ApiModelProperty(value = "--D_BZ_JSFX(监视方向)监视方向代码")
+    private String jsfxdm;
+
+    @ApiModelProperty(value = "监视区域说明")
+    private String jsqysm;
+
+    @ApiModelProperty(value = "--D_BZ_SXJWZLX(摄像机位置类型)摄像机位置类型代码")
+    private String sxjwzlxdm;
+
+    @ApiModelProperty(value = "--D_BZ_SXJYT(摄像机用途)摄像机用途代码")
+    private String sxjytdm;
+
+    @ApiModelProperty(value = "--D_BZ_SBZT(设备状态)设备状态 （0:离线、 1:在线）")
+    private String sbzt;
+
+    @ApiModelProperty(value = "--D_BZ_SBLX（设备类型）设备类型（01-视频监控  02-交通卡 03-人卡 04-车卡 05-电子围栏 06-WIFI探针 07-IMSI、IMEI）")
+    private String sblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStMhJgxxbGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStMhJgxxbGx.java
new file mode 100644
index 0000000..2f9b31b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStMhJgxxbGx.java
@@ -0,0 +1,724 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_share_st_mh_jgxxb_gx")
+@ApiModel(value = "民航-购票基本信息")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwShareStMhJgxxbGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * PSR_ARST
+     */
+    private String psrArst;
+
+    /**
+     * PSR_EDIO
+     */
+    private String psrEdio;
+
+    /**
+     * SEG_DEPTNO
+     */
+    private String segDeptno;
+
+    /**
+     * PDT_DEPT
+     */
+    private String pdtDept;
+
+    /**
+     * TELNO
+     */
+    private String telno;
+
+    /**
+     * PSR_WCBD
+     */
+    private String psrWcbd;
+
+    /**
+     * FLT_AIRLCODE
+     */
+    private String fltAirlcode;
+
+    /**
+     * PSR_SPE
+     */
+    private String psrSpe;
+
+    /**
+     * PSR_HBPRBG
+     */
+    private String psrHbprbg;
+
+    /**
+     * STA_DEPTTM
+     */
+    private String staDepttm;
+
+    /**
+     * PSR_SEATNBR
+     */
+    private String psrSeatnbr;
+
+    /**
+     * WL
+     */
+    private String wl;
+
+    /**
+     * PSR_DEP
+     */
+    private String psrDep;
+
+    /**
+     * PSR_WTYPE
+     */
+    private String psrWtype;
+
+    /**
+     * FILENAME
+     */
+    private String filename;
+
+    /**
+     * DEP_ACTION_FLAG
+     */
+    private String depActionFlag;
+
+    /**
+     * PSR_CRS
+     */
+    private String psrCrs;
+
+    /**
+     * PSR_OUTBOUND
+     */
+    private String psrOutbound;
+
+    /**
+     * PSR_RST
+     */
+    private String psrRst;
+
+    /**
+     * SBY
+     */
+    private String sby;
+
+    /**
+     * CKI_CHG
+     */
+    private String ckiChg;
+
+    /**
+     * PSR_OSR
+     */
+    private String psrOsr;
+
+    /**
+     * PDT_BIRTHDAY
+     */
+    private String pdtBirthday;
+
+    /**
+     * PSR_SPML
+     */
+    private String psrSpml;
+
+    /**
+     * PSR_MSG
+     */
+    private String psrMsg;
+
+    /**
+     * PSR_EDI_DEST
+     */
+    private String psrEdiDest;
+
+    /**
+     * SPECIAL_BG
+     */
+    private String specialBg;
+
+    /**
+     * PSR_CKITIME
+     */
+    private String psrCkitime;
+
+    /**
+     * PROVINCE
+     */
+    private String province;
+
+    /**
+     * PSR_NOTIFY
+     */
+    private String psrNotify;
+
+    /**
+     * PSR_AVIH
+     */
+    private String psrAvih;
+
+    /**
+     * PSR_RFFI
+     */
+    private String psrRffi;
+
+    /**
+     * PSR_EDI_DEPT
+     */
+    private String psrEdiDept;
+
+    /**
+     * DELETE_FLAG
+     */
+    private String deleteFlag;
+
+    /**
+     * SVC
+     */
+    private String svc;
+
+    /**
+     * PSR_INAD
+     */
+    private String psrInad;
+
+    /**
+     * PSR_WCBW
+     */
+    private String psrWcbw;
+
+    /**
+     * PSR_OFL
+     */
+    private String psrOfl;
+
+    /**
+     * PSR_NAME
+     */
+    private String psrName;
+
+    /**
+     * CITY
+     */
+    private String city;
+
+    /**
+     * PSR_STDRS
+     */
+    private String psrStdrs;
+
+    /**
+     * PSR_UNATTACH
+     */
+    private String psrUnattach;
+
+    /**
+     * DELETE_FLT_ID
+     */
+    private String deleteFltId;
+
+    /**
+     * CMT
+     */
+    private String cmt;
+
+    /**
+     * PSR_TSI
+     */
+    private String psrTsi;
+
+    /**
+     * PDT_MIDNAME
+     */
+    private String pdtMidname;
+
+    /**
+     * PAXCLASS
+     */
+    private String paxclass;
+
+    /**
+     * PSR_PIL
+     */
+    private String psrPil;
+
+    /**
+     * PSR_BAGS
+     */
+    private String psrBags;
+
+    /**
+     * PSR_XT
+     */
+    private String psrXt;
+
+    /**
+     * PSR_DEAF
+     */
+    private String psrDeaf;
+
+    /**
+     * PSR_WCMD
+     */
+    private String psrWcmd;
+
+    /**
+     * PSR_XASR
+     */
+    private String psrXasr;
+
+    /**
+     * PSR_BLND
+     */
+    private String psrBlnd;
+
+    /**
+     * CERT_TYPE
+     */
+    private String certType;
+
+    /**
+     * ICAO_CODE
+     */
+    private String icaoCode;
+
+    /**
+     * PSR_HOSTNBR
+     */
+    private String psrHostnbr;
+
+    /**
+     * PSR_TYPE
+     */
+    private String psrType;
+
+    /**
+     * DATASOURCE
+     */
+    private String datasource;
+
+    /**
+     * ADRESS
+     */
+    private String adress;
+
+    /**
+     * POSTCODE
+     */
+    private String postcode;
+
+    /**
+     * PDT_DEST
+     */
+    private String pdtDest;
+
+    /**
+     * PSR_FFFR
+     */
+    private String psrFffr;
+
+    /**
+     * FLT_DATE
+     */
+    private String fltDate;
+
+    /**
+     * PSR_OFFICE
+     */
+    private String psrOffice;
+
+    /**
+     * EDI
+     */
+    private String edi;
+
+    /**
+     * SEG_FLTID
+     */
+    private String segFltid;
+
+    /**
+     * PSR_BAGGAGE
+     */
+    private String psrBaggage;
+
+    /**
+     * FLT_NUMBER
+     */
+    private String fltNumber;
+
+    /**
+     * PDT_COUNTRY
+     */
+    private String pdtCountry;
+
+    /**
+     * SEG_DEST_CODE
+     */
+    private String segDestCode;
+
+    /**
+     * STA_ARVETM
+     */
+    private String staArvetm;
+
+    /**
+     * PSR_INFNAME
+     */
+    private String psrInfname;
+
+    /**
+     * PSR_GROUP
+     */
+    private String psrGroup;
+
+    /**
+     * PSR_RTFI
+     */
+    private String psrRtfi;
+
+    /**
+     * PSR_EDII
+     */
+    private String psrEdii;
+
+    /**
+     * PSR_BRDNO
+     */
+    private String psrBrdno;
+
+    /**
+     * PSR_AGENT
+     */
+    private String psrAgent;
+
+    /**
+     * PSR_CHNNAME
+     */
+    private String psrChnname;
+
+    /**
+     * STCR
+     */
+    private String stcr;
+
+    /**
+     * PSR_CKIPID
+     */
+    private String psrCkipid;
+
+    /**
+     * JMP
+     */
+    private String jmp;
+
+    /**
+     * PSR_BSCT
+     */
+    private String psrBsct;
+
+    /**
+     * PNR_REF
+     */
+    private String pnrRef;
+
+    /**
+     * SEG_DESTNO
+     */
+    private String segDestno;
+
+    /**
+     * PSR_PCTC
+     */
+    private String psrPctc;
+
+    /**
+     * PSR_INBOUND
+     */
+    private String psrInbound;
+
+    /**
+     * SN_ID
+     */
+    private String snId;
+
+    /**
+     * PSR_INF
+     */
+    private String psrInf;
+
+    /**
+     * PSR_SEG_SEATNBR
+     */
+    private String psrSegSeatnbr;
+
+    /**
+     * PSR_PSPT
+     */
+    private String psrPspt;
+
+    /**
+     * PSR_RUSH
+     */
+    private String psrRush;
+
+    /**
+     * PSR_EDI_WARN
+     */
+    private String psrEdiWarn;
+
+    /**
+     * PSR_REA
+     */
+    private String psrRea;
+
+    /**
+     * PDT_FIRSTNAME
+     */
+    private String pdtFirstname;
+
+    /**
+     * PDT_ISSUEDATE
+     */
+    private String pdtIssuedate;
+
+    /**
+     * PDT_ISSUE_COUNTRY
+     */
+    private String pdtIssueCountry;
+
+    /**
+     * PSR_PSM
+     */
+    private String psrPsm;
+
+    /**
+     * PSR_FOID_NONET
+     */
+    private String psrFoidNonet;
+
+    /**
+     * CT_DT
+     */
+    private String ctDt;
+
+    /**
+     * PDT_LASTNAME
+     */
+    private String pdtLastname;
+
+    /**
+     * PSR_STATUS
+     */
+    private String psrStatus;
+
+    /**
+     * PSR_XABP
+     */
+    private String psrXabp;
+
+    /**
+     * PSR_XRES
+     */
+    private String psrXres;
+
+    /**
+     * FFQNO
+     */
+    private String ffqno;
+
+    /**
+     * URES
+     */
+    private String ures;
+
+    /**
+     * PSR_EXSTSEAT
+     */
+    private String psrExstseat;
+
+    /**
+     * PSR_ARRIVE_TIME
+     */
+    private String psrArriveTime;
+
+    /**
+     * PSR_SBYNO
+     */
+    private String psrSbyno;
+
+    /**
+     * SEG_DEPT_CODE
+     */
+    private String segDeptCode;
+
+    /**
+     * PSR_GENDER
+     */
+    private String psrGender;
+
+    /**
+     * PSR_VUDGRADE
+     */
+    private String psrVudgrade;
+
+    /**
+     * PSR_WCOB
+     */
+    private String psrWcob;
+
+    /**
+     * PSR_ASOBOI
+     */
+    private String psrAsoboi;
+
+    /**
+     * PSR_SEA
+     */
+    private String psrSea;
+
+    /**
+     * PSR_CITYCANC
+     */
+    private String psrCitycanc;
+
+    /**
+     * PSR_BAGWGT
+     */
+    private String psrBagwgt;
+
+    /**
+     * VIP
+     */
+    private String vip;
+
+    /**
+     * DEP_ACTION_TIME
+     */
+    private String depActionTime;
+
+    /**
+     * FLT_SUFFIX
+     */
+    private String fltSuffix;
+
+    /**
+     * PSR_ACC
+     */
+    private String psrAcc;
+
+    /**
+     * PSR_CTCA
+     */
+    private String psrCtca;
+
+    /**
+     * PSR_UDGRADE
+     */
+    private String psrUdgrade;
+
+    /**
+     * SPECIAL_SEAT
+     */
+    private String specialSeat;
+
+    /**
+     * PSR_EMIG
+     */
+    private String psrEmig;
+
+    /**
+     * PSR_AEC
+     */
+    private String psrAec;
+
+    /**
+     * PDT_BIR_ADRESS
+     */
+    private String pdtBirAdress;
+
+    /**
+     * BORDER_TYPE
+     */
+    private String borderType;
+
+    /**
+     * PSR_SPML_ID
+     */
+    private String psrSpmlId;
+
+    /**
+     * PSR_ICS
+     */
+    private String psrIcs;
+
+    /**
+     * PSR_EFMN
+     */
+    private String psrEfmn;
+
+    /**
+     * PSR_SIP
+     */
+    private String psrSip;
+
+    /**
+     * PSR_PETC
+     */
+    private String psrPetc;
+
+    /**
+     * CERT_NO
+     */
+    private String certNo;
+
+    /**
+     * PDT_EXPRIRYDATE
+     */
+    private String pdtExprirydate;
+
+    /**
+     * PSR_CLASS
+     */
+    private String psrClass;
+
+    /**
+     * ETL_OPER_TYPE
+     */
+    private String etlOperType;
+
+    /**
+     * ETL_TIMESTAMP
+     */
+    private String etlTimestamp;
+
+    /**
+     * ETL_UPDATE_TIME
+     */
+    private String etlUpdateTime;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStShzyJtKyqcgpxxGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStShzyJtKyqcgpxxGx.java
new file mode 100644
index 0000000..4454e6c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStShzyJtKyqcgpxxGx.java
@@ -0,0 +1,269 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_share_st_shzy_jt_kyqcgpxx_gx")
+@ApiModel(value = "交通-购票基本信息")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwShareStShzyJtKyqcgpxxGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * GPRXM
+     */
+    private String gprxm;
+
+    /**
+     * GPRHM
+     */
+    private String gprhm;
+
+    /**
+     * GPRSJH
+     */
+    private String gprsjh;
+
+    /**
+     * XM
+     */
+    private String xm;
+
+    /**
+     * SFYXH
+     */
+    private String sfyxh;
+
+    /**
+     * ZJHM
+     */
+    private String zjhm;
+
+    /**
+     * ZJLXDM
+     */
+    private String zjlxdm;
+
+    /**
+     * ZJLX
+     */
+    private String zjlx;
+
+    /**
+     * XBDM
+     */
+    private String xbdm;
+
+    /**
+     * XB
+     */
+    private String xb;
+
+    /**
+     * MZDM
+     */
+    private String mzdm;
+
+    /**
+     * MZ
+     */
+    private String mz;
+
+    /**
+     * LXDZ
+     */
+    private String lxdz;
+
+    /**
+     * GPFS
+     */
+    private String gpfs;
+
+    /**
+     * SPY
+     */
+    private String spy;
+
+    /**
+     * GPZT
+     */
+    private String gpzt;
+
+    /**
+     * GPDZ
+     */
+    private String gpdz;
+
+    /**
+     * GPSJ
+     */
+    private String gpsj;
+
+    /**
+     * CCCZ
+     */
+    private String cccz;
+
+    /**
+     * FCSJ
+     */
+    private String fcsj;
+
+    /**
+     * CCCZBH
+     */
+    private String ccczbh;
+
+    /**
+     * CCCZJD
+     */
+    private String ccczjd;
+
+    /**
+     * CCCZWD
+     */
+    private String ccczwd;
+
+    /**
+     * DDCZ
+     */
+    private String ddcz;
+
+    /**
+     * DDCZBH
+     */
+    private String ddczbh;
+
+    /**
+     * DDCZJD
+     */
+    private String ddczjd;
+
+    /**
+     * DDCZWD
+     */
+    private String ddczwd;
+
+    /**
+     * CCCZCOD
+     */
+    private String ccczcod;
+
+    /**
+     * CCCZXZ
+     */
+    private String ccczxz;
+
+    /**
+     * DDCZCOD
+     */
+    private String ddczcod;
+
+    /**
+     * DDCZXZ
+     */
+    private String ddczxz;
+
+    /**
+     * CFD
+     */
+    private String cfd;
+
+    /**
+     * DDD
+     */
+    private String ddd;
+
+    /**
+     * CC
+     */
+    private String cc;
+
+    /**
+     * CPH
+     */
+    private String cph;
+
+    /**
+     * ZWH
+     */
+    private String zwh;
+
+    /**
+     * BZ
+     */
+    private String bz;
+
+    /**
+     * INFOSOURCEADDR
+     */
+    private String infosourceaddr;
+
+    /**
+     * INFOSOURCEDESC
+     */
+    private String infosourcedesc;
+
+    /**
+     * DEP_ACTION_FLAG
+     */
+    private String depActionFlag;
+
+    /**
+     * DEP_ACTION_TIME
+     */
+    private String depActionTime;
+
+    /**
+     * DEP_FIRSTENTER_TIME
+     */
+    private String depFirstenterTime;
+
+    /**
+     * UUID
+     */
+    private String uuid;
+
+    /**
+     * GPH
+     */
+    private String gph;
+
+    /**
+     * PH
+     */
+    private String ph;
+
+    /**
+     * ETL_OPER_TYPE
+     */
+    private String etlOperType;
+
+    /**
+     * ETL_TIMESTAMP
+     */
+    private String etlTimestamp;
+
+    /**
+     * ETL_UPDATE_TIME
+     */
+    private String etlUpdateTime;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStTlLksmdpGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStTlLksmdpGx.java
new file mode 100644
index 0000000..689e8b1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwShareStTlLksmdpGx.java
@@ -0,0 +1,114 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_share_st_tl_lksmdp_gx")
+@ApiModel(value = "铁路--购票基本信息")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwShareStTlLksmdpGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * DZ
+     */
+    private String dz;
+
+    /**
+     * DEP_ACTION_TIME
+     */
+    private String depActionTime;
+
+    /**
+     * DEP_ACTION_FLAG
+     */
+    private String depActionFlag;
+
+    /**
+     * DPCK
+     */
+    private String dpck;
+
+    /**
+     * RKSJC
+     */
+    private String rksjc;
+
+    /**
+     * SPSJ
+     */
+    private String spsj;
+
+    /**
+     * ZWH
+     */
+    private String zwh;
+
+    /**
+     * CXH
+     */
+    private String cxh;
+
+    /**
+     * FZ
+     */
+    private String fz;
+
+    /**
+     * CCR_XM
+     */
+    private String ccrXm;
+
+    /**
+     * CCR_ZJHM
+     */
+    private String ccrZjhm;
+
+    /**
+     * CCRQ
+     */
+    private String ccrq;
+
+    /**
+     * CC
+     */
+    private String cc;
+
+    /**
+     * ETL_OPER_TYPE
+     */
+    private String etlOperType;
+
+    /**
+     * ETL_TIMESTAMP
+     */
+    private String etlTimestamp;
+
+    /**
+     * ETL_UPDATE_TIME
+     */
+    private String etlUpdateTime;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwCyryGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwCyryGx.java
new file mode 100644
index 0000000..f9ac2ac
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwCyryGx.java
@@ -0,0 +1,255 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_sydw_cyry_gx")
+@ApiModel(value = "实有单位-从业人员表")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwSydwCyryGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("人员id")
+    private String ryid;
+
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    @ApiModelProperty("性别")
+    private String xb;
+
+    @ApiModelProperty("民族代码")
+    private String mzdm;
+
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    @ApiModelProperty("联系电话")
+    private String lxdh;
+
+    @ApiModelProperty("证件号码")
+    private String zjhm;
+
+    @ApiModelProperty("证件类型代码")
+    private String zjlxdm;
+
+    @ApiModelProperty("籍贯代码（行政区划代码）")
+    private String jgdm;
+
+    @ApiModelProperty("工作开始日期（无值）")
+    private String bgzksrq;
+
+    @ApiModelProperty("工作结束日期（无值）")
+    private String bgzjsrq;
+
+    @ApiModelProperty("国家地区代码")
+    private String gjdm;
+
+    @ApiModelProperty("所属地区代码")
+    private String ssdq;
+
+    @ApiModelProperty("单位id")
+    private String dwid;
+
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+
+    @ApiModelProperty("单位分类")
+    private String dwfl;
+
+    @ApiModelProperty("单位地址名称")
+    private String dwdzmc;
+
+    @ApiModelProperty("地址-单位地址代码")
+    private String dzDwdzdm;
+
+    @ApiModelProperty("地址-单位地址行政区划代码")
+    private String dzDwdzssxdm;
+
+    @ApiModelProperty("地址-单位地址详址")
+    private String dzDwdzxz;
+
+    @ApiModelProperty("地址-单位地址门楼牌代码")
+    private String dzDwdzmlpdm;
+
+    @ApiModelProperty("地址-单位地址门楼牌详址")
+    private String dzDwdzmlpxz;
+
+    @ApiModelProperty("居住地-地址id")
+    private String jzdDzid;
+
+    @ApiModelProperty("居住地-经度")
+    private String jzdZbx;
+
+    @ApiModelProperty("居住地-纬度")
+    private String jzdZby;
+
+    @ApiModelProperty("居住地-地址详址")
+    private String jzdDzxz;
+
+    @ApiModelProperty("居住地-门楼牌代码")
+    private String jzdMlpdm;
+
+    @ApiModelProperty("居住地-门楼牌详址")
+    private String jzdMlpxz;
+
+    @ApiModelProperty("居住地-行政区划代码")
+    private String jzdXzqhdm;
+
+    @ApiModelProperty("系统-注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty("系统-注销标注（0-正常 1-注销）")
+    private String xtZxbz;
+
+    @ApiModelProperty("备注")
+    private String bz;
+
+    @ApiModelProperty("cjrlbdm")
+    private String cjrlbdm;
+
+    @ApiModelProperty("cjyjdm")
+    private String cjyjdm;
+
+    @ApiModelProperty("bmjb")
+    private String bmjb;
+
+    @ApiModelProperty("scbj")
+    private String scbj;
+
+    @ApiModelProperty("xzbj")
+    private String xzbj;
+
+    @ApiModelProperty("xt_cjsj")
+    private String xtCjsj;
+
+    @ApiModelProperty("xt_lrsj")
+    private String xtLrsj;
+
+    @ApiModelProperty("xt_lrrxm")
+    private String xtLrrxm;
+
+    @ApiModelProperty("zwlbdm")
+    private String zwlbdm;
+
+    @ApiModelProperty("xt_lrrid")
+    private String xtLrrid;
+
+    @ApiModelProperty("sjly")
+    private String sjly;
+
+    @ApiModelProperty("rybh")
+    private String rybh;
+
+    @ApiModelProperty("xt_lrrbm")
+    private String xtLrrbm;
+
+    @ApiModelProperty("szgw")
+    private String szgw;
+
+    @ApiModelProperty("xt_lrrbmid")
+    private String xtLrrbmid;
+
+    @ApiModelProperty("szbm")
+    private String szbm;
+
+    @ApiModelProperty("xt_zhxgsj")
+    private String xtZhxgsj;
+
+    @ApiModelProperty("xt_zhxgrxm")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty("xt_zhxgrid")
+    private String xtZhxgrid;
+
+    @ApiModelProperty("xt_zhxgrbm")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty("xt_zhxgrbmid")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty("xt_zhxgip")
+    private String xtZhxgip;
+
+    @ApiModelProperty("bgrq")
+    private String bgrq;
+
+    @ApiModelProperty("zxyybz")
+    private String zxyybz;
+
+    @ApiModelProperty("kyjx")
+    private String kyjx;
+
+    @ApiModelProperty("kyxw")
+    private String kyxw;
+
+    @ApiModelProperty("ldrkid")
+    private String ldrkid;
+
+    @ApiModelProperty("sfclsyrk")
+    private String sfclsyrk;
+
+    @ApiModelProperty("old_id")
+    private String oldId;
+
+    @ApiModelProperty("old_dwid")
+    private String oldDwid;
+
+    @ApiModelProperty("old_ryid")
+    private String oldRyid;
+
+    @ApiModelProperty("old_jzd_dzid")
+    private String oldJzdDzid;
+
+    @ApiModelProperty("cygj_qrbz")
+    private String cygjQrbz;
+
+    @ApiModelProperty("xt_timestamp")
+    private String xtTimestamp;
+
+    @ApiModelProperty("sfylxdh")
+    private String sfylxdh;
+
+    @ApiModelProperty("dep_action_flag")
+    private String depActionFlag;
+
+    @ApiModelProperty("dep_action_time")
+    private String depActionTime;
+
+    @ApiModelProperty("dep_firstenter_time")
+    private String depFirstenterTime;
+
+    @ApiModelProperty("rowkey")
+    private String rowkey;
+
+    @ApiModelProperty("etl_oper_type")
+    private String etlOperType;
+
+    @ApiModelProperty("etl_timestamp")
+    private String etlTimestamp;
+
+    @ApiModelProperty("etl_update_time")
+    private String etlUpdateTime;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwJbxxGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwJbxxGx.java
new file mode 100644
index 0000000..6f7fe34
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSydwJbxxGx.java
@@ -0,0 +1,307 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_sydw_jbxx_gx")
+@ApiModel(value = "实有单位基本信息表")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwSydwJbxxGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("")
+    private String xxsbzh;
+
+    @ApiModelProperty("注册地址")
+    private String zcdz;
+
+    @ApiModelProperty("管理等级 1.A 2.B 3.C")
+    private String gldj;
+
+    @ApiModelProperty("")
+    private String xtLrrid;
+
+    @ApiModelProperty("")
+    private String xtLrip;
+
+    @ApiModelProperty("")
+    private String sfytp;
+
+    @ApiModelProperty("")
+    private String depFirstenterTime;
+
+    @ApiModelProperty("")
+    private String sjdwid;
+
+    @ApiModelProperty("单位联系电话")
+    private String dwlxdh;
+
+    @ApiModelProperty("")
+    private String lxrzjhm;
+
+    @ApiModelProperty("")
+    private String lxrlxdh;
+
+    @ApiModelProperty("")
+    private String sjdm;
+
+    @ApiModelProperty("")
+    private String dwscjp;
+
+    @ApiModelProperty("")
+    private String lxrxm;
+
+    @ApiModelProperty("")
+    private String dwxz;
+
+    @ApiModelProperty("")
+    private String dzDwdzmlpdm;
+
+    @ApiModelProperty("注册日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private String zcrq;
+
+    @ApiModelProperty("")
+    private String zcdzbh;
+
+    @ApiModelProperty("")
+    private String jkgs;
+
+    @ApiModelProperty("")
+    private String xtZhxgsj;
+
+    @ApiModelProperty("")
+    private String lxrgjdm;
+
+    @ApiModelProperty("")
+    private String bmjb;
+
+    @ApiModelProperty("单位地址详址")
+    private String dzDwdzxz;
+
+    @ApiModelProperty("")
+    private String xtTimestamp;
+
+    @ApiModelProperty("")
+    private String bz;
+
+    @ApiModelProperty("")
+    private String whksrq;
+
+    @ApiModelProperty("单位分类")
+    private String dwfl;
+
+    @ApiModelProperty("")
+    private String lxrzjlx;
+
+    @ApiModelProperty("")
+    private String sxzw;
+
+    @ApiModelProperty("")
+    private String dwdzs;
+
+    @ApiModelProperty("")
+    private String zzjgdm;
+
+    @ApiModelProperty("")
+    private String dwmcjp;
+
+    @ApiModelProperty("")
+    private String xtZxyy;
+
+    @ApiModelProperty("")
+    private String xtLrrxm;
+
+    @ApiModelProperty("")
+    private String whjzrq;
+
+    @ApiModelProperty("")
+    private String depActionFlag;
+
+    @ApiModelProperty("")
+    private String dwdzsc;
+
+    @ApiModelProperty("")
+    private String sfbd;
+
+    @ApiModelProperty("")
+    private String cqzq;
+
+    @ApiModelProperty("")
+    private String dzDwdzdm;
+
+    @ApiModelProperty("ID")
+    private String id;
+
+    @ApiModelProperty("所属责任区代码")
+    private String sszrqdm;
+
+    @ApiModelProperty("")
+    private String zpfmid;
+
+    @ApiModelProperty("")
+    private String zxyybz;
+
+    @ApiModelProperty("从业人数")
+    private String cyrs;
+
+    @ApiModelProperty("")
+    private String wljdsbdzh;
+
+    @ApiModelProperty("单位名称")
+    private String dwmc;
+
+    @ApiModelProperty("")
+    private String swdjh;
+
+    @ApiModelProperty("注销标志")
+    private String xtZxbz;
+
+    @ApiModelProperty("")
+    private String xxsbmm;
+
+    @ApiModelProperty("")
+    private String yyzzh;
+
+    @ApiModelProperty("")
+    private String jyfw;
+
+    @ApiModelProperty("")
+    private String sjdw;
+
+    @ApiModelProperty("")
+    private String zby;
+
+    @ApiModelProperty("")
+    private String zczb;
+
+    @ApiModelProperty("")
+    private String sjlybs;
+
+    @ApiModelProperty("")
+    private String xtCjsj;
+
+    @ApiModelProperty("")
+    private String zafzr;
+
+    @ApiModelProperty("")
+    private String yxqz;
+
+    @ApiModelProperty("")
+    private String xtLrrbm;
+
+    @ApiModelProperty("")
+    private String dwbh;
+
+    @ApiModelProperty("")
+    private String xtLrsj;
+
+    @ApiModelProperty("")
+    private String ssfjdm;
+
+    @ApiModelProperty("")
+    private String scbj;
+
+    @ApiModelProperty("")
+    private String dzDwdzssxdm;
+
+    @ApiModelProperty("")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty("")
+    private String xtLrrbmid;
+
+    @ApiModelProperty("")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty("")
+    private String lxrgmsfhm;
+
+    @ApiModelProperty("")
+    private String fzrq;
+
+    @ApiModelProperty("")
+    private String sjmc;
+
+    @ApiModelProperty("")
+    private String ssdq;
+
+    @ApiModelProperty("")
+    private String sfyspjk;
+
+    @ApiModelProperty("")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty("")
+    private String xtZhxgrid;
+
+    @ApiModelProperty("")
+    private String xtZhxgip;
+
+    @ApiModelProperty("")
+    private String sspcsdm;
+
+    @ApiModelProperty("")
+    private String whzt;
+
+    @ApiModelProperty("")
+    private String dzDwdzmlpxz;
+
+    @ApiModelProperty("")
+    private String oldId;
+
+    @ApiModelProperty("")
+    private String dwsc;
+
+    @ApiModelProperty("")
+    private String xzbj;
+
+    @ApiModelProperty("")
+    private String depActionTime;
+
+    @ApiModelProperty("")
+    private String oldSjdwid;
+
+    @ApiModelProperty("")
+    private String wljdsbdmm;
+
+    @ApiModelProperty("")
+    private String bars;
+
+    @ApiModelProperty("")
+    private String zbx;
+
+    @ApiModelProperty("")
+    private String etlOperType;
+
+    @ApiModelProperty("")
+    private String etlTimestamp;
+
+    @ApiModelProperty("")
+    private String etlUpdateTime;
+
+    @ApiModelProperty("责任区名称")
+    @TableField(exist = false)
+    private String sszrqmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSyrkJzgjGx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSyrkJzgjGx.java
new file mode 100644
index 0000000..d885986
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/afjcsj/VwSyrkJzgjGx.java
@@ -0,0 +1,363 @@
+package com.mosty.base.model.entity.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("af_jcsj.vw_syrk_jzgj_gx")
+@ApiModel(value = "实有人口-居住轨迹")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class VwSyrkJzgjGx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * JZD_ZRQDM
+     */
+    private String jzdZrqdm;
+
+    /**
+     * JZD_FWID
+     */
+    private String jzdFwid;
+
+    /**
+     * JZD_FWLBDM
+     */
+    private String jzdFwlbdm;
+
+    /**
+     * JZD_DZID
+     */
+    private String jzdDzid;
+
+    /**
+     * JZD_DZXZ
+     */
+    private String jzdDzxz;
+
+    /**
+     * JZD_ZBX
+     */
+    private String jzdZbx;
+
+    /**
+     * JZD_ZBY
+     */
+    private String jzdZby;
+
+    /**
+     * GLDW
+     */
+    private String gldw;
+
+    /**
+     * GLRID
+     */
+    private String glrid;
+
+    /**
+     * SECURITYGRADE
+     */
+    private String securitygrade;
+
+    /**
+     * BZ
+     */
+    private String bz;
+
+    /**
+     * XT_CJSJ
+     */
+    private String xtCjsj;
+
+    /**
+     * XT_LRSJ
+     */
+    private String xtLrsj;
+
+    /**
+     * XT_LRRXM
+     */
+    private String xtLrrxm;
+
+    /**
+     * XT_LRRID
+     */
+    private String xtLrrid;
+
+    /**
+     * XT_LRRBM
+     */
+    private String xtLrrbm;
+
+    /**
+     * XT_LRRBMID
+     */
+    private String xtLrrbmid;
+
+    /**
+     * XT_LRIP
+     */
+    private String xtLrip;
+
+    /**
+     * XT_ZHXGSJ
+     */
+    private String xtZhxgsj;
+
+    /**
+     * XT_ZHXGRXM
+     */
+    private String xtZhxgrxm;
+
+    /**
+     * XT_ZHXGRID
+     */
+    private String xtZhxgrid;
+
+    /**
+     * XT_ZHXGRBM
+     */
+    private String xtZhxgrbm;
+
+    /**
+     * XT_ZHXGRBMID
+     */
+    private String xtZhxgrbmid;
+
+    /**
+     * XT_ZHXGIP
+     */
+    private String xtZhxgip;
+
+    /**
+     * XT_ZXBZ
+     */
+    private String xtZxbz;
+
+    /**
+     * XT_ZXYY
+     */
+    private String xtZxyy;
+
+    /**
+     * XT_ZXYYBZ
+     */
+    private String xtZxyybz;
+
+    /**
+     * OLD_ID
+     */
+    private String oldId;
+
+    /**
+     * OLD_RYID
+     */
+    private String oldRyid;
+
+    /**
+     * OLD_JZD_DZID
+     */
+    private String oldJzdDzid;
+
+    /**
+     * SSDQ
+     */
+    private String ssdq;
+
+    /**
+     * OLD_JZD_FWID
+     */
+    private String oldJzdFwid;
+
+    /**
+     * CYZJDM
+     */
+    private String cyzjdm;
+
+    /**
+     * ZJHM
+     */
+    private String zjhm;
+
+    /**
+     * XM
+     */
+    private String xm;
+
+    /**
+     * XBDM
+     */
+    private String xbdm;
+
+    /**
+     * CSRQ
+     */
+    private String csrq;
+
+    /**
+     * CSRQEND
+     */
+    private String csrqend;
+
+    /**
+     * CYM
+     */
+    private String cym;
+
+    /**
+     * HJD_DZXZ
+     */
+    private String hjdDzxz;
+
+    /**
+     * MZDM
+     */
+    private String mzdm;
+
+    /**
+     * LXDH
+     */
+    private String lxdh;
+
+    /**
+     * RYQKDM
+     */
+    private String ryqkdm;
+
+    /**
+     * SFYLXFS
+     */
+    private String sfylxfs;
+
+    /**
+     * RYTC
+     */
+    private String rytc;
+
+    /**
+     * XT_TIMESTAMP
+     */
+    private String xtTimestamp;
+
+    /**
+     * RYSX
+     */
+    private String rysx;
+
+    /**
+     * DEP_ACTION_FLAG
+     */
+    private String depActionFlag;
+
+    /**
+     * DEP_ACTION_TIME
+     */
+    private String depActionTime;
+
+    /**
+     * DEP_FIRSTENTER_TIME
+     */
+    private String depFirstenterTime;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * RYID
+     */
+    private String ryid;
+
+    /**
+     * SYRKID
+     */
+    private String syrkid;
+
+    /**
+     * SYRKYWLXDM
+     */
+    private String syrkywlxdm;
+
+    /**
+     * RZSJ
+     */
+    private String rzsj;
+
+    /**
+     * LKSJ
+     */
+    private String lksj;
+
+    /**
+     * GLDJDM
+     */
+    private String gldjdm;
+
+    /**
+     * CJRLBDM
+     */
+    private String cjrlbdm;
+
+    /**
+     * CJYJDM
+     */
+    private String cjyjdm;
+
+    /**
+     * JZD_XZQHDM
+     */
+    private String jzdXzqhdm;
+
+    /**
+     * JZD_SJDM
+     */
+    private String jzdSjdm;
+
+    /**
+     * JZD_FXJDM
+     */
+    private String jzdFxjdm;
+
+    /**
+     * JZD_PCSDM
+     */
+    private String jzdPcsdm;
+
+    /**
+     * JZD_SQDM
+     */
+    private String jzdSqdm;
+
+    /**
+     * ETL_OPER_TYPE
+     */
+    private String etlOperType;
+
+    /**
+     * ETL_TIMESTAMP
+     */
+    private String etlTimestamp;
+
+    /**
+     * ETL_UPDATE_TIME
+     */
+    private String etlUpdateTime;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbOrg.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbOrg.java
new file mode 100644
index 0000000..e450b8c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbOrg.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.entity.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 布控车辆
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_org")
+@ApiModel(value = "class对象", description = "组织机构表")
+public class TbOrg implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "机构代码")
+    @TableId(value = "org_id", type = IdType.ASSIGN_ID)
+    private String orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "机构简称")
+    private String orgJc;
+
+    @ApiModelProperty(value = "机构登记")
+    private String orgLevel;
+
+    @ApiModelProperty(value = "上级代码")
+    private String parentId;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbUser.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbUser.java
new file mode 100644
index 0000000..40a8079
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/base/TbUser.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 布控车辆
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_user")
+@ApiModel(value = "TbUser对象", description = "组织机构人员表")
+public class TbUser implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "身份证")
+    @TableId(value = "sfzh", type = IdType.ASSIGN_ID)
+    private String sfzh;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "职务")
+    private String zw;
+
+    @ApiModelProperty(value = "电话号码")
+    private String dhhm;
+
+    @ApiModelProperty(value = "短号")
+    private String dh;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkCl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkCl.java
new file mode 100644
index 0000000..0726b13
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkCl.java
@@ -0,0 +1,158 @@
+package com.mosty.base.model.entity.bkzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 布控车辆
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_bk_cl")
+@ApiModel(value = "TbBkCl对象", description = "布控车辆表")
+public class TbBkCl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "号牌类型代码")
+    private String cplxdm;
+
+    @ApiModelProperty(value = "车牌号码")
+    private String cphm;
+
+    @ApiModelProperty(value = "车牌号颜色")
+    private String cphys;
+
+    @ApiModelProperty(value = "车辆颜色")
+    private String clys;
+
+    @ApiModelProperty(value = "车辆所有人身份证号")
+    private String clsyrsfzh;
+
+    @ApiModelProperty(value = "车辆所有人姓名")
+    private String clsyrxm;
+
+    @ApiModelProperty(value = "车架号")
+    private String clcjh;
+
+    @ApiModelProperty(value = "车辆类型代码")
+    private String cllxdm;
+
+    @ApiModelProperty(value = "布控级别 10-红，20-橙色，30-黄色，40-蓝色")
+    private String bkjb;
+
+    @ApiModelProperty(value = "布控天数")
+    private Integer bkts;
+
+    @ApiModelProperty(value = "布控开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkkssj;
+
+    @ApiModelProperty(value = "布控结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bkjssj;
+
+    @ApiModelProperty(value = "布控范围 1.全国  2.全省 3.全市 4.全县，5-本部门")
+    private String bkfw;
+
+    @ApiModelProperty(value = "布控事由")
+    private String bksy;
+
+    @ApiModelProperty(value = "处置方式 1.控制 2.管控 3.经营 4.关注 5.掌握轨迹")
+    private String czfs;
+
+    @ApiModelProperty(value = "处置说明")
+    private String czsm;
+
+    @ApiModelProperty(value = "审核人员ID")
+    private String shryid;
+
+    @ApiModelProperty(value = "审核人员")
+    private String shryxm;
+
+    @ApiModelProperty(value = "审核部门")
+    private String shrybm;
+
+    @ApiModelProperty(value = "审核部门代码")
+    private String shrybmdm;
+
+    @ApiModelProperty(value = "审核状态  0.审核中  1.审核通过  2.审核不通过")
+    private String shzt;
+
+    @ApiModelProperty(value = "审核说明（不通过原因）")
+    private String shsm;
+
+    @ApiModelProperty(value = "布控状态  0.审核中  1.布控中  2.结束布控 3.撤销）")
+    private String bkzt;
+
+    @ApiModelProperty(value = "是否全市布控成功 0.否 1.是")
+    private String sfqsbkcg;
+
+    @ApiModelProperty(value = "全市布控成功时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsbkcgsj;
+
+    @ApiModelProperty(value = "是否全省布控成功 0.否 1.是")
+    private String sfqsebkcg;
+
+    @ApiModelProperty(value = "全省布控成功时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsebkcgsj;
+
+    @ApiModelProperty(value = "是否短信通知 0.否  1.是")
+    private String sfdxtz;
+
+    @ApiModelProperty(value = "申请人ID")
+    private String sqrid;
+
+    @ApiModelProperty(value = "申请人身份证号")
+    private String sqrsfzh;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrxm;
+
+    @ApiModelProperty(value = "申请人联系方式")
+    private String sqrlxfs;
+
+    @ApiModelProperty(value = "申请人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "申请人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "申请人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "申请人所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "申请人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "申请人所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "布控id")
+    private String bkid;
+
+    @ApiModelProperty(value = "布控库id")
+    private String bkkid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkDb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkDb.java
new file mode 100644
index 0000000..f764a4e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkDb.java
@@ -0,0 +1,87 @@
+package com.mosty.base.model.entity.bkzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_bk_db")
+@ApiModel(value = "TbBkDb对象", description = "布控数据库信息记录")
+public class TbBkDb extends BaseEntity implements Serializable,Cloneable {
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private  Long  id;
+
+    @ApiModelProperty(value = "布控库名")
+    private String  dbName;
+
+    @ApiModelProperty(value = "布控数据库ID标识")
+    private String  dbId;
+
+    @ApiModelProperty(value = "布控数据库厂商类型")
+    private String  dbCs;
+
+    @ApiModelProperty(value = "库描述信息")
+    private String description;
+
+    @ApiModelProperty(value = "布控类型： 5100：静态人脸 5200：抓拍人脸 ，5300：布控人脸 ，7300：布控车牌")
+    private String bkType;
+
+    @ApiModelProperty(value = "数据库类型：All所有(包含人车)，Personnel 人员，Car 车辆")
+    private String dbType;
+
+    @ApiModelProperty(value = "所属市公安局ID")
+    private String  sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String  sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String  sssgajdm;
+
+    @ApiModelProperty(value = "布控开始时间")
+    private Date    bkKassj;
+
+    @ApiModelProperty(value="布控结束时间")
+    private Date    bkJssj;
+
+    @ApiModelProperty(value = "数据库布控状态: 0 未布控，1 已布控")
+    private  String  dbBkzt;
+
+    @ApiModelProperty(value = "联系人电话")
+    private  String  lxrdhhm;
+
+    @ApiModelProperty(value = "布控库的警告信息接收手机号")
+    private  String jgxxjssjhm;
+
+    @ApiModelProperty(value = "布控ID")
+    @TableField(exist = false)
+    private  String dispositionID;
+
+    @ApiModelProperty(value = "是否隐藏数据库，即前端不展示的数据信息")
+    private  Boolean  hidden;
+
+    @ApiModelProperty(value = "市/区代码")
+    private  String   areaCode;
+
+    @ApiModelProperty(value = "市/区名字")
+    private  String   areaName;
+
+    @TableField(exist = false)
+    private  Object  account;
+
+    @ApiModelProperty(value="布控任务ID")
+    private  String  bkTaskId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkRy.java
new file mode 100644
index 0000000..e10f395
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/bkzx/TbBkRy.java
@@ -0,0 +1,179 @@
+package com.mosty.base.model.entity.bkzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 布控人员
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_bk_ry")
+@ApiModel(value = "TbBkRy对象", description = "布控人员表")
+public class TbBkRy extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "布控类型 1.身份证布控 2.手机布控 3.护照布控 4.人脸布控")
+    private String bklx;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "手机号码")
+    private String sjhm;
+
+    @ApiModelProperty(value = "IMEI码")
+    private String imei;
+
+    @ApiModelProperty(value = "IMSI码")
+    private String imsi;
+
+    @ApiModelProperty(value = "护照号码")
+    private String hzhm;
+
+    @ApiModelProperty(value = "人像图片地址")
+    private String rxtpdz;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(value = "民族代码")
+    private String mzdm;
+
+    @ApiModelProperty(value = "文化程度代码")
+    private String whcddm;
+
+    @ApiModelProperty(value = "联系方式")
+    private String lxfs;
+
+    @ApiModelProperty(value = "居住地行政区划")
+    private String jzdxzqh;
+
+    @ApiModelProperty(value = "居住地址")
+    private String jzdz;
+
+    @ApiModelProperty(value = "人员类型代码（如吸贩毒）")
+    private String rylxdm;
+
+    @ApiModelProperty(value = "布控级别 10-红，20-橙色，30-黄色，40-蓝色")
+    private String bkjb;
+
+    @ApiModelProperty(value = "布控天数")
+    private Integer bkts;
+
+    @ApiModelProperty(value = "布控开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bkkssj;
+
+    @ApiModelProperty(value = "布控结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bkjssj;
+
+    @ApiModelProperty(value = "布控范围 1.全国  2.全省 3.全市 4.全县，5-本部门")
+    private String bkfw;
+
+    @ApiModelProperty(value = "布控事由")
+    private String bksy;
+
+    @ApiModelProperty(value = "处置方式 1.控制 2.管控 3.经营 4.关注 5.掌握轨迹")
+    private String czfs;
+
+    @ApiModelProperty(value = "处置说明")
+    private String czsm;
+
+    @ApiModelProperty(value = "审核人员ID")
+    private String shryid;
+
+    @ApiModelProperty(value = "审核人员")
+    private String shryxm;
+
+    @ApiModelProperty(value = "审核部门")
+    private String shrybm;
+
+    @ApiModelProperty(value = "审核部门代码")
+    private String shrybmdm;
+
+    @ApiModelProperty(value = "审核状态  0.审核中  1.审核通过  2.审核不通过")
+    private String shzt;
+
+    @ApiModelProperty(value = "审核说明（不通过原因）")
+    private String shsm;
+
+    @ApiModelProperty(value = "布控状态  0.审核中  1.布控中  2.结束布控 3.撤销）")
+    private String bkzt;
+
+    @ApiModelProperty(value = "是否全市布控成功 0.否 1.是")
+    private String sfqsbkcg;
+
+    @ApiModelProperty(value = "全市布控成功时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsbkcgsj;
+
+    @ApiModelProperty(value = "是否全省布控成功 0.否 1.是")
+    private String sfqsebkcg;
+
+    @ApiModelProperty(value = "全省布控成功时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsebkcgsj;
+
+    @ApiModelProperty(value = "是否短信通知 0.否  1.是")
+    private String sfdxtz;
+
+    @ApiModelProperty(value = "申请人ID")
+    private String sqrid;
+
+    @ApiModelProperty(value = "申请人身份证号")
+    private String sqrsfzh;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrxm;
+
+    @ApiModelProperty(value = "申请人联系方式")
+    private String sqrlxfs;
+
+    @ApiModelProperty(value = "申请人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "申请人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "申请人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "申请人所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "申请人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "申请人所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "布控库id")
+    private String bkkid;
+
+    @ApiModelProperty(value = "布控id")
+    private String bkid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpccl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpccl.java
new file mode 100644
index 0000000..d200a3d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpccl.java
@@ -0,0 +1,214 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查车辆对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpccl")
+@ApiModel(value = "TbHcBpccl 对象", description = "被盘查车辆对象")
+public class TbHcBpccl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "号牌种类代码", name = "hpzl")
+    private String hpzl;
+
+    @ApiModelProperty(value = "号牌号码", name = "hphm")
+    private String hphm;
+
+    @ApiModelProperty(value = "车辆识别代号（车架号）", name = "clsbdh")
+    private String clsbdh;
+
+    @ApiModelProperty(value = "机动车所有人身份证号", name = "jdcsyrsfzh")
+    private String jdcsyrsfzh;
+
+    @ApiModelProperty(value = "机动车所有人", name = "jdcsyr")
+    private String jdcsyr;
+
+    @ApiModelProperty(value = "盘查日期", name = "pcrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date pcrq;
+
+    @ApiModelProperty(value = "盘查时间", name = "pcsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date pcsj;
+
+    @ApiModelProperty(value = "盘查输入类型（1=自动识别;2=手工输入号牌;3=手工输入车辆识别号）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "车辆标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签详细数据", name = "bqxxsj")
+    private String bqxxsj;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "盘查民警id", name = "pcmjId")
+    private String pcmjId;
+
+    @ApiModelProperty(value = "盘查民警帐号", name = "pcmjSfzh")
+    private String pcmjSfzh;
+
+    @ApiModelProperty(value = "盘查民警姓名", name = "pcmjXm")
+    private String pcmjXm;
+
+    @ApiModelProperty(value = "盘查民警警号", name = "pcmjJh")
+    private String pcmjJh;
+
+    @ApiModelProperty(value = "卡口id", name = "kkId")
+    private String kkId;
+
+    @ApiModelProperty(value = "卡口所属单位代码", name = "kkSsdwdm")
+    private String kkSsdwdm;
+
+    @ApiModelProperty(value = "卡口所属单位名称", name = "kkSsdwmc")
+    private String kkSsdwmc;
+
+    @ApiModelProperty(value = "卡口所属分市县代码", name = "kkSsfsxdm")
+    private String kkSsfsxdm;
+
+    @ApiModelProperty(value = "卡口所属分市县名称", name = "kkSsfsxmc")
+    private String kkSsfsxmc;
+
+    @ApiModelProperty(value = "卡口所属地市州代码", name = "kkSsdszdm")
+    private String kkSsdszdm;
+
+    @ApiModelProperty(value = "卡口所属地市州名称", name = "kkSsdszmc")
+    private String kkSsdszmc;
+
+    @ApiModelProperty(value = "卡口类型（1=公安检查站;2=自设卡点）", name = "kkLx")
+    private String kkLx;
+
+    @ApiModelProperty(value = "卡口名称", name = "kkMc")
+    private String kkMc;
+
+    @ApiModelProperty(value = "卡口行政区划", name = "kkXzqh")
+    private String kkXzqh;
+
+    @ApiModelProperty(value = "卡口市州名称", name = "kkSzmc")
+    private String kkSzmc;
+
+    @ApiModelProperty(value = "卡口环川，环蓉", name = "kkHchrlx")
+    private String kkHchrlx;
+
+    @ApiModelProperty(value = "卡口是否涉藏", name = "kkSfsz")
+    private String kkSfsz;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "所属单位当月盘查次数", name = "ssdwdycs")
+    private Integer ssdwdycs;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "相似度感知源，眼镜扫描，输入类型为7,8照片", name = "xsd")
+    private String xsd;
+
+    @ApiModelProperty(value = "是否相符（0-否，1-是）", name = "sfxf")
+    private String sfxf;
+
+    @ApiModelProperty(value = "预警指令ID", name = "yjzlid")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-车牌设备自动盘查，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclBq.java
new file mode 100644
index 0000000..ceabd16
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclBq.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查车辆标签对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpccl_bq")
+@ApiModel(value = "TbHcBpcclBq 对象", description = "被盘查车辆标签对象")
+public class TbHcBpcclBq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "标签编号", name = "bqbh")
+    private String bqbh;
+
+    @ApiModelProperty(value = "标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "所属部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclWp.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclWp.java
new file mode 100644
index 0000000..6a147f6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcclWp.java
@@ -0,0 +1,69 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查车辆物品对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpccl_wp")
+@ApiModel(value = "TbHcBpcclWp 对象", description = "被盘查车辆物品对象")
+public class TbHcBpcclWp extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "--D_BZ_WPLX（物品类型）物品类型", name = "wplx")
+    private String wplx;
+
+    @ApiModelProperty(value = "物品数量", name = "wpsl")
+    private String wpsl;
+
+    @ApiModelProperty(value = "物品描述", name = "wpms")
+    private String wpms;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcry.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcry.java
new file mode 100644
index 0000000..2509c6b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcry.java
@@ -0,0 +1,229 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查人员对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpcry")
+@ApiModel(value = "TbHcBpcry 对象", description = "被盘查人员对象")
+public class TbHcBpcry extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "姓名", name = "xm")
+    private String xm;
+
+    @ApiModelProperty(value = "性别", name = "xbdm")
+    private String xbdm;
+
+    @ApiModelProperty(value = "出生日期", name = "csrq")
+    private String csrq;
+
+    @ApiModelProperty(value = "民族", name = "mzdm")
+    private String mzdm;
+
+    @ApiModelProperty(value = "文化程度", name = "whcddm")
+    private String whcddm;
+
+    @ApiModelProperty(value = "籍贯", name = "jgdm")
+    private String jgdm;
+
+    @ApiModelProperty(value = "住址详址", name = "zzxz")
+    private String zzxz;
+
+    @ApiModelProperty(value = "现居住地址", name = "xjzdz")
+    private String xjzdz;
+
+    @ApiModelProperty(value = "联系电话", name = "lxdh")
+    private String lxdh;
+
+    @ApiModelProperty(value = "盘查日期", name = "pcrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date pcrq;
+
+    @ApiModelProperty(value = "盘查时间", name = "pcsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date pcsj;
+
+    @ApiModelProperty(value = "盘查输入类型（1=刷身份证;2=手工输入身份证;3=电话号码查询;4=综合查询）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "盘查车辆ID", name = "pcclId")
+    private String pcclId;
+
+    @ApiModelProperty(value = "人员标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签详细数据", name = "bqxxsj")
+    private String bqxxsj;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "盘查民警ID", name = "pcmjId")
+    private String pcmjId;
+
+    @ApiModelProperty(value = "盘查民警帐号", name = "pcmjSfzh")
+    private String pcmjSfzh;
+
+    @ApiModelProperty(value = "盘查民警姓名", name = "pcmjXm")
+    private String pcmjXm;
+
+    @ApiModelProperty(value = "盘查民警警号", name = "pcmjJh")
+    private String pcmjJh;
+
+    @ApiModelProperty(value = "卡口id", name = "kkId")
+    private String kkId;
+
+    @ApiModelProperty(value = "卡口所属单位代码", name = "kkSsdwdm")
+    private String kkSsdwdm;
+
+    @ApiModelProperty(value = "卡口所属单位名称", name = "kkSsdwmc")
+    private String kkSsdwmc;
+
+    @ApiModelProperty(value = "卡口所属分市县代码", name = "kkSsfsxdm")
+    private String kkSsfsxdm;
+
+    @ApiModelProperty(value = "卡口所属分市县名称", name = "kkSsfsxmc")
+    private String kkSsfsxmc;
+
+    @ApiModelProperty(value = "卡口所属地市州代码", name = "kkSsdszdm")
+    private String kkSsdszdm;
+
+    @ApiModelProperty(value = "卡口所属地市州名称", name = "kkSsdszmc")
+    private String kkSsdszmc;
+
+    @ApiModelProperty(value = "卡口类型（1=公安检查站;2=自设卡点）", name = "kkLx")
+    private String kkLx;
+
+    @ApiModelProperty(value = "卡口名称", name = "kkMc")
+    private String kkMc;
+
+    @ApiModelProperty(value = "卡口行政区划", name = "kkXzqh")
+    private String kkXzqh;
+
+    @ApiModelProperty(value = "卡口市州名称", name = "kkSzmc")
+    private String kkSzmc;
+
+    @ApiModelProperty(value = "卡口环川，环蓉", name = "kkHchrlx")
+    private String kkHchrlx;
+
+    @ApiModelProperty(value = "卡口是否涉藏", name = "kkSfsz")
+    private String kkSfsz;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "所属单位当月盘查次数", name = "ssdwdycs")
+    private Integer ssdwdycs;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "相似度感知源，眼镜扫描，输入类型为7,8照片", name = "xsd")
+    private String xsd;
+
+    @ApiModelProperty(value = "是否相符（0-否，1-是）", name = "sfxf")
+    private String sfxf;
+
+    @ApiModelProperty(value = "预警指令ID", name = "yjzlid")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-人脸设备自动，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryBq.java
new file mode 100644
index 0000000..33c489e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryBq.java
@@ -0,0 +1,64 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查人员标签对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpcry_bq")
+@ApiModel(value = "TbHcBpcryBq 对象", description = "被盘查人员标签对象")
+public class TbHcBpcryBq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "标签编号", name = "bqbh")
+    private String bqbh;
+
+    @ApiModelProperty(value = "在逃人员逃跑日期", name = "tprq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String tprq;
+
+    @ApiModelProperty(value = "标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "所属部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryTzbq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryTzbq.java
new file mode 100644
index 0000000..768a927
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryTzbq.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ * 被盘查人员特征标签
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpcry_tzbq")
+@ApiModel(value = "TbHcBpcryTzbq 对象", description = "被盘查人员特征标签")
+public class TbHcBpcryTzbq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "人员身份证号", name = "rysfzh")
+    private String rysfzh;
+
+    @ApiModelProperty(value = "人员姓名", name = "ryxm")
+    private String ryxm;
+
+    @ApiModelProperty(value = "特征标签类别", name = "tzbqlb")
+    private String tzbqlb;
+
+    @ApiModelProperty(value = "特征标签代码", name = "tzbqdm")
+    private String tzbqdm;
+
+    @ApiModelProperty(value = "特征标签名称", name = "tzbqmc")
+    private String tzbqmc;
+
+    @ApiModelProperty(value = "在逃人员逃跑日期", name = "tprq")
+    private String tprq;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryWp.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryWp.java
new file mode 100644
index 0000000..ca16d3f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcBpcryWp.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查人员物品对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_bpcry_wp")
+@ApiModel(value = "TbHcBpcryWp 对象", description = "被盘查人员物品对象")
+public class TbHcBpcryWp extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "--D_BZ_WPLX（物品类型）物品类型", name = "wplx")
+    private String wplx;
+
+    @ApiModelProperty(value = "物品数量", name = "wpsl")
+    private String wpsl;
+
+    @ApiModelProperty(value = "物品描述", name = "wpms")
+    private String wpms;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcDtgz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcDtgz.java
new file mode 100644
index 0000000..83cb18b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcDtgz.java
@@ -0,0 +1,158 @@
+package com.mosty.base.model.entity.hczx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_dtgz")
+@ApiModel(value = "TbHcDtgz 对象", description = "动态感知预警对象")
+public class TbHcDtgz extends BaseEntity implements Serializable, Cloneable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("主键id")
+    private String id;
+
+    /**
+     * 设备编码
+     */
+    @ApiModelProperty("设备编码")
+    private String sbbm;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty("设备名称")
+    private String sbmc;
+
+    /**
+     * 关联库名
+     */
+    @ApiModelProperty("关联库名")
+    private String glkm;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    /**
+     * 性别
+     */
+    @ApiModelProperty("性别")
+    private String xb;
+
+    /**
+     * 性别代码
+     */
+    @ApiModelProperty("性别代码")
+    private String xbDm;
+
+    /**
+     * 出生日期
+     */
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty("民族")
+    private String mz;
+
+    /**
+     * 民族代码
+     */
+    @ApiModelProperty("民族代码")
+    private String mzDm;
+
+    /**
+     * 籍贯
+     */
+    @ApiModelProperty("籍贯")
+    private String jg;
+
+    /**
+     * 籍贯代码
+     */
+    @ApiModelProperty("籍贯代码")
+    private String jgDm;
+
+    /**
+     * 住址详址
+     */
+    @ApiModelProperty("住址详址")
+    private String zzxz;
+
+    /**
+     * 关联库id
+     */
+    @ApiModelProperty("关联库id")
+    private String glkid;
+
+    /**
+     * 标签
+     */
+    @ApiModelProperty("标签")
+    private String bq;
+
+    /**
+     * 标签名称
+     */
+    @ApiModelProperty("标签名称")
+    private String bqmc;
+
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("标签详细数据")
+    private String bqxxsj;
+
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("小图")
+    private String tp1;
+
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("大图")
+    private String tp2;
+    /**
+     * 标签详细数据
+     */
+    @ApiModelProperty("相似度")
+    private String xsd;
+
+    @ApiModelProperty("设备来源 1、海康 2、海能达")
+    private String sbly;
+
+    @ApiModelProperty("接入类型")
+    private String jrlx;
+
+    @ApiModelProperty("关联id")
+    private String glid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcRytzbq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcRytzbq.java
new file mode 100644
index 0000000..03904b8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcRytzbq.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 人员特征标签对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_rytzbq")
+@ApiModel(value = "TbHcRytzbq 对象", description = "人员特征标签对象")
+public class TbHcRytzbq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "特征标签类别(D_BZ_RYTZBQLB)", name = "tzbqlb")
+    private String tzbqlb;
+
+    @ApiModelProperty(value = "特征标签代码", name = "tzbqdm")
+    private String tzbqdm;
+
+    @ApiModelProperty(value = "特征标签名称", name = "tzbqmc")
+    private String tzbqmc;
+
+    @ApiModelProperty(value = "tzsx", name = "tzsx")
+    private String tzsx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcSydj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcSydj.java
new file mode 100644
index 0000000..7b7051c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcSydj.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.entity.hczx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.mosty.base.model.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_sydj")
+@ApiModel(value = "TbHcSydj 对象", description = "涉疫登记对象")
+public class TbHcSydj extends BaseEntity implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查id", name = "pcid")
+    private String pcid;
+
+    @ApiModelProperty(value = "人员姓名", name = "ryxm")
+    private String ryxm;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "天府健康码状态", name = "jkmzt")
+    private String jkmzt;
+
+    @ApiModelProperty(value = "疫苗接种情况", name = "ymjzqk")
+    private String ymjzqk;
+
+    @ApiModelProperty(value = "通讯行程卡是否带*", name = "txxck")
+    private String txxck;
+
+    @ApiModelProperty(value = "14天内到达或途径城市", name = "ddhtjcs")
+    private String ddhtjcs;
+
+    @ApiModelProperty(value = "来自哪里", name = "lz")
+    private String lz;
+
+    @ApiModelProperty(value = "去往哪里", name = "qw")
+    private String qw;
+
+    @ApiModelProperty(value = "图片Id", name = "tpid")
+    private String tpid;
+
+    @ApiModelProperty(value = "添加时间", name = "tjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcTp.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcTp.java
new file mode 100644
index 0000000..bf7a887
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/hczx/TbHcTp.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.entity.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ * 盘查图片对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_tp")
+@ApiModel(value = "TbHcTp 对象", description = "盘查图片对象")
+public class TbHcTp extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "来源表名", name = "lybm")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源ID", name = "lyid")
+    private String lyid;
+
+    @ApiModelProperty(value = "附件ID", name = "fjid")
+    private String fjid;
+
+    @ApiModelProperty(value = "附件ID", name = "orderno")
+    private Integer orderno;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglAbfc.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglAbfc.java
new file mode 100644
index 0000000..dfc3377
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglAbfc.java
@@ -0,0 +1,64 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/27
+ * 安保风采实体表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_abfc")
+@ApiModel(value = "TbJcglAbfc 对象", description = "安保风采实体表")
+public class TbJcglAbfc extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "标题")
+    private String bt;
+
+    @ApiModelProperty(value = "摘要")
+    private String zy;
+
+    @ApiModelProperty(value = "内容")
+    private String nr;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "添加时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date tjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBq.java
new file mode 100644
index 0000000..7eedc3a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBq.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防警力标签表（技能/经验）;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防警力标签表（技能/经验）", description = "")
+@TableName("tb_jcgl_bq")
+public class TbJcglBq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID",name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+    /**
+     * 标签类型;EXP：经验标签，SKL：技能标签
+     */
+    @ApiModelProperty(value = "标签类型：EXP：经验标签，SKL：技能标签",name = "bqlx")
+    private String bqlx;
+    /**
+     * 标签中文名称
+     */
+    @ApiModelProperty(value = "标签中文名称",name = "bqmc")
+    private String bqmc;
+
+    /**
+     * 标签中文名称
+     */
+    @ApiModelProperty(value = "标签编号",name = "bqbh")
+    private String bqbh;
+
+
+    /**
+     * 标签拼音码;后端自动生成
+     */
+    @ApiModelProperty(value = "标签拼音码",name = "bqpym")
+    private String bqpym;
+    /**
+     * 标签图标url
+     */
+    @ApiModelProperty(value = "标签图标url",name = "bqtb")
+    private String bqtb;
+    /**
+     * 计算模型ID
+     */
+    @ApiModelProperty(value = "计算模型ID", name = "mxId")
+    private String mxId;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxd.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxd.java
new file mode 100644
index 0000000..b85e452
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxd.java
@@ -0,0 +1,105 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 巡防区域必巡点
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_bxd")
+@ApiModel(value="TbJcglBxd对象", description="巡防区域必巡点")
+public class TbJcglBxd extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防区域必巡点表标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private String id;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "必巡点名称")
+    private String bxdMc;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLX（必巡点类型）必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String bxdLx;
+
+    @ApiModelProperty(value = "有效期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date yxq;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "必巡点详细地址")
+    private String xxdz;
+
+    @ApiModelProperty(value = "必巡点图片;逗号分隔")
+    private String bxdTp;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLYDM（必巡点来源代码）01 经验必巡点 02 登记必巡点")
+    private String bxdlydm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxx.java
new file mode 100644
index 0000000..5c9c6b1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglBxx.java
@@ -0,0 +1,82 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防区域-必巡线
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_bxx")
+@ApiModel(value="TbJcglBxx对象", description="巡防区域-必巡线")
+public class TbJcglBxx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防区域必巡点表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "必巡线名称")
+    private String bxxMc;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLX（必巡点类型）必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String bxxLx;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "必巡线坐标")
+    private LineString zb;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglDsf.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglDsf.java
new file mode 100644
index 0000000..7d3c855
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglDsf.java
@@ -0,0 +1,58 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ * 第三方表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_dsf")
+@ApiModel(value = "TbJcglDsf 对象", description = "第三方表")
+public class TbJcglDsf extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "系统名称")
+    private String xtmc;
+
+    @ApiModelProperty(value = "服务类型 01.任务服务 02.位置服务 03.")
+    private String fwlx;
+
+    @ApiModelProperty(value = "责任人姓名")
+    private String zrrxm;
+
+    @ApiModelProperty(value = "责任人联系电话")
+    private String zrrlxdh;
+
+    @ApiModelProperty(value = "请求的唯一码")
+    private String code;
+
+    @ApiModelProperty(value = "过期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date gqsj;
+
+    @ApiModelProperty(value = "状态 01.审核中 02.使用中 03.审核不通过 04.已停用 05.已过期")
+    private String zt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJwz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJwz.java
new file mode 100644
index 0000000..2bf4d0d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJwz.java
@@ -0,0 +1,107 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author aklcoming
+ * @Date 2022-06-08 10:44:29
+ */
+@Data
+@TableName(value = "tb_jcgl_jwz")
+@ApiModel(value = "警务站")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TbJcglJwz extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "警务站标识ID", name = "jwzId")
+    private String jwzId;
+
+    @ApiModelProperty(value = "警务站类型", name = "jwzLx")
+    private String jwzLx;
+
+    @ApiModelProperty(value = "警务站名称", name = "jwzMc")
+    private String jwzMc;
+
+    @ApiModelProperty(value = "警务站地址", name = "jwzDz")
+    private String jwzDz;
+
+    @ApiModelProperty(value = "行政区划代码", name = "xzqhdm")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "经度", name = "jw")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标哈希", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "修建时间", name = "xjSj")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date xjSj;
+
+    @ApiModelProperty(value = "警务站图片;警务站图片集合，逗号分隔", name = "jwzTp")
+    private String jwzTp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "负责人姓名", name = "fzrXm")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号", name = "fzrSfzh")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "当前页")
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数")
+    @TableField(exist = false)
+    private Integer pageSize;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJyqx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJyqx.java
new file mode 100644
index 0000000..3b0afb8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJyqx.java
@@ -0,0 +1,147 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_jyqx")
+public class TbJcglJyqx extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "器械名称")
+    @Excel(name = "器械名称",sort = 3,headerColor= IndexedColors.RED1 )
+    private String qxMc;
+
+    @ApiModelProperty(value = "器械编号")
+    @Excel(name = "器械编号",sort = 4,headerColor= IndexedColors.RED1 )
+    private String qxbh;
+
+    @ApiModelProperty(value = "设备分类")
+    @Excel(name = "设备分类",sort = 5,headerColor= IndexedColors.RED1,dictType = "D_BZ_JYQXFL")
+    private String scode;
+
+    @ApiModelProperty(value = "设备类型名称")
+    private String sname;
+
+    @ApiModelProperty(value = "数量")
+    @Excel(name = "数量",sort = 6,headerColor= IndexedColors.RED1 ,cellType = Excel.ColumnType.NUMERIC)
+    private long sl;
+
+    @ApiModelProperty(value = "计量单位;如：支、台等")
+    private String jsdw;
+
+    @ApiModelProperty(value = "批次号")
+    @Excel(name = "批次号",sort = 7,headerColor= IndexedColors.RED1)
+    private String qxPch;
+
+    @ApiModelProperty(value = "到期日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到期日期", width = 30, dateFormat = "yyyy-MM-dd",headerColor= IndexedColors.RED1 )
+    private Date dqsj;
+
+    @ApiModelProperty(value = "生产厂商")
+    @Excel(name = "生产厂商", width = 30 )
+    private String sccs;
+
+    @ApiModelProperty(value = "采购日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "采购日期", width = 30, dateFormat = "yyyy-MM-dd",headerColor= IndexedColors.RED1 )
+    private Date cgrq;
+
+    @ApiModelProperty(value = "装备图片地址")
+    private String qxTp;
+
+    @ApiModelProperty(value = "型号")
+    @Excel(name = "型号")
+    private String xh;
+
+    @ApiModelProperty(value = "装备图片")
+    @TableField(exist = false)
+    private MultipartFile zbTpFile;
+
+    @ApiModelProperty(value = "装备状态D_ZDY_SBZT(1 正常 2 临期 3 到期)")
+    private String zbzt;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门",sort = 2 )
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @Excel(name = "所属部门代码",sort = 1,headerColor= IndexedColors.RED1 )
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "当前页")
+    @NotBlank(message = "参数不能为空")
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数")
+    @NotBlank(message = "参数不能为空")
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "下发id 下发装备的id")
+    private String xfid;
+
+    @ApiModelProperty(value = "是否报损 0报损 1未报损")
+    private String sfbs;
+
+    @ApiModelProperty(value = "关联警用器械列表")
+    @TableField(exist = false)
+    private List<TbJcglJyqx> jyqxList;
+
+    @ApiModelProperty(value = "下发数")
+    private long xfs;
+
+    @ApiModelProperty(value = "报损数")
+    private long bss;
+
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJz.java
new file mode 100644
index 0000000..1537bbd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJz.java
@@ -0,0 +1,89 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz")
+@ApiModel(value="TbJcglJz对象", description="勤务警组")
+public class TbJcglJz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "勤务警组标识编号")
+    private String jzBh;
+
+    @ApiModelProperty(value = "勤务警组分类;1.民警小组，2、辅警小组，3、民警+辅警小组")
+    private String jzFl;
+
+    @ApiModelProperty(value = "勤务警组类型;1、车巡，2、步巡")
+    private String jzLx;
+
+    @ApiModelProperty(value = "带队民警ID")
+    private String ddMjid;
+
+    @ApiModelProperty(value = "带队民警身份证号")
+    private String ddMjsfzh;
+
+    @ApiModelProperty(value = "带队民警姓名")
+    private String ddMjxm;
+
+    @ApiModelProperty(value = "带队民警警号")
+    private String ddMjjh;
+
+    @ApiModelProperty(value = "带队民警电话")
+    private String ddDh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzCl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzCl.java
new file mode 100644
index 0000000..97302eb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzCl.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组车辆关联表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz_cl")
+@ApiModel(value="TbJcglJzCl对象", description="勤务警组车辆关联表")
+public class TbJcglJzCl extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组人员表标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "巡防警力表ID")
+    private String clId;
+
+    @ApiModelProperty(value = "勤务警组表标识ID")
+    private String qwjzId;
+
+    @ApiModelProperty(value = "机动车号牌号码")
+    private String jdchphm;
+
+    @ApiModelProperty(value = "机动车号牌种类代码（字典）")
+    private String jdchpzldm;
+
+    @ApiModelProperty(value = "关联GPSID")
+    private String gpsId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzJyqx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzJyqx.java
new file mode 100644
index 0000000..1999834
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzJyqx.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组警用器械
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz_jyqx")
+@ApiModel(value="TbJcglJzJyqx对象", description="勤务警组警用器械")
+public class TbJcglJzJyqx extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组警用器械标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "勤务警组标识ID")
+    private String qwjzId;
+
+    @ApiModelProperty(value = "警用器械标识ID")
+    private String qxId;
+
+    @ApiModelProperty(value = "器械名称")
+    private String qxmc;
+
+    @ApiModelProperty(value = "器械类型（参考字典）")
+    private String qxlx;
+
+    @ApiModelProperty(value = "佩戴数量")
+    private Integer qxsl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzRy.java
new file mode 100644
index 0000000..6dcd799
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzRy.java
@@ -0,0 +1,62 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组人员
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz_ry")
+@ApiModel(value="TbJcglJzRy对象", description="勤务警组人员")
+public class TbJcglJzRy extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组人员表标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "巡防警力表ID")
+    private String ryId;
+
+    @ApiModelProperty(value = "勤务警组表标识ID")
+    private String qwjzId;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "性别代码（0男 1女 2未知）")
+    private String xbdm;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer nl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzZnzb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzZnzb.java
new file mode 100644
index 0000000..568e5ae
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglJzZnzb.java
@@ -0,0 +1,60 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组通讯装备
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz_znzb")
+@ApiModel(value="TbJcglJzTxzb对象", description="勤务警组通讯装备")
+public class TbJcglJzZnzb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组人员表标识ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "巡防装备表ID")
+    private String zbId;
+
+    @ApiModelProperty(value = "勤务警组表标识ID")
+    private String qwjzId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "装备类型（01 移动警务终端  02 执法记录仪 03 对讲机）")
+    private String txzblx;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "是否专业装备")
+    private String sfzy;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "是否支持通讯 0否 1支持")
+    private String sfxt;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKfd.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKfd.java
new file mode 100644
index 0000000..fa0b1cb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKfd.java
@@ -0,0 +1,117 @@
+package com.mosty.base.model.entity.jcgl;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+
+/**
+ * @Author aklcoming
+ * @Date 2022-06-08 14:26:20
+ */
+@Data
+@TableName(value = "tb_jcgl_kfd")
+@ApiModel(value = "快返点")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TbJcglKfd extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6101333033786917295L;
+
+
+    @ApiModelProperty(value = "快反点标识ID", name = "kfdId")
+    private String kfdId;
+
+    @ApiModelProperty(value = "点位类型", name = "dwlx")
+    private String dwlx;
+
+    @ApiModelProperty(value = "快返点名称", name = "kfdMc")
+    private String kfdMc;
+
+    @ApiModelProperty(value = "快反点地址", name = "kfdDz")
+    private String kfdDz;
+
+    @ApiModelProperty(value = "行政区划代码", name = "xzqhdm")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "一分钟范围", name = "yfzfw")
+    private Polygon yfzfw;
+
+    @ApiModelProperty(value = "三分钟范围", name = "sfzfw")
+    private Polygon sfzfw;
+
+    @ApiModelProperty(value = "五分钟范围", name = "wfzfw")
+    private Polygon wfzfw;
+
+    @ApiModelProperty(value = "快返点图片;逗号分隔", name = "kfdTp")
+    private String kfdTp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "负责人身份证")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date cjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhbm.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhbm.java
new file mode 100644
index 0000000..8feaedb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhbm.java
@@ -0,0 +1,185 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_khbm")
+@ApiModel(value = "TbJcglKhbm  对象", description = "绩效考核部门")
+public class TbJcglKhbm extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "添加人ID")
+    private String tjrid;
+
+    @ApiModelProperty(value = "添加人身份证号")
+    private String tjrsfzh;
+
+    @ApiModelProperty(value = "添加人姓名")
+    private String tjrxm;
+
+    @ApiModelProperty(value = "添加时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+
+
+    @ApiModelProperty(value = "应报备")
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    private int zsbb;
+
+    @ApiModelProperty(value = "报备得分")
+    private BigDecimal bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    private BigDecimal bbkf;
+
+
+    @ApiModelProperty(value = "应查人")
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    private int zscr;
+
+    @ApiModelProperty(value = "查人分")
+    private BigDecimal crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    private BigDecimal crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    private int zscc;
+
+    @ApiModelProperty(value = "查车分")
+    private BigDecimal ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    private BigDecimal cckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    private int zscw;
+
+    @ApiModelProperty(value = "查物品得分")
+    private BigDecimal cwf;
+
+    @ApiModelProperty(value = "查物品扣分")
+    private BigDecimal cwkf;
+
+
+    @ApiModelProperty(value = "应巡逻")
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    private int zsxl;
+
+    @ApiModelProperty(value = "巡逻分")
+    private BigDecimal xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    private BigDecimal xlkf;
+
+
+    @ApiModelProperty(value = "应签收")
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收")
+    private int zsqs;
+
+    @ApiModelProperty(value = "签收分")
+    private BigDecimal qsf;
+
+    @ApiModelProperty(value = "签收分")
+    private BigDecimal qskf;
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "巡逻时长分")
+    private BigDecimal xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    private BigDecimal xlsckf;
+
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int yxllc;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int zsxllc;
+
+    @ApiModelProperty(value = "巡逻里程分")
+    private BigDecimal xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+    private BigDecimal xllckf;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhmx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhmx.java
new file mode 100644
index 0000000..bc35b35
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhmx.java
@@ -0,0 +1,171 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_khmx")
+@ApiModel(value = "TbJcglKhbm  对象", description = "绩效考核部门")
+public class TbJcglKhmx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+
+    @ApiModelProperty(value = "应报备")
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    private int zsbb;
+
+    @ApiModelProperty(value = "报备得分")
+    private BigDecimal bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    private BigDecimal bbkf;
+
+
+    @ApiModelProperty(value = "应查人")
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    private int zscr;
+
+    @ApiModelProperty(value = "查人分")
+    private BigDecimal crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    private BigDecimal crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    private int zscc;
+
+    @ApiModelProperty(value = "查车分")
+    private BigDecimal ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    private BigDecimal cckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    private int zscw;
+
+    @ApiModelProperty(value = "查物品得分")
+    private BigDecimal cwf;
+
+    @ApiModelProperty(value = "查物品扣分")
+    private BigDecimal cwkf;
+
+
+    @ApiModelProperty(value = "应巡逻")
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    private int zsxl;
+
+    @ApiModelProperty(value = "巡逻分")
+    private BigDecimal xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    private BigDecimal xlkf;
+
+
+    @ApiModelProperty(value = "应签收")
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收")
+    private int zsqs;
+
+    @ApiModelProperty(value = "签收分")
+    private BigDecimal qsf;
+
+    @ApiModelProperty(value = "签收分")
+    private BigDecimal qskf;
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "巡逻时长分")
+    private BigDecimal xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    private BigDecimal xlsckf;
+
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int yxllc;
+
+    @ApiModelProperty(value = "最少巡逻里程")
+    private int zsxllc;
+
+    @ApiModelProperty(value = "巡逻里程分")
+    private BigDecimal xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+    private BigDecimal xllckf;
+
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhtj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhtj.java
new file mode 100644
index 0000000..60c28ed
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglKhtj.java
@@ -0,0 +1,283 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_khtj")
+@ApiModel(value = "TbJcglKhtj  对象", description = "绩效考核部门统计")
+public class TbJcglKhtj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "统计日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 2)
+    private Date tjrq;
+
+    @ApiModelProperty(value = "统计时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+
+    @ApiModelProperty(value = "应报备数")
+    @Excel(name = "应报备数", sort = 3)
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备数")
+    @Excel(name = "最少报备数", sort = 3)
+    private int zsbb;
+
+    @ApiModelProperty(value = "实际报备数")
+    @Excel(name = "实际报备数", sort = 4)
+    private int sjbb;
+
+    @ApiModelProperty(value = "未报备数")
+    @Excel(name = "未报备数", sort = 4)
+    private int wbb;
+
+    @ApiModelProperty(value = "报备得分")
+    @Excel(name = "报备得分", sort = 4)
+    private BigDecimal bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    @Excel(name = "报备扣分", sort = 4)
+    private BigDecimal bbkf;
+
+
+    @ApiModelProperty(value = "应巡逻数")
+    @Excel(name = "应巡逻数", sort = 4)
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻数")
+    @Excel(name = "最少巡逻数", sort = 4)
+    private int zsxl;
+
+    @ApiModelProperty(value = "实际巡逻")
+    @Excel(name = "实际巡逻", sort = 4)
+    private int sjxl;
+
+    @ApiModelProperty(value = "未巡逻")
+    @Excel(name = "未巡逻", sort = 4)
+    private int wxl;
+
+    @ApiModelProperty(value = "巡逻得分")
+    @Excel(name = "巡逻得分", sort = 4)
+    private BigDecimal xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    @Excel(name = "巡逻扣分", sort = 4)
+    private BigDecimal xlkf;
+
+
+    @ApiModelProperty(value = "应签收数")
+    @Excel(name = "应签收数", sort = 4)
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收数")
+    @Excel(name = "最少签收数", sort = 4)
+    private int zsqs;
+
+    @ApiModelProperty(value = "实际签收")
+    @Excel(name = "实际签收", sort = 4)
+    private int sjqs;
+
+    @ApiModelProperty(value = "未签收")
+    @Excel(name = "未签收", sort = 4)
+    private int wqs;
+
+    @ApiModelProperty(value = "签收得分")
+    @Excel(name = "签收得分", sort = 4)
+    private BigDecimal qsf;
+
+    @ApiModelProperty(value = "签收扣分")
+    @Excel(name = "签收扣分", sort = 4)
+    private BigDecimal qskf;
+
+
+    @ApiModelProperty(value = "应查人")
+    @Excel(name = "应查人", sort = 4)
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    @Excel(name = "最少查人", sort = 4)
+    private int zscr;
+
+    @ApiModelProperty(value = "实际查人")
+    @Excel(name = "实际查人", sort = 4)
+    private int sjcr;
+
+    @ApiModelProperty(value = "未查人")
+    @Excel(name = "未查人", sort = 4)
+    private int wcr;
+
+    @ApiModelProperty(value = "查人得分")
+    @Excel(name = "查人得分", sort = 4)
+    private BigDecimal crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    @Excel(name = "查人扣分", sort = 4)
+    private BigDecimal crkf;
+
+
+
+
+    @ApiModelProperty(value = "应查车")
+    @Excel(name = "应查车", sort = 4)
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    @Excel(name = "最少查车", sort = 4)
+    private int zscc;
+
+    @ApiModelProperty(value = "实际查车")
+    @Excel(name = "实际查车", sort = 4)
+    private int sjcc;
+
+    @ApiModelProperty(value = "未查车")
+    @Excel(name = "未查车", sort = 4)
+    private int wcc;
+
+    @ApiModelProperty(value = "查车得分")
+    @Excel(name = "查车得分", sort = 4)
+    private BigDecimal ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    @Excel(name = "查车扣分", sort = 4)
+    private BigDecimal cckf;
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    @Excel(name = "应巡逻时长", sort = 4)
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    @Excel(name = "最少巡逻时长", sort = 4)
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "实际巡逻时长")
+    @Excel(name = "实际巡逻时长", sort = 4)
+    private int sjxlsc;
+
+    @ApiModelProperty(value = "未巡逻时长")
+    @Excel(name = "未巡逻时长", sort = 4)
+    private int wxlsc;
+
+    @ApiModelProperty(value = "巡逻时长得分")
+    @Excel(name = "巡逻时长得分", sort = 4)
+    private BigDecimal xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    @Excel(name = "巡逻时长扣分", sort = 4)
+    private BigDecimal xlsckf;
+
+
+
+    @ApiModelProperty(value = "应巡逻里程")
+    @Excel(name = "应巡逻里程", sort = 4)
+    private int yxllc;
+
+    @ApiModelProperty(value = "最少巡逻里程")
+    @Excel(name = "最少巡逻里程", sort = 4)
+    private int zsxllc;
+
+    @ApiModelProperty(value = "实际巡逻里程")
+    @Excel(name = "实际巡逻里程", sort = 4)
+    private int sjxllc;
+
+    @ApiModelProperty(value = "未巡逻里程")
+    @Excel(name = "未巡逻里程", sort = 4)
+    private int wxllc;
+
+    @ApiModelProperty(value = "巡逻里程得分")
+    @Excel(name = "巡逻里程得分", sort = 4)
+    private BigDecimal xllcf;
+
+    @ApiModelProperty(value = "巡逻里程得分")
+    @Excel(name = "巡逻里程扣分", sort = 4)
+    private BigDecimal xllckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    @Excel(name = "应查物品", sort = 4)
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    @Excel(name = "最少查物品", sort = 4)
+    private int zscw;
+
+    @ApiModelProperty(value = "实际查物品")
+    @Excel(name = "实际查物品", sort = 4)
+    private int sjcw;
+
+    @ApiModelProperty(value = "未查物")
+    @Excel(name = "未查物", sort = 4)
+    private int wcw;
+
+    @ApiModelProperty(value = "查物得分")
+    @Excel(name = "查物得分", sort = 4)
+    private BigDecimal cwf;
+
+    @ApiModelProperty(value = "查物扣分")
+    @Excel(name = "查物扣分", sort = 4)
+    private BigDecimal cwkf;
+
+    @ApiModelProperty(value = "三项扣分")
+    private BigDecimal sxkf;
+
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门", width = 35, sort = 1)
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglPzfz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglPzfz.java
new file mode 100644
index 0000000..6914906
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglPzfz.java
@@ -0,0 +1,53 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/27
+ * 安保风采实体表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_pzfz")
+@ApiModel(value = "TbjclPzfz 对象", description = "配置分值实体表")
+public class TbJcglPzfz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "配置类型 01.刑事警情 02.行政警情 03.其他警情 04.预警人员 05.预警车辆 06.预警事件 07.盘查重点人员 08.盘查重点车辆")
+    private String pzlx;
+
+    @ApiModelProperty(value = "配置分值")
+    private Integer pzfz;
+
+    @ApiModelProperty(value = "事件范围（分钟）")
+    private String pzsjfw;
+
+    @ApiModelProperty(value = "配置人Id")
+    private String pzrid;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrxm;
+
+    @ApiModelProperty(value = "配置人身份证")
+    private String pzrsfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglShabll.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglShabll.java
new file mode 100644
index 0000000..1d15f03
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglShabll.java
@@ -0,0 +1,95 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 社会安保力量
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_shabll")
+@ApiModel(value = "TbJcglShabll对象", description = "社会安保力量表")
+public class TbJcglShabll extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "安保力量类型")
+    private String ablllx;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "性别")
+    private String xbdm;
+
+    @ApiModelProperty(value = "民族代码")
+    private String mzdm;
+
+    @ApiModelProperty(value = "住址详址")
+    private String zzxz;
+
+    @ApiModelProperty(value = "学历代码")
+    private String xldm;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "所在单位")
+    private String szdw;
+
+    @ApiModelProperty(value = "工作内容")
+    private String gznr;
+
+    @ApiModelProperty(value = "掌握技能")
+    private String zwjn;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXf.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXf.java
new file mode 100644
index 0000000..1eb3fda
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXf.java
@@ -0,0 +1,121 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 巡访管理
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访管理", description = "")
+@TableName("tb_jcgl_xf")
+public class TbJcglXf extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+
+    @ApiModelProperty(value = "巡访类型")
+    private String xflx;
+
+    @ApiModelProperty(value = "巡访组长身份证号")
+    private String xfzzSfzh;
+
+    @ApiModelProperty(value = "巡访组长姓名")
+    private String xfzzXm;
+
+    @ApiModelProperty(value = "巡访时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xfsj;
+
+    @ApiModelProperty(value = "巡访组员JOSN")
+    private String xfzy;
+
+    @ApiModelProperty(value = "巡访内容")
+    private String xfnr;
+
+    @ApiModelProperty(value = "巡访单位")
+    private String xfdw;
+
+    @ApiModelProperty(value = "巡访照片")
+    private String xfzp;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "任务状态")
+    private String rwzt;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "申报时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sbsj;
+
+    @ApiModelProperty(value = "申报类型")
+    private String sblx;
+
+    @ApiModelProperty(value = "申报原因")
+    private String sbyy;
+
+    @ApiModelProperty(value = "申报附件")
+    private String sbfj;
+
+    @ApiModelProperty(value = "申报状态")
+    private String sbzt;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfCyry.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfCyry.java
new file mode 100644
index 0000000..05b0299
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfCyry.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访_从业人员", description = "")
+@TableName("tb_jcgl_xf_cyry")
+public class TbJcglXfCyry extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "从业人员id", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "性别")
+    private String xb;
+
+    @ApiModelProperty(value = "出生日期")
+    private String csrq;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "详细地址")
+    private String xxdz;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String sfzh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfDwgl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfDwgl.java
new file mode 100644
index 0000000..4867f9a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfDwgl.java
@@ -0,0 +1,91 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访_单位管理", description = "")
+@TableName("tb_jcgl_xf_dwgl")
+public class TbJcglXfDwgl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "单位管理id", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "单位名称")
+    private String dwmc;
+
+    @ApiModelProperty(value = "单位分类")
+    private String dwfl;
+
+    @ApiModelProperty(value = "单位类型")
+    private String dwlx;
+
+    @ApiModelProperty(value = "单位数")
+    private int dws;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "地址")
+    private String dz;
+
+    @ApiModelProperty(value = "地址1")
+    private String dz1;
+
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "从业人员JSON")
+    private String cyry;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfJl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfJl.java
new file mode 100644
index 0000000..9ca78e8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfJl.java
@@ -0,0 +1,72 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡访内容
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访记录", description = "")
+@TableName("tb_jcgl_xf_jl")
+public class TbJcglXfJl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+
+    @ApiModelProperty(value = "巡防ids")
+    private String xfids;
+
+    @ApiModelProperty(value = "周期数")
+    private String zq;
+
+    @ApiModelProperty(value = "巡访内容")
+    private String xfnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfNrmb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfNrmb.java
new file mode 100644
index 0000000..c8628a7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfNrmb.java
@@ -0,0 +1,65 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访内容模板", description = "")
+@TableName("tb_jcgl_xf_nrmb")
+public class TbJcglXfNrmb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "内容id", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "内容")
+    private String nr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfRw.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfRw.java
new file mode 100644
index 0000000..afaf60f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfRw.java
@@ -0,0 +1,78 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访任务", description = "")
+@TableName("tb_jcgl_xf_rw")
+public class TbJcglXfRw extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+
+    @ApiModelProperty(value = "巡防ids")
+    private String xfids;
+
+    @ApiModelProperty(value = "周期数")
+    private String zq;
+
+    @ApiModelProperty(value = "周期类型 D 天 M 月 Y年")
+    private String zqType;
+
+    @ApiModelProperty(value = "巡访问题")
+    private String xfwt;
+
+    @ApiModelProperty(value = "巡访JSON  详细数据从关联表获取tb_jcgl_xf")
+    private String xfJson;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfZg.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfZg.java
new file mode 100644
index 0000000..7f24a86
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfZg.java
@@ -0,0 +1,89 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 巡访库
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访_战果", description = "")
+@TableName("tb_jcgl_xf_zg")
+public class TbJcglXfZg extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "战果id", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "巡访对象id")
+    private String xfdxid;
+
+    @ApiModelProperty(value = "巡防原因")
+    private String sbyy;
+
+    @ApiModelProperty(value = "申报时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sbsj;
+
+    @ApiModelProperty(value = "申报类型")
+    private String sblx;
+
+    @ApiModelProperty(value = "申报附件id")
+    private String sbfjid;
+
+    @ApiModelProperty(value = "申报附件类型")
+    private String sbfjlx;
+
+    @ApiModelProperty(value = "申报状态")
+    private String sbzt;
+
+    @ApiModelProperty(value = "审批意见")
+    private String spyj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfcl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfcl.java
new file mode 100644
index 0000000..ea71140
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfcl.java
@@ -0,0 +1,127 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_xfcl")
+public class TbJcglXfcl extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "id")
+    @TableId
+    private String cId;
+
+    @ApiModelProperty(value = "车牌类型")
+    @Excel(name = "车牌类型",sort = 4,headerColor= IndexedColors.RED1,dictType = "D_BZ_HPZL")
+    private String cplx;
+
+    @ApiModelProperty(value = "车牌号")
+    @Excel(name = "车牌号",sort = 3,headerColor= IndexedColors.RED1 )
+    private String cph;
+
+    @ApiModelProperty(value = "车辆品牌")
+    @Excel(name = "车辆品牌",sort = 5,headerColor= IndexedColors.RED1,dictType = "D_BZ_CLPP")
+    private String clpp;
+
+    @ApiModelProperty(value = "车辆类型;数据字典")
+    @Excel(name = "车辆类型",sort = 6,headerColor= IndexedColors.RED1,dictType = "D_BZ_CLLX")
+    private String cllx;
+
+    @ApiModelProperty(value = "车辆型号")
+    @Excel(name = "车辆型号",sort = 7)
+    private String clxh;
+
+    @ApiModelProperty(value = "车辆颜色")
+    @Excel(name = "车辆颜色",dictType = "D_BZ_CLYS",sort = 8)
+    private String clys;
+
+    @ApiModelProperty(value = "车辆年款")
+    @Excel(name = "车辆年款",sort = 9)
+    private String clnk;
+
+    @ApiModelProperty(value = "购买日期")    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "购买日期", width = 30, dateFormat = "yyyy-MM-dd",headerColor= IndexedColors.RED1 ,sort = 10)
+    private Date gmrq;
+
+    @ApiModelProperty(value = "报废日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd",headerColor= IndexedColors.RED1 ,sort = 11)
+    private Date bfrq;
+
+    @ApiModelProperty(value = "图片")
+    private String clTp;
+
+    @ApiModelProperty(value = "装备状态D_ZDY_SBZT(1 正常 2 临期 3 到期)")
+    private String zbzt;
+
+    @ApiModelProperty(value = "关联GPSID")
+    @Excel(name = "关联GPSID")
+    private String gpsId;
+
+    @ApiModelProperty(value = "车载电台")
+    private String czdt;
+
+    @ApiModelProperty(value = "车载监控")
+    private String czjk;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门",sort = 2 )
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @Excel(name = "所属部门代码",sort = 1,headerColor= IndexedColors.RED1 )
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "当前页")
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数")
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "警用器械")
+    private String jyqx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfclSb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfclSb.java
new file mode 100644
index 0000000..5e77cb6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfclSb.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "巡防车辆设备")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_xfcl_sb")
+public class TbJcglXfclSb extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "车辆id")
+    private String cId;
+
+    @ApiModelProperty(value = "设备唯一编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "设备分类")
+    private String sbFl;
+
+    @ApiModelProperty(value = "设备品牌")
+    private String sbPp;
+
+    @ApiModelProperty(value = "--D_BZ_AZWZ（安装位置）安装位置;1车辆内部，2车辆前部，3车辆后部，4车辆顶部（数据字典）")
+    private String azwz;
+
+    @ApiModelProperty(value = "设备IPv4")
+    private String sbIpv4;
+
+    @ApiModelProperty(value = "设备IPv6")
+    private String sbIpv6;
+
+    @ApiModelProperty(value = "设备图片")
+    private String sbTp;
+
+    @ApiModelProperty(value = "是否支持视频 0不支持 1支持")
+    private String sfsp;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfll.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfll.java
new file mode 100644
index 0000000..2a87d13
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfll.java
@@ -0,0 +1,148 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import com.mosty.common.base.entity.log.ExcelHandlerAdapter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表", description = "")
+@TableName("tb_jcgl_xfll")
+@Validated
+public class TbJcglXfll extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty(name = "警员管理表标识ID", notes = "", hidden = true)
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）", notes = "")
+    private String ryid;
+
+    @ApiModelProperty(name = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(name = "警员类型", notes = "01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警")
+    private String lx;
+
+    @ApiModelProperty(name = "姓名", notes = "")
+    @Excel(name = "姓名",sort = 3,headerColor= IndexedColors.RED1 )
+    @NotBlank(message = "用户账号不能为空")
+    private String xm;
+
+    @ApiModelProperty(name = "性别代码", notes = "")
+    @Excel(name = "性别代码",dictType="D_BZ_XB",type= Excel.Type.EXPORT)
+    private String xbdm;
+
+    @ApiModelProperty(name = "身份证号", notes = "")
+    @Excel(name = "身份证号",width = 20,sort = 4,headerColor= IndexedColors.RED1 )
+    @NotBlank(message = "用户账号不能为空")
+    private String sfzh;
+
+    @ApiModelProperty(name = "警号", notes = "")
+    @Excel(name = "警号",sort = 5,headerColor= IndexedColors.RED1 )
+    @NotBlank(message = "用户账号不能为空")
+    private String jh;
+
+    @ApiModelProperty(name = "警衔", notes = "")
+    private String jx;
+
+    @ApiModelProperty(name = "政治面貌", notes = "")
+    @Excel(name = "政治面貌", dictType = "D_BZ_ZZMM")
+    private String zzmm;
+
+    @ApiModelProperty(name = "婚姻状况", notes = "0、未婚，1、已婚，2、离异")
+    @Excel(name = "婚姻状况",dictType = "D_BZ_HYZK")
+    private String hyzk;
+
+    @ApiModelProperty(name = "入职时间", notes = "")
+//    @Excel(name = "入职时间(yyyy-MM-dd)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date rzsj;
+
+    @ApiModelProperty(name = "出生日期", notes = "")
+    private Date csrq;
+
+    @ApiModelProperty(name = "民族编码", notes = "")
+    @Excel(name = "民族编码",dictType = "D_BZ_MZ")
+    private String mzdm;
+
+    @ApiModelProperty(name = "文化程度", notes = "")
+    @Excel(name = "文化程度",dictType = "D_BZ_WHCD")
+    private String whcddm;
+
+    @ApiModelProperty(name = "籍贯", notes = "")
+//    @Excel(name = "籍贯",dictType = "D_BZ_XZQHDM")
+    private String jgdm;
+
+    @ApiModelProperty(name = "家庭住址", notes = "")
+    private String jtzz;
+
+    @ApiModelProperty(name = "联系电话", notes = "")
+    @Excel(name = "联系电话",sort = 6,headerColor= IndexedColors.RED1 )
+    @NotBlank(message = "联系电话不能为空")
+    private String lxdh;
+
+    @ApiModelProperty(name = "电子邮箱", notes = "")
+    @Excel(name = "电子邮箱")
+    private String dzyx;
+
+    @ApiModelProperty(name = "巡防力量图片")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门",width = 35,sort = 2)
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @Excel(name = "所属部门代码",sort = 1,headerColor= IndexedColors.RED1 )
+    @NotBlank(message = "所属部门代码不能为空")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllBq.java
new file mode 100644
index 0000000..2eac1c8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllBq.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡防警力标签关联表;
+ *
+ * @author : lhh
+ * @date : 2022-6-6
+ */
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防警力标签关联表", description = "")
+@TableName("tb_jcgl_xfll_bq")
+public class TbJcglXfllBq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -9134462848980897397L;
+
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "巡防警力标签关联表标识ID", name = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "警力表ID")
+    private String xfllId;
+
+    @ApiModelProperty(value = "标签表ID")
+    private String bqId;
+
+    @ApiModelProperty(value = "有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yxsj;
+
+    @ApiModelProperty(value = "标签表类型")
+    private String bqlx;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllFz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllFz.java
new file mode 100644
index 0000000..514d3ea
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfllFz.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防警力分组表", description = "")
+@TableName("tb_jcgl_xfll_fz")
+public class TbJcglXfllFz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -9134462848980897397L;
+
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "巡防警力标签关联表标识ID", name = "id")
+    public Integer id;
+
+    @ApiModelProperty(value = "警组名称", name = "id")
+    public String jzmc;
+
+    @ApiModelProperty(value = "警组人员", name = "jzry")
+    public String jzry;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfqy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfqy.java
new file mode 100644
index 0000000..14581af
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfqy.java
@@ -0,0 +1,107 @@
+package com.mosty.base.model.entity.jcgl;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.vividsolutions.jts.geom.Point;
+
+/**
+ * <p>
+ * 巡防区域
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xfqy")
+@ApiModel(value="TbJcglXfqy对象", description="巡防区域")
+public class TbJcglXfqy extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防区标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_XQLX（巡区类型）巡防区类型1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String xfqLx;
+
+    @ApiModelProperty(value = "--D_BZ_XFQDJ（巡防区等级）巡防区等级;")
+    private String xfqDj;
+
+    @ApiModelProperty(value = "巡防区名称")
+    private String xfqMc;
+
+    @ApiModelProperty(value = "巡防区面积（平方米）")
+    private Integer xfqMj;
+
+    @ApiModelProperty(value = "巡防区负责人")
+    private String xfqFzr;
+
+    @ApiModelProperty(value = "巡防区负责人ID")
+    private String xfqFzrId;
+
+    @ApiModelProperty(value = "巡防区负责人身份证号")
+    private String xfqFzrSfz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "区域中心点")
+    private Point zxd;
+
+    @ApiModelProperty(value = "多边形数据存储（JSON）")
+    private Polygon pgis;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "巡防部门类型")
+    private String xfbmlx;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfwg.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfwg.java
new file mode 100644
index 0000000..978d51a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXfwg.java
@@ -0,0 +1,86 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 巡防网格
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xfwg")
+@ApiModel(value="TbJcglXfwg对象", description="巡防网格")
+public class TbJcglXfwg extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防网格表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "巡防网格名称")
+    private String wgMc;
+
+    @ApiModelProperty(value = "巡防网格编号")
+    private String wgBh;
+
+    @ApiModelProperty(value = "巡防网格类型")
+    private String wglx;
+
+    @ApiModelProperty(value = "巡防网格面积")
+    private BigDecimal wgMj;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "巡防网格图片;逗号分隔")
+    private String wgTp;
+
+    @ApiModelProperty(value = "多边形数据存储（JSON）")
+    private LineString pgis;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfa.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfa.java
new file mode 100644
index 0000000..6e25029
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfa.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 巡逻方案表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xlfa")
+@ApiModel(value = "TbJcglXlfa对象", description = "巡逻方案表")
+public class TbJcglXlfa extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "执行周期（01-每年执行，02-每月，03-每周,99-固定日期）")
+    private String zxzq;
+
+    @ApiModelProperty(value = "执行周期描述，如：每年6月6日至9日执行高考巡逻方案")
+    private String zxms;
+
+    @ApiModelProperty(value = "执行年月日（根据执行周期来）")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zxksyr;
+
+    @ApiModelProperty(value = "执行星期几")
+    private Integer zxxq;
+
+    @ApiModelProperty(value = "方案制定人ID")
+    private String fazdrId;
+
+    @ApiModelProperty(value = "方案制定人姓名")
+    private String fazdrXm;
+
+    @ApiModelProperty(value = "方案制定人身份证号")
+    private String fazdrSfzh;
+
+    @ApiModelProperty(value = "制定时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fazdsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfaXldw.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfaXldw.java
new file mode 100644
index 0000000..59388e8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXlfaXldw.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 巡逻方案-巡逻点位即要求表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xlfa_xldw")
+@ApiModel(value = "TbJcglXlfaXldw对象", description = "巡逻方案-巡逻点位即要求表")
+public class TbJcglXlfaXldw extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案id")
+    private String faId;
+
+    @ApiModelProperty(value = "巡逻点位类型10-巡逻点、20-巡逻区域")
+    private String dwlx;
+
+    @ApiModelProperty(value = "点位经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "点位纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "点位坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "点位hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "点位区域")
+    private Polygon qy;
+
+    @ApiModelProperty(value = "点位描述")
+    private String dwmc;
+
+    @ApiModelProperty(value = "到位时间")
+    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "停留时长")
+    private Integer tlsc;
+
+    @ApiModelProperty(value = "要求盘查人员数量")
+    private Integer pcrys;
+
+    @ApiModelProperty(value = "要求盘查车辆数量")
+    private Integer pccls;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXljl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXljl.java
new file mode 100644
index 0000000..59a8504
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglXljl.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 训练记录
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xljl")
+@ApiModel(value = "TbJcglXljl 对象", description = "训练记录")
+public class TbJcglXljl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警力表ID")
+    private String xfllId;
+
+    @ApiModelProperty(value = "训练日期")
+    private String xlrq;
+
+    @ApiModelProperty(value = "训练成绩（D_BZ_XLCJ）")
+    private String xlcj;
+
+    @ApiModelProperty(value = "训练时长")
+    private String xlsc;
+
+    @ApiModelProperty(value = "训练类型（D_BZ_XFXLLX）")
+    private String xllx;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbfl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbfl.java
new file mode 100644
index 0000000..3cf4c83
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbfl.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_zbfl")
+public class TbJcglZbfl extends BaseEntity implements Serializable, Cloneable {
+
+  @ApiModelProperty(value = "id")
+  private String id;
+
+  @ApiModelProperty(value = "自身编码1")
+  private String scode;
+
+  @ApiModelProperty(value = "类型名称")
+  private String sname;
+
+  @ApiModelProperty(value = "父级编码")
+  private String pcode;
+
+  @ApiModelProperty(value = "父级名称")
+  private String pname;
+
+  @ApiModelProperty(value = "类型级别")
+  private long jdcj;
+
+  @ApiModelProperty(value = "当前页")
+  @TableField(exist = false)
+  private Integer pageNo;
+
+  @ApiModelProperty(value = "每页条数")
+  @TableField(exist = false)
+  private Integer pageSize;
+
+  @ApiModelProperty(value = "子节点信息")
+  @TableField(exist = false)
+  List<TbJcglZbfl> children;
+
+
+  @ApiModelProperty(value = "所属单位")
+  private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbjl.java
new file mode 100644
index 0000000..26fa34b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZbjl.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "装备记录")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_zbjl")
+public class TbJcglZbjl extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "数据表名")
+    private String sjbm;
+
+    @ApiModelProperty(value = "关联id")
+    private String glid;
+
+    @ApiModelProperty(value = "数据来源 1 报损 2 下发 3回退")
+    private String sjly;
+
+    @ApiModelProperty(value = "装备类型 1智能装备 2 警用装备")
+    private String zblx;
+
+    @ApiModelProperty(value = "操作人")
+    private String czr;
+
+    @ApiModelProperty(value = "操作人身份证")
+    private String czrSfz;
+
+    @ApiModelProperty(value = "操作人所属部门id")
+    private String czrSsbmid;
+
+    @ApiModelProperty(value = "操作人所属部门")
+    private String czrSsbm;
+
+    @ApiModelProperty(value = "操作人所属部门代码")
+    private String czrSsbmdm;
+
+    @ApiModelProperty(value = "下发部门id")
+    private String xfSsbmid;
+
+    @ApiModelProperty(value = "下发部门")
+    private String xfSsbm;
+
+    @ApiModelProperty(value = "下发部门代码")
+    private String xfSsbmdm;
+
+    @ApiModelProperty(value = "保留字段 报损数 下发数 回退数")
+    private String ext;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZjk.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZjk.java
new file mode 100644
index 0000000..10ba243
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZjk.java
@@ -0,0 +1,120 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 基础管理-专家库
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_zjk")
+@ApiModel(value="TbJcglZjk对象", description="基础管理-专家库")
+public class TbJcglZjk extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组人员表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_ZDY_ZJGL专家来源（1 内部 2 外部）")
+    private String zjly;
+
+    @ApiModelProperty(value = "关联人员ID")
+    private String glryId;
+
+    @ApiModelProperty(value = "专家姓名")
+    private String zjxm;
+
+    @ApiModelProperty(value = "专家身份证号码")
+    private String zjsfzh;
+
+    @ApiModelProperty(value = "--D_BZ_MZ（民族）民族编码")
+    private String mzdm;
+
+    @ApiModelProperty(value = "--D_BZ_XB（性别）性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(value = "出生日期")
+    private String csrq;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jgdm;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String jtzz;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "当前职位")
+    private String dqzw;
+
+    @ApiModelProperty(value = "专家类型（侦查、审讯、谈判、狙击、三防）")
+    private String zjlx;
+
+    @ApiModelProperty(value = "专家级别（1级 2级 3级）")
+    private String zjjb;
+
+    @ApiModelProperty(value = "专家简介（擅长领域）")
+    private String zjjc;
+
+    @ApiModelProperty(value = "获得荣誉")
+    private String hdry;
+
+    @ApiModelProperty(value = "附件地址")
+    private String fjdz;
+
+    @ApiModelProperty(value = "管理部门")
+    private String glbm;
+
+    @ApiModelProperty(value = "管理部门代码")
+    private String glbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZnzb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZnzb.java
new file mode 100644
index 0000000..b281de1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbJcglZnzb.java
@@ -0,0 +1,166 @@
+package com.mosty.base.model.entity.jcgl;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_znzb")
+public class TbJcglZnzb extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "设备编码")
+    @Excel(name = "设备编码", sort = 3, headerColor = IndexedColors.RED1)
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    @Excel(name = "设备名称", sort = 4, headerColor = IndexedColors.RED1)
+    private String sbmc;
+
+    @ApiModelProperty(value = "设备分类")
+    @Excel(name = "设备分类", sort = 5, dictType = "D_BZ_ZBLX_LZ", headerColor = IndexedColors.RED1)
+    private String scode;
+
+    @ApiModelProperty(value = "设备类型名称")
+    private String sname;
+
+    @ApiModelProperty(value = "设备IPv4")
+    private String sbIpv4;
+
+    @ApiModelProperty(value = "设备IPv6")
+    private String sbIpv6;
+
+    @ApiModelProperty(value = "设备Mac地址")
+    @Excel(name = "设备Mac地址", sort = 6)
+    private String sbMac;
+
+    @ApiModelProperty(value = "设备IMEI码")
+    @Excel(name = "设备Mac地址", sort = 7)
+    private String sbImei;
+
+    @ApiModelProperty(value = "生产厂商")
+    @Excel(name = "设备Mac地址", sort = 8)
+    private String sccs;
+
+    @ApiModelProperty(value = "采购日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "采购日期", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.RED1)
+    private Date cgrq;
+
+    @ApiModelProperty(value = "到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到期时间", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.RED1)
+    private Date dqsj;
+
+    @ApiModelProperty(value = "装备图片地址")
+    private String zbTp;
+
+    @ApiModelProperty(value = "型号")
+    private String xh;
+
+    @ApiModelProperty(value = "装备图片")
+    @TableField(exist = false)
+    private MultipartFile zbTpFile;
+
+    @ApiModelProperty(value = "字典D_ZDY_SBZT（1 正常  2 临期 3 到期 4故障）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "字典D_BZ_SF（0 否 1是）是否提醒，当用户处理提醒之后，需要将该字段置为null")
+    private String sftx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门", width = 35, sort = 2)
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @Excel(name = "所属部门代码", sort = 1, headerColor = IndexedColors.RED1)
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "当前页")
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数")
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "下发id 下发装备的id")
+    private String xfid;
+
+    @ApiModelProperty(value = "是否报损 0报损 1未报损")
+    private String sfbs;
+
+    @ApiModelProperty(value = "照片id")
+    private String zpid;
+
+    @ApiModelProperty(value = "是否支持通讯 0否 1支持")
+    @Excel(name = "是否支持通讯",dictType = "D_BZ_SF",sort = 6)
+    private String sfxt;
+
+    @ApiModelProperty(value = "是否专业装备")
+    @Excel(name = "是否专业装备",dictType = "D_BZ_SF",sort = 6)
+    private String sfzy;
+
+    @ApiModelProperty(value = "是否融合")
+    @Excel(name = "是否融合",dictType = "D_BZ_SF",sort = 6)
+    private String sfrh;
+
+    @ApiModelProperty(value = "感知接入数")
+    @TableField(exist = false)
+    private Integer gzjr;
+
+    @ApiModelProperty(value = "是否包含下级")
+    @TableField(exist = false)
+    private String isChild;
+
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+
+    @ApiModelProperty(value = "领用人")
+    private String lyr;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbSbGzjr.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbSbGzjr.java
new file mode 100644
index 0000000..7a79999
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/TbSbGzjr.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 设备感知接入
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_sb_gzjr")
+@ApiModel(value = "TbSbGzjr 对象", description = "设备感知接入实体表")
+public class TbSbGzjr extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "设备编码")
+    private String sbbm;
+
+    @ApiModelProperty(value = "设备编码")
+    private String sbmc;
+
+    @ApiModelProperty(value = "接入类型 1、事件 2、报备")
+    private String jrlx;
+
+    @ApiModelProperty(value = "是否接入 0未接入 1接入")
+    private String sfjr;
+
+    @ApiModelProperty(value = "关联id")
+    private String glid;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/Ybfj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/Ybfj.java
new file mode 100644
index 0000000..7d4c47e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/jcgl/Ybfj.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户信息表
+ *
+ * @TableName sys_user
+ */
+@Data
+@TableName(value = "mosty_base.ybfj")
+public class Ybfj implements Serializable {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "用户ID")
+    private String id;
+
+    @TableField(value = "xm")
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @TableField(value = "jh")
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @TableField(value = "dh")
+    @ApiModelProperty(value = "电话")
+    private String dh;
+
+    @TableField(value = "ssbmdm")
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @TableField(value = "ssbm")
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @TableField(value = "sfzh")
+    @ApiModelProperty(value = "身份证")
+    private String sfzh;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/BphJlxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/BphJlxx.java
new file mode 100644
index 0000000..1908464
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/BphJlxx.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 扁平化
+ *
+ * @author Administrator
+ */
+@Data
+@ApiModel(value = "扁平化接警")
+@Accessors(chain = true)
+@TableName(value = "TRS_BIGDATA.T_ALARM_BKXX_RY")
+public class BphJlxx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableField(value = "JJDBH")
+    private String jjdbh;
+
+    @TableField(value = "CZLBMC")
+    private String czlbmc;
+
+    @TableField(value = "CZSJ")
+    private String czsj;
+
+    @TableField(value = "SFZ")
+    private String sfz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/FKDB.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/FKDB.java
new file mode 100644
index 0000000..7970099
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/FKDB.java
@@ -0,0 +1,266 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("v_fkdb")
+@ApiModel(value = "FKDB 对象", description = "泸州反馈表")
+public class FKDB implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "反馈单编号")
+    private String fkdbh;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "派警单编号")
+    private String pjdbh;
+
+    @ApiModelProperty(value = "反馈录音号")
+    private String fklyh;
+
+    @ApiModelProperty(value = "反馈单位代码")
+    private String fkdwdm;
+
+    @ApiModelProperty(value = "反馈员编号")
+    private String fkybh;
+
+    @ApiModelProperty(value = "反馈员姓名")
+    private String fkyxm;
+
+    @ApiModelProperty(value = "反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fksj;
+
+    @ApiModelProperty(value = "实际出警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cjsj01;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "现场处理完毕时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xcclwbsj;
+
+    @ApiModelProperty(value = "警情类别代码")
+    private String jqlbdm;
+
+    @ApiModelProperty(value = "警情类型代码")
+    private String jqlxdm;
+
+    @ApiModelProperty(value = "警情细类代码")
+    private String jqxldm;
+
+    @ApiModelProperty(value = "警情子类代码")
+    private String jqzldm;
+
+    @ApiModelProperty(value = "警情发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfssj;
+
+    @ApiModelProperty(value = "报警地址")
+    private String bjdz;
+
+    @ApiModelProperty(value = "警情地址")
+    private String jqdz;
+
+    @ApiModelProperty(value = "出警处置情况")
+    private String cjczqk;
+
+    @ApiModelProperty(value = "反馈定位X坐标(处置现场位置)")
+    private BigDecimal fkdwxzb;
+
+    @ApiModelProperty(value = "反馈定位Y坐标(处置现场位置)")
+    private BigDecimal fkdwyzb;
+
+    @ApiModelProperty(value = "出动车次")
+    private String cdcc;
+
+    @ApiModelProperty(value = "出动人次")
+    private String cdrc;
+
+    @ApiModelProperty(value = "出动船艇")
+    private String cdct;
+
+    @ApiModelProperty(value = "救助人数")
+    private String jzrs;
+
+    @ApiModelProperty(value = "救助人数说明")
+    private String jzrssm;
+
+    @ApiModelProperty(value = "受伤人数")
+    private String ssrs;
+
+    @ApiModelProperty(value = "受伤人数说明")
+    private String ssrssm;
+
+    @ApiModelProperty(value = "死亡人数")
+    private String swrs;
+
+    @ApiModelProperty(value = "死亡人数说明")
+    private String swrssm;
+
+    @ApiModelProperty(value = "警情处理结果代码")
+    private String jqcljgdm;
+
+    @ApiModelProperty(value = "警情处理结果说明")
+    private String jqcljgsm;
+
+    @ApiModelProperty(value = "天气情况代码")
+    private String tqqkdm;
+
+    @ApiModelProperty(value = "损失情况描述")
+    private String ssqkms;
+
+    @ApiModelProperty(value = "抓获人数")
+    private String zhrs;
+
+    @ApiModelProperty(value = "涉案人数")
+    private String sars;
+
+    @ApiModelProperty(value = "逃跑人数")
+    private String tprs;
+
+    @ApiModelProperty(value = "交通事故形态代码")
+    private String jtsgxtdm;
+
+    @ApiModelProperty(value = "是否装载危险品")
+    private String sfzzwxp;
+
+    @ApiModelProperty(value = "交通事故初查原因代码")
+    private String jtsgccyydm;
+
+    @ApiModelProperty(value = "能见度代码")
+    private String njddm;
+
+    @ApiModelProperty(value = "路面状况代码")
+    private String lmzkdm;
+
+    @ApiModelProperty(value = "损坏机动车数")
+    private String shjdcs;
+
+    @ApiModelProperty(value = "损坏非机动车数")
+    private String shfjdcs;
+
+    @ApiModelProperty(value = "道路类型代码")
+    private String dllxdm;
+
+    @ApiModelProperty(value = "警情处理状态代码")
+    private String jqclztdm;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cjsj;
+
+    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "乡镇(街道)")
+    private String jdxz;
+
+    @ApiModelProperty(value = "属地村社")
+    private String sdcs;
+
+    @ApiModelProperty(value = "是否取证")
+    private String sfqz;
+
+    @ApiModelProperty(value = "移交单位代码")
+    private String yjdwdm;
+
+//    @ApiModelProperty(value = "移交单位名称")
+//    private String yjdwmc;
+
+//    @ApiModelProperty(value = "移交单位短码")
+//    private String yjdwdmbs;
+
+    @ApiModelProperty(value = "移交单位联系人名称")
+    private String yjdwlxr;
+
+    @ApiModelProperty(value = "移交单位反馈情况")
+    private String yjdwfkqk;
+
+    @ApiModelProperty(value = "移交单位反馈情况说明")
+    private String yjdwfkqksm;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "警情标签")
+    private String nrbq;
+
+    @ApiModelProperty(value = "警情部位代码")
+    private String jqbwdm;
+
+//    @ApiModelProperty(value = "警情发生地域")
+//    private String jqfsdy;
+
+//    @ApiModelProperty(value = "警力代码")
+//    private String forcedm;
+
+//    @ApiModelProperty(value = "警力类型")
+//    private String forcetype;
+
+//    @ApiModelProperty(value = "当前业务状态")
+//    private String dqywzt;
+
+//    @ApiModelProperty(value = "反馈单位短码")
+//    private String fkdwdmbs;
+//
+//    @ApiModelProperty(value = "反馈单位名称")
+//    private String fkdwmc;
+//
+//    @ApiModelProperty(value = "现场状态")
+//    private String livestatus;
+//
+//    @ApiModelProperty(value = "提交单位短码")
+//    private String tjdwdmbs;
+//
+//    @ApiModelProperty(value = "是否无效警情标识")
+//    private String wxbs;
+//
+//    @ApiModelProperty(value = "调整后管辖单位代码")
+//    private String tzhgxdwdm;
+
+//    @ApiModelProperty(value = "调整后管辖单位名称")
+//    private String tzhgxdwmc;
+//
+//    @ApiModelProperty(value = "调整后管辖单位短码")
+//    private String tzhgxdwdmbs;
+//
+//    @ApiModelProperty(value = "移交单位联系人代码")
+//    private String yjdwlxrdm;
+//
+//    @ApiModelProperty(value = "过程反馈标识")
+//    private String gcfkbs;
+//
+//    @ApiModelProperty(value = "反馈类型")
+//    private String fklx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmBkxxRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmBkxxRy.java
new file mode 100644
index 0000000..0d165a7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmBkxxRy.java
@@ -0,0 +1,112 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * Database Table Name: T_ALARM_BKXX_RY
+ *
+ * @author: T
+ * @date: Thu May 14 21:00:12 CST 2020
+ */
+@Data
+@ApiModel(value = "trs布控人员信息")
+@Accessors(chain = true)
+@TableName(value = "TRS_BIGDATA.T_ALARM_BKXX_RY")
+public class TAlarmBkxxRy implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @TableField(value = "BKZJ")
+    @ApiModelProperty(value = "布控信息主键")
+    private String bkzj;
+
+    @TableField(value = "XM")
+    @ApiModelProperty(value = "被布控人姓名")
+    private String xm;
+
+    @TableField(value = "XB")
+    @ApiModelProperty(value = "被布控人性别 1男 2 女")
+    private BigDecimal xb;
+
+    @TableField(value = "ZJLX")
+    @ApiModelProperty(value = "证件类型")
+    private BigDecimal zjlx;
+
+    @TableField(value = "ZJHM")
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @TableField(value = "QTTZ")
+    @ApiModelProperty(value = "其他特征")
+    private String qttz;
+
+    @TableField(value = "ZP")
+    @ApiModelProperty(value = "照片信息 多张用,分隔")
+    private String zp;
+
+    @TableField(value = "YWZP")
+    @ApiModelProperty(value = "是否上传照片 1是 0 否")
+    private BigDecimal ywzp;
+
+    @TableField(value = "SFRLBK")
+    @ApiModelProperty(value = "是否人脸布控 1 是 2 否 多张用,分隔")
+    private String sfrlbk;
+
+    @TableField(value = "ISBATCH")
+    @ApiModelProperty(value = "是否批量布控1是")
+    private BigDecimal isbaGLSFZHtch;
+
+    @TableField(value = "GLSFZH")
+    @ApiModelProperty(value = "关联身份证号")
+    private String glsfzh;
+
+    @TableField(value = "RYLB")
+    @ApiModelProperty(value = "人员类别")
+    private String rylb;
+
+    @TableField(value = "RYXL")
+    @ApiModelProperty(value = "人员细类")
+    private String ryxl;
+
+    @TableField(value = "RYLB_DM")
+    @ApiModelProperty(value = "人员类别代码")
+    private String rylbDm;
+
+    @TableField(value = "RYXL_DM")
+    @ApiModelProperty(value = "人员细类代码")
+    private String ryxlDm;
+
+    @TableField(value = "MZ")
+    @ApiModelProperty(value = "民族")
+    private String mz;
+
+    @TableField(value = "MZ_DM")
+    @ApiModelProperty(value = "民族代码")
+    private String mzDm;
+
+    @TableField(value = "XDXYRBH")
+    @ApiModelProperty(value = "吸毒嫌疑人编号")
+    private String xdxyrbh;
+
+    @TableField(value = "FDXYRBH")
+    @ApiModelProperty(value = "贩毒嫌疑人编号")
+    private String fdxyrbh;
+
+    public static void main(String[] args) {
+        System.out.println("510502195007122514".substring(16,17));
+    }
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmCkxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmCkxx.java
new file mode 100644
index 0000000..ec6880d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmCkxx.java
@@ -0,0 +1,290 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Database Table Name: T_ALARM_BKXX_RY
+ *
+ * @author: T
+ * @date: Thu May 14 21:00:12 CST 2020
+ */
+@ApiModel(value = "拓尔思常控人员信息表")
+@Data
+@Accessors(chain = true)
+@TableName(value = "TRS_BIGDATA.T_ALARM_CKRY")
+public class TAlarmCkxx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * zdrybh
+     */
+    @ApiModelProperty("zdrybh")
+    private String zdrybh;
+
+    /**
+     * xm
+     */
+    @ApiModelProperty("xm")
+    private String xm;
+
+    /**
+     * xmpy
+     */
+    @ApiModelProperty("xmpy")
+    private String xmpy;
+
+    /**
+     * wwxm
+     */
+    @ApiModelProperty("wwxm")
+    private String wwxm;
+
+    /**
+     * xb
+     */
+    @ApiModelProperty("xb")
+    private String xb;
+
+    /**
+     * xb_dm
+     */
+    @ApiModelProperty("xb_dm")
+    private String xbDm;
+
+    /**
+     * csrq
+     */
+    @ApiModelProperty("csrq")
+    private Date csrq;
+
+    /**
+     * gj
+     */
+    @ApiModelProperty("gj")
+    private String gj;
+
+    /**
+     * gj_dm
+     */
+    @ApiModelProperty("gj_dm")
+    private String gjDm;
+
+    /**
+     * gmsfhm
+     */
+    @ApiModelProperty("gmsfhm")
+    private String gmsfhm;
+
+    /**
+     * qtzjhm
+     */
+    @ApiModelProperty("qtzjhm")
+    private String qtzjhm;
+
+    /**
+     * mz
+     */
+    @ApiModelProperty("mz")
+    private String mz;
+
+    /**
+     * mz_dm
+     */
+    @ApiModelProperty("mz_dm")
+    private String mzDm;
+
+    /**
+     * jg
+     */
+    @ApiModelProperty("jg")
+    private String jg;
+
+    /**
+     * jg_dm
+     */
+    @ApiModelProperty("jg_dm")
+    private String jgDm;
+
+    /**
+     * hjdqh
+     */
+    @ApiModelProperty("hjdqh")
+    private String hjdqh;
+
+    /**
+     * hjdqh_dm
+     */
+    @ApiModelProperty("hjdqh_dm")
+    private String hjdqhDm;
+
+    /**
+     * hjdxz
+     */
+    @ApiModelProperty("hjdxz")
+    private String hjdxz;
+
+    /**
+     * hjdpcs
+     */
+    @ApiModelProperty("hjdpcs")
+    private String hjdpcs;
+
+    /**
+     * hjdpcsdm
+     */
+    @ApiModelProperty("hjdpcsdm")
+    private String hjdpcsdm;
+
+    /**
+     * xzdqh
+     */
+    @ApiModelProperty("xzdqh")
+    private String xzdqh;
+
+    /**
+     * xzdqh_dm
+     */
+    @ApiModelProperty("xzdqh_dm")
+    private String xzdqhDm;
+
+    /**
+     * xzxxdz
+     */
+    @ApiModelProperty("xzxxdz")
+    private String xzxxdz;
+
+    /**
+     * xzdpcs
+     */
+    @ApiModelProperty("xzdpcs")
+    private String xzdpcs;
+
+    /**
+     * xzdpcsdm
+     */
+    @ApiModelProperty("xzdpcsdm")
+    private String xzdpcsdm;
+
+    /**
+     * gxdw
+     */
+    @ApiModelProperty("gxdw")
+    private String gxdw;
+
+    /**
+     * gxdwjgdm
+     */
+    @ApiModelProperty("gxdwjgdm")
+    private String gxdwjgdm;
+
+    /**
+     * ladw
+     */
+    @ApiModelProperty("ladw")
+    private String ladw;
+
+    /**
+     * ladwjgdm
+     */
+    @ApiModelProperty("ladwjgdm")
+    private String ladwjgdm;
+
+    /**
+     * zjlasj
+     */
+    @ApiModelProperty("zjlasj")
+    private Date zjlasj;
+
+    /**
+     * nrbjzdryksj
+     */
+    @ApiModelProperty("nrbjzdryksj")
+    private Date nrbjzdryksj;
+
+    /**
+     * zdrylbbj
+     */
+    @ApiModelProperty("zdrylbbj")
+    private String zdrylbbj;
+
+    /**
+     * zdryxl
+     */
+    @ApiModelProperty("zdryxl")
+    private String zdryxl;
+
+    /**
+     * zdryxl_dm
+     */
+    @ApiModelProperty("zdryxl_dm")
+    private String zdryxlDm;
+
+    /**
+     * yxx
+     */
+    @ApiModelProperty("yxx")
+    private String yxx;
+
+    /**
+     * yxx_dm
+     */
+    @ApiModelProperty("yxx_dm")
+    private String yxxDm;
+
+    /**
+     * jlxzsj
+     */
+    @ApiModelProperty("jlxzsj")
+    private Date jlxzsj;
+
+    /**
+     * jlcxsj
+     */
+    @ApiModelProperty("jlcxsj")
+    private Date jlcxsj;
+
+    /**
+     * jlbgsj
+     */
+    @ApiModelProperty("jlbgsj")
+    private Date jlbgsj;
+
+    /**
+     * sender
+     */
+    @ApiModelProperty("sender")
+    private String sender;
+
+    /**
+     * sender_dm
+     */
+    @ApiModelProperty("sender_dm")
+    private String senderDm;
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private String id;
+
+    /**
+     * rksj
+     */
+    @ApiModelProperty("rksj")
+    private Date rksj;
+
+    /**
+     * 照片id集合
+     */
+    @ApiModelProperty("照片id集合")
+    private String fileids;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjZl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjZl.java
new file mode 100644
index 0000000..74cf2c2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjZl.java
@@ -0,0 +1,94 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/12/06
+ * 泸州拓尔思指令对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA.T_ALARM_YJZL")
+@ApiModel(value = "TAlarmYjZl 对象", description = "泸州拓尔思指令对象")
+public class TAlarmYjZl implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "布控主键")
+    private String bkzj;
+
+    @ApiModelProperty(value = "指令发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "指令本身状态（0未签收 1正常签收 2超时签收 3已下发 4正常反馈 5超时反馈）已下发暂时没用了")
+    private Integer status;
+
+    @ApiModelProperty(value = "指令级别  红黄蓝")
+    private Integer lev;
+
+    @ApiModelProperty(value = "活动来源表英文名")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "指令编号")
+    private String zlbh;
+
+    @ApiModelProperty(value = "指令类型（10常控20临控）")
+    private Integer zllx;
+
+    @ApiModelProperty(value = "签署时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date lastupdatetime;
+
+    @ApiModelProperty(value = "人员细类（用于展示）")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码（用于判断查看权限）")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "活动来源表中文名")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "布控来源表")
+    private String bklyb;
+
+    @ApiModelProperty(value = "布控来源主键")
+    private String bklyzj;
+
+    @ApiModelProperty(value = "预警类型（1身份证2车辆3虚拟身份）")
+    private Integer yjlx;
+
+    @ApiModelProperty(value = "产生该条预警指令的预警轨迹id")
+    private String yjgjid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjgj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjgj.java
new file mode 100644
index 0000000..34ac3c7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmYjgj.java
@@ -0,0 +1,157 @@
+package com.mosty.base.model.entity.lzother;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/20
+ * 泸州拓尔思预警轨迹表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA.T_ALARM_YJGJ")
+@ApiModel(value = "TAlarmYjgj 对象", description = "泸州拓尔思预警对象")
+public class TAlarmYjgj implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "活动发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date hdfssj;
+
+    @ApiModelProperty(value = "活动发生地点")
+    private String hdfsdd;
+
+    @ApiModelProperty(value = "活动详情")
+    private String hdxq;
+
+    @ApiModelProperty(value = "活动来源主键")
+    private String hdlyzj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "活动发生地详址")
+    private String hdfsdxz;
+
+    @ApiModelProperty(value = "活动发生地区划代码")
+    private String hdfsdqh;
+
+    @ApiModelProperty(value = "活动来源表名")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "活动地点经度")
+    private BigDecimal hdjd;
+
+    @ApiModelProperty(value = "活动地点纬度")
+    private BigDecimal hdwd;
+
+    @ApiModelProperty(value = "预警指令id")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "活动来源中文说明")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "布控来源")
+    private Integer yjly;
+
+    @ApiModelProperty(value = "布控来源主键")
+    private String yjlyzj;
+
+    @ApiModelProperty(value = "布控虚拟来源类型")
+    private String xnlylx;
+
+    @ApiModelProperty(value = "布控来源级别")
+    private String yjlyjb;
+
+    @ApiModelProperty(value = "通道状态位")
+    private Integer tdzt;
+
+    @ApiModelProperty(value = "预警照片id集合")
+    private String fileids;
+
+    @ApiModelProperty(value = "预警来源表")
+    private String yjlyb;
+
+    @ApiModelProperty(value = "关联身份证号")
+    private String glsfzh;
+
+    @ApiModelProperty(value = "关联其他号码")
+    private String glqthm;
+
+    @ApiModelProperty(value = "关联姓名")
+    private String glxm;
+
+    @ApiModelProperty(value = "")
+    private Integer bklx;
+
+    @ApiModelProperty(value = "人员细类（用于展示）")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码（用于判断权限）")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "申请人证件号码")
+    private String sqrzjhm;
+
+    @ApiModelProperty(value = "申请人单位代号")
+    private String sqrdwdh;
+
+    @ApiModelProperty(value = "布控信息主键")
+    private String bkxxzj;
+
+    @ApiModelProperty(value = "是否发送至活动地派出所")
+    private Integer issendtolocal;
+
+    @ApiModelProperty(value = "活动地派出所单位代码")
+    private String localunitcode;
+
+    @ApiModelProperty(value = "是否已经判断活动地派出所")
+    private Integer isjudgelocal;
+
+    @ApiModelProperty(value = "是否发送至活动地社区")
+    private Integer issendtocommunity;
+
+    @ApiModelProperty(value = "活动地社区代码")
+    private String localcommunitycode;
+
+    @ApiModelProperty(value = "是否已经判断活动地社区")
+    private String isjudgecommunity;
+
+    @ApiModelProperty(value = "类型（0本地1阿里）")
+    private String type;
+
+    @ApiModelProperty(value = "预警照片地址")
+    private String picurls;
+
+    @ApiModelProperty(value = "数据进入到kafka时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date kafkatime;
+
+    @ApiModelProperty(value = "活动结束时间（网吧旅店类有二次活动的数据使用标识退房下网时间）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date hdjssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmZtry.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmZtry.java
new file mode 100644
index 0000000..01ee3aa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/TAlarmZtry.java
@@ -0,0 +1,759 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author
+ * @description t_alarm_ztry
+ * @date 2022-06-18
+ */
+@ApiModel(value = "拓尔思在逃人员信息表")
+@Data
+@Accessors(chain = true)
+@TableName(value = "TRS_BIGDATA.T_ALARM_ZTRY")
+public class TAlarmZtry implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ztrybh
+     */
+    @ApiModelProperty("ztrybh")
+    private String ztrybh;
+
+    /**
+     * ajlbdm
+     */
+    @ApiModelProperty("ajlbdm")
+    private String ajlbdm;
+
+    /**
+     * ajlbdm_code
+     */
+    @ApiModelProperty("ajlbdm_code")
+    private String ajlbdmCode;
+
+    /**
+     * ajsl
+     */
+    @ApiModelProperty("ajsl")
+    private String ajsl;
+
+    /**
+     * asjbh
+     */
+    @ApiModelProperty("asjbh")
+    private String asjbh;
+
+    /**
+     * asjswry_rs
+     */
+    @ApiModelProperty("asjswry_rs")
+    private String asjswryRs;
+
+    /**
+     * bdb_pdbz
+     */
+    @ApiModelProperty("bdb_pdbz")
+    private String bdbPdbz;
+
+    /**
+     * bdb_pdbz_code
+     */
+    @ApiModelProperty("bdb_pdbz_code")
+    private String bdbPdbzCode;
+
+    /**
+     * bik_jssj
+     */
+    @ApiModelProperty("bik_jssj")
+    private String bikJssj;
+
+    /**
+     * bik_kssj
+     */
+    @ApiModelProperty("bik_kssj")
+    private String bikKssj;
+
+    /**
+     * bmch
+     */
+    @ApiModelProperty("bmch")
+    private String bmch;
+
+    /**
+     * bz
+     */
+    @ApiModelProperty("bz")
+    private String bz;
+
+    /**
+     * csrq
+     */
+    @ApiModelProperty("csrq")
+    private Date csrq;
+
+    /**
+     * csrq_nl
+     */
+    @ApiModelProperty("csrq_nl")
+    private String csrqNl;
+
+    /**
+     * cxdw_gajgjgdm
+     */
+    @ApiModelProperty("cxdw_gajgjgdm")
+    private String cxdwGajgjgdm;
+
+    /**
+     * cxdw_gajgjgdm_code
+     */
+    @ApiModelProperty("cxdw_gajgjgdm_code")
+    private String cxdwGajgjgdmCode;
+
+    /**
+     * cxdw_gajgmc
+     */
+    @ApiModelProperty("cxdw_gajgmc")
+    private String cxdwGajgmc;
+
+    /**
+     * cxsj
+     */
+    @ApiModelProperty("cxsj")
+    private Date cxsj;
+
+    /**
+     * cxspdw_gajgjgdm_code
+     */
+    @ApiModelProperty("cxspdw_gajgjgdm_code")
+    private String cxspdwGajgjgdmCode;
+
+    /**
+     * cxspsftg_pdbz_code
+     */
+    @ApiModelProperty("cxspsftg_pdbz_code")
+    private String cxspsftgPdbzCode;
+
+    /**
+     * cym
+     */
+    @ApiModelProperty("cym")
+    private String cym;
+
+    /**
+     * cyzjdm
+     */
+    @ApiModelProperty("cyzjdm")
+    private String cyzjdm;
+
+    /**
+     * cyzjdm_code
+     */
+    @ApiModelProperty("cyzjdm_code")
+    private String cyzjdmCode;
+
+    /**
+     * cyzj_zjhm_code
+     */
+    @ApiModelProperty("cyzj_zjhm_code")
+    private String cyzjZjhmCode;
+
+    /**
+     * djspdw_gajgjgdm_code
+     */
+    @ApiModelProperty("djspdw_gajgjgdm_code")
+    private String djspdwGajgjgdmCode;
+
+    /**
+     * djspsftg_pdbz_code
+     */
+    @ApiModelProperty("djspsftg_pdbz_code")
+    private String djspsftgPdbzCode;
+
+    /**
+     * fzxyrdaztdm
+     */
+    @ApiModelProperty("fzxyrdaztdm")
+    private String fzxyrdaztdm;
+
+    /**
+     * fzxyrdaztdm_code
+     */
+    @ApiModelProperty("fzxyrdaztdm_code")
+    private String fzxyrdaztdmCode;
+
+    /**
+     * gjdm
+     */
+    @ApiModelProperty("gjdm")
+    private String gjdm;
+
+    /**
+     * gjdm_code
+     */
+    @ApiModelProperty("gjdm_code")
+    private String gjdmCode;
+
+    /**
+     * hjdz_dzmc
+     */
+    @ApiModelProperty("hjdz_dzmc")
+    private String hjdzDzmc;
+
+    /**
+     * hjdz_xzqhdm
+     */
+    @ApiModelProperty("hjdz_xzqhdm")
+    private String hjdzXzqhdm;
+
+    /**
+     * hjdz_xzqhdm_code
+     */
+    @ApiModelProperty("hjdz_xzqhdm_code")
+    private String hjdzXzqhdmCode;
+
+    /**
+     * hstbdqrq
+     */
+    @ApiModelProperty("hstbdqrq")
+    private String hstbdqrq;
+
+    /**
+     * hstbhm
+     */
+    @ApiModelProperty("hstbhm")
+    private String hstbhm;
+
+    /**
+     * iszt
+     */
+    @ApiModelProperty("iszt")
+    private Integer iszt;
+
+    /**
+     * jgssxdm
+     */
+    @ApiModelProperty("jgssxdm")
+    private String jgssxdm;
+
+    /**
+     * jgssxdm_code
+     */
+    @ApiModelProperty("jgssxdm_code")
+    private String jgssxdmCode;
+
+    /**
+     * jnwqxdm
+     */
+    @ApiModelProperty("jnwqxdm")
+    private String jnwqxdm;
+
+    /**
+     * jnwqxdm_code
+     */
+    @ApiModelProperty("jnwqxdm_code")
+    private String jnwqxdmCode;
+
+    /**
+     * jwzbxzdw_dwmc
+     */
+    @ApiModelProperty("jwzbxzdw_dwmc")
+    private String jwzbxzdwDwmc;
+
+    /**
+     * jyaq
+     */
+    @ApiModelProperty("jyaq")
+    private String jyaq;
+
+    /**
+     * ladwfldm
+     */
+    @ApiModelProperty("ladwfldm")
+    private String ladwfldm;
+
+    /**
+     * ladwfldm_code
+     */
+    @ApiModelProperty("ladwfldm_code")
+    private String ladwfldmCode;
+
+    /**
+     * ladw_gajgjgdm
+     */
+    @ApiModelProperty("ladw_gajgjgdm")
+    private String ladwGajgjgdm;
+
+    /**
+     * ladw_gajgjgdm_code
+     */
+    @ApiModelProperty("ladw_gajgjgdm_code")
+    private String ladwGajgjgdmCode;
+
+    /**
+     * ladw_gajgmc
+     */
+    @ApiModelProperty("ladw_gajgmc")
+    private String ladwGajgmc;
+
+    /**
+     * larq
+     */
+    @ApiModelProperty("larq")
+    private Date larq;
+
+    /**
+     * lastupdatetime
+     */
+    @ApiModelProperty("lastupdatetime")
+    private Date lastupdatetime;
+
+    /**
+     * mzdm
+     */
+    @ApiModelProperty("mzdm")
+    private String mzdm;
+
+    /**
+     * mzdm_code
+     */
+    @ApiModelProperty("mzdm_code")
+    private String mzdmCode;
+
+    /**
+     * nlsx
+     */
+    @ApiModelProperty("nlsx")
+    private String nlsx;
+
+    /**
+     * nlxx
+     */
+    @ApiModelProperty("nlxx")
+    private String nlxx;
+
+    /**
+     * rycjqryj
+     */
+    @ApiModelProperty("rycjqryj")
+    private String rycjqryj;
+
+    /**
+     * ryzt
+     */
+    @ApiModelProperty("ryzt")
+    private String ryzt;
+
+    /**
+     * sfcxtjl_pdbz
+     */
+    @ApiModelProperty("sfcxtjl_pdbz")
+    private String sfcxtjlPdbz;
+
+    /**
+     * sfcxtjl_pdbz_code
+     */
+    @ApiModelProperty("sfcxtjl_pdbz_code")
+    private String sfcxtjlPdbzCode;
+
+    /**
+     * sgsx
+     */
+    @ApiModelProperty("sgsx")
+    private String sgsx;
+
+    /**
+     * sgxx
+     */
+    @ApiModelProperty("sgxx")
+    private String sgxx;
+
+    /**
+     * ssjzrmby
+     */
+    @ApiModelProperty("ssjzrmby")
+    private String ssjzrmby;
+
+    /**
+     * swsj
+     */
+    @ApiModelProperty("swsj")
+    private String swsj;
+
+    /**
+     * szzwbh
+     */
+    @ApiModelProperty("szzwbh")
+    private String szzwbh;
+
+    /**
+     * tbbjms
+     */
+    @ApiModelProperty("tbbjms")
+    private String tbbjms;
+
+    /**
+     * tjjbdm
+     */
+    @ApiModelProperty("tjjbdm")
+    private String tjjbdm;
+
+    /**
+     * tjjbdm_code
+     */
+    @ApiModelProperty("tjjbdm_code")
+    private String tjjbdmCode;
+
+    /**
+     * tjlbh
+     */
+    @ApiModelProperty("tjlbh")
+    private String tjlbh;
+
+    /**
+     * tmtzms
+     */
+    @ApiModelProperty("tmtzms")
+    private String tmtzms;
+
+    /**
+     * tpfx_jyqk
+     */
+    @ApiModelProperty("tpfx_jyqk")
+    private String tpfxJyqk;
+
+    /**
+     * tpsj
+     */
+    @ApiModelProperty("tpsj")
+    private Date tpsj;
+
+    /**
+     * virtual_zjhm
+     */
+    @ApiModelProperty("virtual_zjhm")
+    private String virtualZjhm;
+
+    /**
+     * whjz
+     */
+    @ApiModelProperty("whjz")
+    private String whjz;
+
+    /**
+     * xbdm
+     */
+    @ApiModelProperty("xbdm")
+    private String xbdm;
+
+    /**
+     * xbdm_code
+     */
+    @ApiModelProperty("xbdm_code")
+    private String xbdmCode;
+
+    /**
+     * xbz_py
+     */
+    @ApiModelProperty("xbz_py")
+    private String xbzPy;
+
+    /**
+     * xm
+     */
+    @ApiModelProperty("xm")
+    private String xm;
+
+    /**
+     * xxczdw_gajgjgdm_code
+     */
+    @ApiModelProperty("xxczdw_gajgjgdm_code")
+    private String xxczdwGajgjgdmCode;
+
+    /**
+     * xxdjdw_gajgjgdm_code
+     */
+    @ApiModelProperty("xxdjdw_gajgjgdm_code")
+    private String xxdjdwGajgjgdmCode;
+
+    /**
+     * xxdjry_gmsfhm
+     */
+    @ApiModelProperty("xxdjry_gmsfhm")
+    private String xxdjryGmsfhm;
+
+    /**
+     * xxdjry_xm
+     */
+    @ApiModelProperty("xxdjry_xm")
+    private String xxdjryXm;
+
+    /**
+     * xxrbksj_rqsj
+     */
+    @ApiModelProperty("xxrbksj_rqsj")
+    private Date xxrbksjRqsj;
+
+    /**
+     * xxsc_pdbz_code
+     */
+    @ApiModelProperty("xxsc_pdbz_code")
+    private String xxscPdbzCode;
+
+    /**
+     * xxzjbh
+     */
+    @ApiModelProperty("xxzjbh")
+    private String xxzjbh;
+
+    /**
+     * xzdwfldm_code
+     */
+    @ApiModelProperty("xzdwfldm_code")
+    private String xzdwfldmCode;
+
+    /**
+     * xzz_dzmc
+     */
+    @ApiModelProperty("xzz_dzmc")
+    private String xzzDzmc;
+
+    /**
+     * xzz_xzqhdm
+     */
+    @ApiModelProperty("xzz_xzqhdm")
+    private String xzzXzqhdm;
+
+    /**
+     * xzz_xzqhdm_code
+     */
+    @ApiModelProperty("xzz_xzqhdm_code")
+    private String xzzXzqhdmCode;
+
+    /**
+     * yjbz
+     */
+    @ApiModelProperty("yjbz")
+    private String yjbz;
+
+    /**
+     * yjbz_code
+     */
+    @ApiModelProperty("yjbz_code")
+    private String yjbzCode;
+
+    /**
+     * yjmm
+     */
+    @ApiModelProperty("yjmm")
+    private String yjmm;
+
+    /**
+     * ywzt
+     */
+    @ApiModelProperty("ywzt")
+    private String ywzt;
+
+    /**
+     * ywzt_code
+     */
+    @ApiModelProperty("ywzt_code")
+    private String ywztCode;
+
+    /**
+     * zatz_jyqk
+     */
+    @ApiModelProperty("zatz_jyqk")
+    private String zatzJyqk;
+
+    /**
+     * zbdwfldm
+     */
+    @ApiModelProperty("zbdwfldm")
+    private String zbdwfldm;
+
+    /**
+     * zbdwfldm_code
+     */
+    @ApiModelProperty("zbdwfldm_code")
+    private String zbdwfldmCode;
+
+    /**
+     * zbdw_gajgjgdm
+     */
+    @ApiModelProperty("zbdw_gajgjgdm")
+    private String zbdwGajgjgdm;
+
+    /**
+     * zbdw_gajgjgdm_code
+     */
+    @ApiModelProperty("zbdw_gajgjgdm_code")
+    private String zbdwGajgjgdmCode;
+
+    /**
+     * zbdw_gajgmc
+     */
+    @ApiModelProperty("zbdw_gajgmc")
+    private String zbdwGajgmc;
+
+    /**
+     * zbr_gmsfhm
+     */
+    @ApiModelProperty("zbr_gmsfhm")
+    private String zbrGmsfhm;
+
+    /**
+     * zbr_lxdh
+     */
+    @ApiModelProperty("zbr_lxdh")
+    private String zbrLxdh;
+
+    /**
+     * zbr_xm
+     */
+    @ApiModelProperty("zbr_xm")
+    private String zbrXm;
+
+    /**
+     * zhdd_dzmc
+     */
+    @ApiModelProperty("zhdd_dzmc")
+    private String zhddDzmc;
+
+    /**
+     * zhdd_xzqhdm
+     */
+    @ApiModelProperty("zhdd_xzqhdm")
+    private String zhddXzqhdm;
+
+    /**
+     * zhdd_xzqhdm_code
+     */
+    @ApiModelProperty("zhdd_xzqhdm_code")
+    private String zhddXzqhdmCode;
+
+    /**
+     * zhdwfldm
+     */
+    @ApiModelProperty("zhdwfldm")
+    private String zhdwfldm;
+
+    /**
+     * zhdwfldm_code
+     */
+    @ApiModelProperty("zhdwfldm_code")
+    private String zhdwfldmCode;
+
+    /**
+     * zhdw_gajgjgdm_code
+     */
+    @ApiModelProperty("zhdw_gajgjgdm_code")
+    private String zhdwGajgjgdmCode;
+
+    /**
+     * zhdw_gajgmc
+     */
+    @ApiModelProperty("zhdw_gajgmc")
+    private String zhdwGajgmc;
+
+    /**
+     * zhfsdm
+     */
+    @ApiModelProperty("zhfsdm")
+    private String zhfsdm;
+
+    /**
+     * zhfsdm_code
+     */
+    @ApiModelProperty("zhfsdm_code")
+    private String zhfsdmCode;
+
+    /**
+     * zhfzxyr_pdbz
+     */
+    @ApiModelProperty("zhfzxyr_pdbz")
+    private String zhfzxyrPdbz;
+
+    /**
+     * zhfzxyr_pdbz_code
+     */
+    @ApiModelProperty("zhfzxyr_pdbz_code")
+    private String zhfzxyrPdbzCode;
+
+    /**
+     * zhrq
+     */
+    @ApiModelProperty("zhrq")
+    private Date zhrq;
+
+    /**
+     * zjcjrq
+     */
+    @ApiModelProperty("zjcjrq")
+    private String zjcjrq;
+
+    /**
+     * zjhm
+     */
+    @ApiModelProperty("zjhm")
+    private String zjhm;
+
+    /**
+     * ztjj
+     */
+    @ApiModelProperty("ztjj")
+    private String ztjj;
+
+    /**
+     * ztjjdx_jyqk
+     */
+    @ApiModelProperty("ztjjdx_jyqk")
+    private String ztjjdxJyqk;
+
+    /**
+     * ztrylxdm
+     */
+    @ApiModelProperty("ztrylxdm")
+    private String ztrylxdm;
+
+    /**
+     * ztrylxdm_code
+     */
+    @ApiModelProperty("ztrylxdm_code")
+    private String ztrylxdmCode;
+
+    /**
+     * ztry_dnabh
+     */
+    @ApiModelProperty("ztry_dnabh")
+    private String ztryDnabh;
+
+    /**
+     * zylbdm
+     */
+    @ApiModelProperty("zylbdm")
+    private String zylbdm;
+
+    /**
+     * zylbdm_code
+     */
+    @ApiModelProperty("zylbdm_code")
+    private String zylbdmCode;
+
+    /**
+     * zy_pk
+     */
+    @ApiModelProperty("zy_pk")
+    private String zyPk;
+
+    public TAlarmZtry() {
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VJcxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VJcxx.java
new file mode 100644
index 0000000..4c1579f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VJcxx.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/12/15
+ * 泸州警情类别类型表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("LZTXJ.V_JCXX")
+@ApiModel(value = "VJcxx 对象", description = "泸州警情类别类型表")
+public class VJcxx implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "编号")
+    private String sId;
+
+    @ApiModelProperty(value = "说明")
+    private String sDescription;
+
+    @ApiModelProperty("父级编号")
+    private String sParent;
+
+    @ApiModelProperty("排序")
+    private String nSequence;
+
+    @ApiModelProperty("")
+    private String sScope;
+
+    @ApiModelProperty("")
+    private String nDisuse;
+
+    @ApiModelProperty("")
+    private String nNetbreak;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VLz110Txj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VLz110Txj.java
new file mode 100644
index 0000000..6aefa7f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/VLz110Txj.java
@@ -0,0 +1,141 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/12/15
+ * 泸州特巡警警情110对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("LZTXJ.V_LZ110TXJ")
+@ApiModel(value = "VLz110Txj 对象", description = "泸州特巡警警情110对象")
+public class VLz110Txj implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "行政区划编号")
+    private String xzqhbh;
+
+    @ApiModelProperty(value = "接警单位编号")
+    private String jjdwbh;
+
+    @ApiModelProperty("接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty("关联接警单编号")
+    private String gljjdbh;
+
+    @ApiModelProperty("来话类型编号")
+    private String lhlxbh;
+
+    @ApiModelProperty("报警方式编号")
+    private String bjfsbh;
+
+    @ApiModelProperty("特服号码")
+    private String tfhm;
+
+    @ApiModelProperty("接警员编号")
+    private String jjybh;
+
+    @ApiModelProperty("接警员姓名")
+    private String jjyxm;
+
+    @ApiModelProperty("报警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bjsj;
+
+    @ApiModelProperty("接警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jjsj;
+
+    @ApiModelProperty("报警电话")
+    private String bjdh;
+
+    @ApiModelProperty("报警电话用户姓名")
+    private String bjdhyhxm;
+
+    @ApiModelProperty("报警电话用户地址")
+    private String bjdhyhdz;
+
+    @ApiModelProperty("报警人姓名")
+    private String bjrxm;
+
+    @ApiModelProperty("报警人性别")
+    private String bjrxb;
+
+    @ApiModelProperty("联系电话")
+    private String lxdh;
+
+    @ApiModelProperty("事发地址")
+    private String sfdz;
+
+    @ApiModelProperty("报警内容")
+    private String bjnr;
+
+    @ApiModelProperty("管辖单位编号")
+    private String gxdwbh;
+
+    @ApiModelProperty("报警类别")
+    private String bjlb;
+
+    @ApiModelProperty("报警类型")
+    private String bjlx;
+
+    @ApiModelProperty("报警细类")
+    private String bjxl;
+
+    @ApiModelProperty("自动定位x坐标（报警人位置）")
+    private BigDecimal zddwxzb;
+
+    @ApiModelProperty("自动定位y坐标（报警人位置）")
+    private BigDecimal zddwyzb;
+
+    @ApiModelProperty("手动定位x坐标（报警人位置）")
+    private BigDecimal sddwxzb;
+
+    @ApiModelProperty("手动定位y坐标（报警人位置）")
+    private BigDecimal sddwyzb;
+
+    @ApiModelProperty("补充接警内容")
+    private String bcjjnr;
+
+    @ApiModelProperty("入库时间戳")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rksjc;
+
+    @ApiModelProperty("更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gxsj;
+
+    @ApiModelProperty("更新人姓名")
+    private String gxrxm;
+
+    @ApiModelProperty("反馈要求")
+    private String fkyq;
+
+    @ApiModelProperty("案件状态")
+    private String ajzt;
+
+    @ApiModelProperty("有无效案件标识（0 无效 1有效）")
+    private String ywxajbs;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/ZhjmxfXfqwXfqyGzdw.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/ZhjmxfXfqwXfqyGzdw.java
new file mode 100644
index 0000000..8c0bce8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/lzother/ZhjmxfXfqwXfqyGzdw.java
@@ -0,0 +1,160 @@
+package com.mosty.base.model.entity.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/20
+ * 泸州海康感知源表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ZHJMXF_NEW.ZHJMXF_XFQW_XFQY_GZDW")
+@ApiModel(value = "ZhjmxfXfqwXfqyGzdw 对象", description = "泸州海康感知源表")
+public class ZhjmxfXfqwXfqyGzdw implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "巡防区域ID")
+    private String xfqyid;
+
+    @ApiModelProperty(value = "设备对象标识")
+    private String sbdxbs;
+
+    @ApiModelProperty(value = "巡区对象标识")
+    private String xqdxbs;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "厂商名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "IP地址")
+    private String ipdz;
+
+    @ApiModelProperty(value = "IPV6地址")
+    private String ipv6dz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String azddXzqhdm;
+
+    @ApiModelProperty(value = "地址名称")
+    private String azddDzmc;
+
+    @ApiModelProperty(value = "公安机关机构代码")
+    private String gajgjgdm;
+
+    @ApiModelProperty(value = "公安机关名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "感知设备类型代码")
+    private String gzsblxdm;
+
+    @ApiModelProperty(value = "采集数据类型代码")
+    private String cjsjlxdm;
+
+    @ApiModelProperty(value = "监视方向代码")
+    private String jsfxdm;
+
+    @ApiModelProperty(value = "监视区域说明")
+    private String jsqysm;
+
+    @ApiModelProperty(value = "摄像机位置类型代码")
+    private String sxjwzlxdm;
+
+    @ApiModelProperty(value = "摄像机用途代码")
+    private String sxjytdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "采集时间")
+    private String xtCjsj;
+
+    @ApiModelProperty(value = "录入时间")
+    private String xtLrsj;
+
+    @ApiModelProperty(value = "录入人姓名")
+    private String xtLrrxm;
+
+    @ApiModelProperty(value = "录入人ID")
+    private String xtLrrid;
+
+    @ApiModelProperty(value = "录入人部门")
+    private String xtLrrbm;
+
+    @ApiModelProperty(value = "录入人部门ID")
+    private String xtLrrbmid;
+
+    @ApiModelProperty(value = "录入IP")
+    private String xtLrip;
+
+    @ApiModelProperty(value = "最后修改时间")
+    private String xtZhxgsj;
+
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String xtZhxgrxm;
+
+    @ApiModelProperty(value = "最后修改人ID")
+    private String xtZhxgrid;
+
+    @ApiModelProperty(value = "最后修改人部门")
+    private String xtZhxgrbm;
+
+    @ApiModelProperty(value = "最后修改人部门ID")
+    private String xtZhxgrbmid;
+
+    @ApiModelProperty(value = "最后修改IP")
+    private String xtZhxgip;
+
+    @ApiModelProperty(value = "注销标志")
+    private String xtZxbz;
+
+    @ApiModelProperty(value = "注销原因")
+    private String xtZxyy;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "所属分县局名称")
+    private String ssfxjmc;
+
+    @ApiModelProperty(value = "所属分县局代码")
+    private String ssfxjdm;
+
+    @ApiModelProperty(value = "所属地市州名称")
+    private String ssdszmc;
+
+    @ApiModelProperty(value = "所属地市州代码")
+    private String ssdszdm;
+
+    @ApiModelProperty(value = "所属省直辖市自治区特别行政区名称")
+    private String ssstmc;
+
+    @ApiModelProperty(value = "所属省直辖市自治区特别行政区代码")
+    private String ssstdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbb.java
new file mode 100644
index 0000000..e90a24f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbb.java
@@ -0,0 +1,123 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb")
+@ApiModel(value="TbQwBmjlbb对象", description="部门每日警力报备表")
+public class TbQwBmjlbb extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "是否节假日")
+    private String sfjjr;
+
+    @ApiModelProperty(value = "节假日名称")
+    private String jjrmc;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务等级代码")
+    private String qwdjdm;
+
+    @ApiModelProperty(value = "勤务等级")
+    private String qwdj;
+
+    @ApiModelProperty(value = "报备日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date bbrq;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date jssj;
+
+    @ApiModelProperty(value = "部门民警数量")
+    private Integer bmmjsl;
+
+    @ApiModelProperty(value = "部门辅警数量")
+    private Integer bmfjsl;
+
+    @ApiModelProperty(value = "在岗民警数量（冗余存储方便统计）")
+    private Integer zgmjsl;
+
+    @ApiModelProperty(value = "在岗民警（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zgmj;
+
+    @ApiModelProperty(value = "在岗辅警数量（冗余存储方便统计）")
+    private Integer zgfjsl;
+
+    @ApiModelProperty(value = "在岗辅警（此处存辅警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zgfj;
+
+    @ApiModelProperty(value = "值班警力数量（冗余存储方便统计）")
+    private Integer zbjlsl;
+
+    @ApiModelProperty(value = "值班警力（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zbjl;
+
+    @ApiModelProperty(value = "不在岗民警数量（冗余存储方便统计）")
+    private Integer bzmjlsl;
+
+    @ApiModelProperty(value = "不在岗民警（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String bzgmj;
+
+    @ApiModelProperty(value = "不在岗辅警数量（冗余存储方便统计）")
+    private Integer bzgfjsl;
+
+    @ApiModelProperty(value = "不在岗辅警（此处存辅警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String bzgfj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbbJlmx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbbJlmx.java
new file mode 100644
index 0000000..3a9d144
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwBmjlbbJlmx.java
@@ -0,0 +1,103 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 部门每日警力报备-警力明细
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb_jlmx")
+@ApiModel(value = "TbQwBmjlbbJlmx对象", description = "部门每日警力报备-警力明细")
+public class TbQwBmjlbbJlmx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警力报备ID")
+    private String jlbbId;
+
+    @ApiModelProperty(value = "警力ID")
+    private String jlId;
+
+    @ApiModelProperty(value = "报备日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bbrq;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String sfzh;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "性别代码（0男 1女 2未知）")
+    private String xbdm;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer nl;
+
+    @ApiModelProperty(value = "警力状态（0 不在岗 1 在岗）")
+    private String jlzt;
+
+    @ApiModelProperty(value = "报备类型（1 在岗民警，2 在岗辅警 3 值班警力 4 不在岗民警 5 不在岗辅警）")
+    private String bblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwCl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwCl.java
new file mode 100644
index 0000000..54c7132
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwCl.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-车辆表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_cl")
+@ApiModel(value="TbQwCl对象", description="巡防排班或报备或值班-车辆表")
+public class TbQwCl extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID（巡防排班或巡防报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "勤务车辆ID")
+    private String clId;
+
+    @ApiModelProperty(value = "机动车号牌号码")
+    private String jdchphm;
+
+    @ApiModelProperty(value = "机动车号牌种类代码（字典）")
+    private String jdchpzldm;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "关联GPSID")
+    private String gpsId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwFa.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwFa.java
new file mode 100644
index 0000000..9486ed2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwFa.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_fa")
+@ApiModel(value = "TbQwFa对象", description = "巡防方案")
+public class TbQwFa extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "附件")
+    private String fj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJjr.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJjr.java
new file mode 100644
index 0000000..a6576c1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJjr.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_jjr")
+@ApiModel(value = "TbQwJjr对象", description = "节假日表")
+public class TbQwJjr extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "日期类型0-节假日，1-工作日")
+    private String rqlx;
+
+    @ApiModelProperty(value = "节假日")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String jjrq;
+
+    @ApiModelProperty(value = "节假日名称")
+    private String jjrmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJl.java
new file mode 100644
index 0000000..c2e78d0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJl.java
@@ -0,0 +1,85 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_jl")
+@ApiModel(value="TbQwJl对象", description="巡防排班或报备或值班-警力表")
+public class TbQwJl extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID（巡防排班或巡防报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "警力ID")
+    private String jlId;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlxm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "性别代码（0男 1女 2未知）")
+    private String xbdm;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "年龄")
+    private Integer nl;
+
+    @ApiModelProperty(value = "警力状态（0 不在岗 1 在岗）")
+    private String jlzt;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJyqx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJyqx.java
new file mode 100644
index 0000000..a51d46b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwJyqx.java
@@ -0,0 +1,77 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-警用器械表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_jyqx")
+@ApiModel(value="TbQwJyqx对象", description="巡防排班或报备或值班-警用器械表")
+public class TbQwJyqx extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID（巡防排班或巡防报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "器械名称")
+    private String qxmc;
+
+    @ApiModelProperty(value = "器械类型（参考字典）")
+    private String qxlx;
+
+    @ApiModelProperty(value = "警用器械数量")
+    private Integer qxsl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwbc.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwbc.java
new file mode 100644
index 0000000..039e414
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwbc.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.sql.Time;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 勤务班次表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qwbc")
+@ApiModel(value="TbQwQwbc对象", description="勤务班次表")
+public class TbQwQwbc extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "班次名称")
+    private String bcmc;
+
+    @ApiModelProperty(value = "班次开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Time kssj;
+
+    @ApiModelProperty(value = "班次结束时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Time jssj;
+
+    @ApiModelProperty(value = "排班级别（01 市级  02 县级 03 科所队 ）")
+    private String pbjb;
+
+    @ApiModelProperty(value = "跨天数")
+    private Integer kts;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "班次类型（01 勤务值班 02 巡防排班）")
+    private String bclx;
+
+    @ApiModelProperty(value = "班次颜色")
+    private String bcys;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwdj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwdj.java
new file mode 100644
index 0000000..6194a42
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQwdj.java
@@ -0,0 +1,120 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qwdj")
+@ApiModel(value="TbQwQwdj对象", description="勤务等级表")
+public class TbQwQwdj extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "勤务等级名称")
+    private String qwdjmc;
+
+    @ApiModelProperty(value = "勤务原因")
+    private String qwyy;
+
+    @ApiModelProperty(value = "勤务要求")
+    private String qwyq;
+
+    @ApiModelProperty(value = "执行范围执行范围：01-全省、02-全市、03-全县、04-部门")
+    private String zxfw;
+
+    @ApiModelProperty(value = "勤务开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qwkssj;
+
+    @ApiModelProperty(value = "勤务结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qwjssj;
+
+    @ApiModelProperty(value = "建议执勤人员比例 大于0小于100的正整数 ")
+    private String jyzqrybl;
+
+    @ApiModelProperty(value = "建议执勤车辆比例 大于0小于100的正整数 ")
+    private String jyzqclbl;
+
+    @ApiModelProperty(value = "附件地址")
+    private String fjdz;
+
+    @ApiModelProperty(value = "等级颜色")
+    private String djys;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrId;
+
+    @ApiModelProperty(value = "配置人姓名")
+    private String pzrXm;
+
+    @ApiModelProperty(value = "配置人身份证号")
+    private String pzrSfzh;
+
+    @ApiModelProperty(value = "配置人所属部门名称")
+    private String pzrSsbm;
+
+    @ApiModelProperty(value = "配置人所属部门id")
+    private String pzrSsbmid;
+
+    @ApiModelProperty(value = "配置人所属部门代码")
+    private String pzrSsbmdm;
+
+    @ApiModelProperty(value = "发布状态（0 未发布  1已发布  2.已结束）")
+    private String fbzt;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "是否发送到下级 0 否 1是")
+    private String sfxj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQxj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQxj.java
new file mode 100644
index 0000000..f416922
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwQxj.java
@@ -0,0 +1,100 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qxj")
+@ApiModel(value="TbQwQxj对象", description="请休假")
+public class TbQwQxj extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "申请人类型（01-民警 02-辅警）")
+    private String sqrlx;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "申请部门名称")
+    private String sqbm;
+
+    @ApiModelProperty(value = "申请部门代码")
+    private String sqbmdm;
+
+    @ApiModelProperty(value = "申请部门id")
+    private String sqbmid;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrXm;
+
+    @ApiModelProperty(value = "申请人ID")
+    private String sqrId;
+
+    @ApiModelProperty(value = "请假类型（01 调休  02 事假 03 病假  04 年假 05婚假 06 产假 07 陪产假 08 丧假）字典")
+    private String qjlx;
+
+    @ApiModelProperty(value = "请假开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "请假结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+    @ApiModelProperty(value = "请假时长")
+    private Integer qjsc;
+
+    @ApiModelProperty(value = "请假人身份证号")
+    private String sqrSfzh;
+
+    @ApiModelProperty(value = "请假原因")
+    private String qjyy;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdw.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdw.java
new file mode 100644
index 0000000..ed9e97d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdw.java
@@ -0,0 +1,70 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 世乒赛参赛队伍表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_sps_csdw")
+@ApiModel(value = "TbQwSpsCsdw 对象", description = "世乒赛参赛单位表")
+public class TbQwSpsCsdw extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "参赛队伍名称")
+    private String cddwmc;
+
+    @ApiModelProperty(value = "所属小组")
+    private String ssxz;
+
+    @ApiModelProperty(value = "活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地")
+    private String dqwz;
+
+    @ApiModelProperty(value = "当前位置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date dqwzsj;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdwhdgj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdwhdgj.java
new file mode 100644
index 0000000..8afecd3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwSpsCsdwhdgj.java
@@ -0,0 +1,79 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 世乒赛参赛队伍活动轨迹表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_sps_csdwhdjl")
+@ApiModel(value = "TbQwSpsCsdwhdgj 对象", description = "世乒赛参赛队伍活动轨迹表")
+public class TbQwSpsCsdwhdgj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "参赛队伍id")
+    private String cddwid;
+
+    @ApiModelProperty(value = "参赛队伍名称")
+    private String cddwmc;
+
+    @ApiModelProperty(value = "所属小组")
+    private String ssxz;
+
+    @ApiModelProperty(value = "活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地")
+    private String hdlx;
+
+    @ApiModelProperty(value = "活动时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date hdsj;
+
+    @ApiModelProperty(value = "活动日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date hdrq;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfBxfsq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfBxfsq.java
new file mode 100644
index 0000000..16d848f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfBxfsq.java
@@ -0,0 +1,124 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 不巡防申请
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xf_bxfsq")
+@ApiModel(value = "TbQwXfBxfsq对象", description = "不巡防申请")
+public class TbQwXfBxfsq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrXm;
+
+    @ApiModelProperty(value = "申请人ID")
+    private String sqrId;
+
+    @ApiModelProperty(value = "申请部门")
+    private String sqbm;
+
+    @ApiModelProperty(value = "申请部门id")
+    private String sqbmid;
+
+    @ApiModelProperty(value = "申请部门代码")
+    private String sqbmdm;
+
+    @ApiModelProperty(value = "不巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date bxfsj;
+
+    @ApiModelProperty(value = "不巡防原因")
+    private String bxfyy;
+
+    @ApiModelProperty(value = "审核部门")
+    private String shbm;
+
+    @ApiModelProperty(value = "审核部门id")
+    private String shbmid;
+
+    @ApiModelProperty(value = "审核部门代码")
+    private String shbmdm;
+
+    @ApiModelProperty(value = "审核人ID")
+    private String shrId;
+
+    @ApiModelProperty(value = "审核人姓名")
+    private String shrXm;
+
+    @ApiModelProperty(value = "申请时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sqsj;
+
+    @ApiModelProperty(value = "审核状态（0 未审核 1 审核通过 2 审核失败）")
+    private String shzt;
+
+    @ApiModelProperty(value = "审批意见")
+    private String spyj;
+
+    @ApiModelProperty(value = "审批时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date spsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfbb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfbb.java
new file mode 100644
index 0000000..0dcebd1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfbb.java
@@ -0,0 +1,255 @@
+package com.mosty.base.model.entity.qwzx;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+//import com.mosty.base.manager.bean.vo.TbJcglJzVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfbb")
+@ApiModel(value = "TbQwXfbb对象", description = "巡防报备表")
+public class TbQwXfbb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_QWLX(勤务类型) 00-日常巡防 01-处突 02-维稳 03-警卫 04-安保 05-展会 06-设卡 07-加巡 99-其他")
+    private String qwlx;
+
+    @ApiModelProperty(value = "报备类型  01.正常报备  02.特殊勤务报备")
+    private String bblx;
+
+    @ApiModelProperty(value = "方案类型  01.日常方案  02 特殊方案")
+    private String xlfaLx;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaId;
+
+    @ApiModelProperty(value = "巡逻方案Id")
+    private String xlfaMc;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "巡防部门")
+    private String xfbm;
+
+    @ApiModelProperty(value = "巡防部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "巡防部门ID")
+    private String xfbmid;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "间隔天数")
+    private Integer jgts;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "巡逻状态（0 巡逻中、1 处警中、2 执行指令中）（字典）")
+    private String xfzt;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(value = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "坐标更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zbsj;
+
+    @ApiModelProperty(value = "巡防时长")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "巡防范围类型")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围id")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "查询距离")
+    @TableField(exist = false)
+    private Integer cxjl = 10;
+
+    @ApiModelProperty(value = "是否打卡，仁寿专用")
+    @TableField(exist = false)
+    private boolean sfDk;
+
+    @ApiModelProperty(value = "负责人员 人员类型")
+    @TableField(exist = false)
+    private String lx;
+
+    @ApiModelProperty(value = "组员类型")
+    private String zylx;
+
+    @ApiModelProperty(value = "动中备勤")
+    private String dzbq;
+
+    @ApiModelProperty(value = "武器准备")
+    private String wqzb;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXffw.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXffw.java
new file mode 100644
index 0000000..f135daf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXffw.java
@@ -0,0 +1,72 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xffw")
+@ApiModel(value = "TbQwXffw对象", description = "巡防报备-巡防范围")
+public class TbQwXffw extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "巡防区标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "关联业务ID（值班或报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "关联表ID（巡防区或快反点ID）")
+    private String glbid;
+
+    @ApiModelProperty(value = "勤务类型（1 巡防排班  2 巡防报备）")
+    private String qwlx;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围名称（巡防区或快反点名称）")
+    private String fwMc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpb.java
new file mode 100644
index 0000000..97fcfb4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpb.java
@@ -0,0 +1,101 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfpb")
+@ApiModel(value = "TbQwXfpb对象", description = "巡防排班表")
+public class TbQwXfpb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班名称")
+    private String pbmc;
+
+    @ApiModelProperty(value = "排班描述")
+    private String pbms;
+
+    @ApiModelProperty(value = "排班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "排班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "排班人ID")
+    private String pbrid;
+
+    @ApiModelProperty(value = "排班人身份证号")
+    private String pbrsfzh;
+
+    @ApiModelProperty(value = "排班人姓名")
+    private String pbr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbMrjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbMrjl.java
new file mode 100644
index 0000000..fabf889
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbMrjl.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ * 巡防排班每日警力表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfpb_mrjl")
+@ApiModel(value = "TbQwXfpbZMrjl对象", description = "巡防排班每日警力表")
+public class TbQwXfpbMrjl implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班ID")
+    private String pbId;
+
+    @ApiModelProperty(value = "排班周期ID")
+    private String pbzqId;
+
+    @ApiModelProperty(value = "巡防日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date xfrq;
+
+    @ApiModelProperty(value = "巡防开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xfkssj;
+
+    @ApiModelProperty(value = "巡防结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date xfjssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbZq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbZq.java
new file mode 100644
index 0000000..e001c24
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwXfpbZq.java
@@ -0,0 +1,150 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ * 巡防排班周期表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfpb_zq")
+@ApiModel(value = "TbQwXfpbZq对象", description = "巡防排班周期表")
+public class TbQwXfpbZq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班id")
+    private String pbId;
+
+    @ApiModelProperty(value = "巡防周期 存1.2.3")
+    private Integer xfzq;
+
+    @ApiModelProperty(value = "班次数 存1.2.3")
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "--D_BZ_WZLX（武装类型）武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "--D_BZ_ZZLX（着装类型）着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "--D_BZ_XLFS（巡逻方式）巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围ID（对应巡防区或快反点的ID）")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZb.java
new file mode 100644
index 0000000..b69b98d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZb.java
@@ -0,0 +1,116 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbbb")
+@ApiModel(value="TbQwZb对象", description="值班表")
+public class TbQwZb extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "查询值班开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "查询值班结束时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbld;
+
+    @ApiModelProperty(value = "值班电话")
+    private String zbdh;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "值班状态（01 未值班、02值班中、03 值班完成）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbbb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbbb.java
new file mode 100644
index 0000000..5d0e819
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbbb.java
@@ -0,0 +1,171 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 值班表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbbb")
+@ApiModel(value = "TbQwZbbb对象", description = "值班报备表")
+public class TbQwZbbb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "报备类型（01 正常报备  02 特殊报备）")
+    private String bblx;
+
+    @ApiModelProperty(value = "值班排班ID")
+    private String zbpbId;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "查询值班开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "查询值班结束时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班领导姓名")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "值班领导电话")
+    private String zbldDh;
+
+    @ApiModelProperty(value = "值班领导身份证号")
+    private String zbldSfzh;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长身份证号")
+    private String zbzhzSfzh;
+
+    @ApiModelProperty(value = "值班指挥长电话")
+    private String zbzhzDh;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长身份证号")
+    private String zzzhzSfzh;
+
+    @ApiModelProperty(value = "专职指挥长电话")
+    private String zzzhzDh;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班身份证号")
+    private String fzzbSfzh;
+
+    @ApiModelProperty(value = "法制值班电话")
+    private String fzzbDh;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpb.java
new file mode 100644
index 0000000..3b07b0c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpb.java
@@ -0,0 +1,99 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 值班排班表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbpb")
+@ApiModel(value = "TbQwZbpb对象", description = "值班排班表")
+public class TbQwZbpb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "值班名称")
+    private String zbmc;
+
+    @ApiModelProperty(value = "值班描述")
+    private String zbms;
+
+    @ApiModelProperty(value = "值班排班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbpbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "值班排班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbpbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "排班人ID")
+    private String pbrid;
+
+    @ApiModelProperty(value = "排班人身份证号")
+    private String pbrsfzh;
+
+    @ApiModelProperty(value = "排班人姓名")
+    private String pbr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbMrjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbMrjl.java
new file mode 100644
index 0000000..3a85e8a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbMrjl.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ * 值班排班每日警力表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbpb_mrjl")
+@ApiModel(value = "TbQwZbpbMrjl对象", description = "值班排班每日警力表")
+public class TbQwZbpbMrjl implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识Id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班ID")
+    private String pbId;
+
+    @ApiModelProperty(value = "排班周期ID")
+    private String pbzqId;
+
+    @ApiModelProperty(value = "值班日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "值班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zbkssj;
+
+    @ApiModelProperty(value = "值班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zbjssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbZq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbZq.java
new file mode 100644
index 0000000..7fd06ad
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZbpbZq.java
@@ -0,0 +1,151 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 值班排班周期表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbpb_zq")
+@ApiModel(value = "TbQwZbpbZq对象", description = "值班排班周期表")
+public class TbQwZbpbZq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "值班排班ID")
+    private String pbId;
+
+    @ApiModelProperty(value = "值班周期，存1，2，3")
+    private Integer zbzq;
+
+    @ApiModelProperty(value = "班次数，存1，2，3", required = false)
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班开始时间")
+    @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "值班结束时间")
+    @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班领导身份证号")
+    private String zbldSfzh;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "值班电话")
+    private String zbldDh;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "值班指挥长身份证号")
+    private String zbzhzSfzh;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长电话")
+    private String zbzhzDh;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "专职指挥长身份证号")
+    private String zzzhzSfzh;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长电话")
+    private String zzzhzDh;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "法制值班身份证号")
+    private String fzzbSfzh;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班电话")
+    private String fzzbDh;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZnzb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZnzb.java
new file mode 100644
index 0000000..649f912
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwZnzb.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-通讯装备表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_znzb")
+@ApiModel(value="TbQwZnzb对象", description="巡防排班或报备或值班-智能装备表")
+public class TbQwZnzb extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID（巡防值班或报备ID）")
+    private String ywid;
+
+    @ApiModelProperty(value = "通讯装备ID")
+    private String txzbId;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "通讯装备类型（01 移动警务终端  02 执法记录仪 03 对讲机）")
+    private String txzblx;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "组呼号")
+    private String zhh;
+
+    @ApiModelProperty(value = "值班类型（1 勤务值班，2 巡防排班，3 巡防报备，4 值班记录）")
+    private String zblx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+    @ApiModelProperty(value = "是否专业装备")
+    private String sfzy;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "是否支持通讯 0否 1支持")
+    private String sfxt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwxfbbDk.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwxfbbDk.java
new file mode 100644
index 0000000..e9a8f6e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/qwzx/TbQwxfbbDk.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.entity.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfbb_dk")
+@ApiModel(value="TbQwxfbbDk 对象", description="巡防报备打卡对象")
+public class TbQwxfbbDk extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "报备ID")
+    private String bbid;
+
+    @ApiModelProperty(value = "图片ID，多图片用逗号拼接")
+    private String tpid;
+
+    @ApiModelProperty(value = "打卡人姓名")
+    private String dkrxm;
+
+    @ApiModelProperty(value = "打卡人身份证号")
+    private String dkrsfzh;
+
+    @ApiModelProperty(value = "打卡人id")
+    private String dkrid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rh/RhMyhtWarn.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rh/RhMyhtWarn.java
new file mode 100644
index 0000000..194db05
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rh/RhMyhtWarn.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.rh;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @author: T
+ * @date: Thu May 14 21:00:12 CST 2020
+ */
+@Data
+@ApiModel(value = "融合绵阳预警")
+@Accessors(chain = true)
+@TableName(value = "rh_myht_warn")
+public class RhMyhtWarn implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "ID", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "民警身份证")
+    private String police;
+
+    @ApiModelProperty(value = "抓拍民警姓名")
+    private String policeName;
+
+    @ApiModelProperty(value = "预警人员姓名")
+    private String name;
+
+    @ApiModelProperty(value = "预警人员身份证")
+    private String card;
+
+    @ApiModelProperty(value = "性别 1男 2女 0未知")
+    private String sex;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+
+    @ApiModelProperty(value = "命中相似度")
+    private String hitSimilarity;
+
+    @ApiModelProperty(value = "底库照片")
+    private String zp1;
+
+    @ApiModelProperty(value = "抓拍小图照片")
+    private String zp2;
+
+    @ApiModelProperty(value = "抓拍大图")
+    private String zp3;
+
+    @ApiModelProperty(value = "经度")
+    private String jd;
+
+    @ApiModelProperty(value = "纬度")
+    private String wd;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "告警时间戳")
+    private Long createTime;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rsother/CJDB.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rsother/CJDB.java
new file mode 100644
index 0000000..f5dce01
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rsother/CJDB.java
@@ -0,0 +1,180 @@
+package com.mosty.base.model.entity.rsother;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/13
+ * 仁寿警情出警单表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sthy.cjdb")
+@ApiModel(value = "CJDB 对象", description = "仁寿警情出警单表")
+public class CJDB implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "处警单编号")
+    private String cjdbh;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "通知单编号")
+    private String tzdbh;
+
+    @ApiModelProperty(value = "处警单位编号")
+    private String cjdwbh;
+
+    @ApiModelProperty(value = "处警员编号")
+    private String cjybh;
+
+    @ApiModelProperty(value = "处警员姓名")
+    private String cjyxm;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "处理完毕时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date clwbsj;
+
+    @ApiModelProperty(value = "首次反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date scfksj;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "出警情况")
+    private String cjqk;
+
+    @ApiModelProperty(value = "处理结果类型")
+    private String cljglx;
+
+    @ApiModelProperty(value = "处理结果")
+    private String cljg;
+
+    @ApiModelProperty(value = "出动人员")
+    private String cdry;
+
+    @ApiModelProperty(value = "出动车辆")
+    private String cdcl;
+
+    @ApiModelProperty(value = "状态")
+    private Integer zt;
+
+    @ApiModelProperty(value = "处置类型")
+    private Integer czlx;
+
+    @ApiModelProperty(value = "创建时间==入库时间戳【至关重要！】")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date cjsj;
+
+    @ApiModelProperty(value = "更新时间【至关重要！】")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date gxsj;
+
+    @ApiModelProperty(value = "是否是离线状态下进行的操作")
+    private Integer nNetbreak;
+
+    @ApiModelProperty(value = "数据上传标志位1")
+    private Integer nUploaded1;
+
+    @ApiModelProperty(value = "数据上传标志位2")
+    private Integer nUploaded2;
+
+    @ApiModelProperty(value = "推送警综状态")
+    private Integer tsjzzt;
+
+    @ApiModelProperty(value = "反馈标志{1 主动反馈； 0 非主动}")
+    private Integer nFkbz;
+
+    @ApiModelProperty(value = "警综接收单位")
+    private String jsdw;
+
+    @ApiModelProperty(value = "处警类别")
+    private String cjlb;
+
+    @ApiModelProperty(value = "处警类型")
+    private String cjlx;
+
+    @ApiModelProperty(value = "处警细类")
+    private String cjxl;
+
+    @ApiModelProperty(value = "单位地域属性,1:城市,2:农村")
+    private String dy;
+
+    @ApiModelProperty(value = "移动终端签收人员")
+    private String sYdcjqsry;
+
+    @ApiModelProperty(value = "移动终端到场人员")
+    private String sYdcjdcry;
+
+    @ApiModelProperty(value = "是否已推送至pgis标志位")
+    private Integer nPost;
+
+    @ApiModelProperty(value = "警情处理方式（0为三台合一全程处理的警情 1为移动110参与处理的警情 ）")
+    private Integer nSource;
+
+    @ApiModelProperty(value = "数据上传标志位3")
+    private Integer nUploaded3;
+
+    @ApiModelProperty(value = "数据上传标志位4")
+    private Integer nUploaded4;
+
+    @ApiModelProperty(value = "时间标记【按这个标记来做数据分区】")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date dTimemark;
+
+    @ApiModelProperty(value = "")
+    private Integer istranslated;
+
+    @ApiModelProperty(value = "是否移动端操作签收 0否 1是")
+    private Integer nSourceQs;
+
+    @ApiModelProperty(value = "是否移动端操作到达现场 0否 1是")
+    private Integer nSourceDdxc;
+
+    @ApiModelProperty(value = "是否移动端操作反馈 0否 1是")
+    private Integer nSourceFk;
+
+    @ApiModelProperty(value = "是否移动端操作处理完毕 0否 1是")
+    private Integer nSourceClwb;
+
+    @ApiModelProperty(value = "对处警情况的满意度评价(部分地市要求使用)")
+    private String sMyd;
+
+    @ApiModelProperty(value = "是否已发送到短信评议库")
+    private Integer nIsindxpy;
+
+    @ApiModelProperty(value = "是否发送给报警人的短信操作处理完毕 0否 1是  ")
+    private Integer nSenddxtobjr;
+
+    @ApiModelProperty(value = "是否发送给处警人员短信操作处理完毕 0否 1是 ")
+    private Integer nSenddxtocjy;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTask.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTask.java
new file mode 100644
index 0000000..682c39d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTask.java
@@ -0,0 +1,141 @@
+package com.mosty.base.model.entity.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ * 任务表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rw_task")
+@ApiModel(value = "TbRwTask 对象", description = "任务表")
+public class TbRwTask extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwfqsj;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwwcsj;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务执行人员数量")
+    private Integer rwzxrysl;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人联系电话")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskLog.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskLog.java
new file mode 100644
index 0000000..3f467f0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskLog.java
@@ -0,0 +1,109 @@
+package com.mosty.base.model.entity.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ * 任务表日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rw_task_log")
+@ApiModel(value = "TbRwTaskLog 对象", description = "任务表日志表")
+public class TbRwTaskLog extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = "1.任务关闭 2.开始任务 3.完成任务 4.任务转发 5.任务暂停 6.任务重启 " +
+            "7.接收转发任务 8.驳回转发任务 9.发起任务 10.删除任务")
+    private String rzlx;
+
+    @ApiModelProperty(value = "日志内容 例：2022-09-08 12:00:02,XX查看了任务")
+    private String rznr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标哈希值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "变更时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date bgsj;
+
+    @ApiModelProperty(value = "变更人")
+    private String bgrid;
+
+    @ApiModelProperty(value = "变更人姓名")
+    private String bgrxm;
+
+    @ApiModelProperty(value = "变更人身份证号")
+    private String bgrsfzh;
+
+    @ApiModelProperty(value = "变更人电话号码")
+    private String bgrdhhm;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUser.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUser.java
new file mode 100644
index 0000000..03dfc32
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUser.java
@@ -0,0 +1,181 @@
+package com.mosty.base.model.entity.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ * 任务表日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rw_task_user")
+@ApiModel(value = "TbRwTaskUser 对象", description = "任务表日志表")
+public class TbRwTaskUser extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务  05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwfqsj;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwwcsj;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务执行人员数量")
+    private Integer rwzxrysl;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成 5.超期未完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "创建人")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人电话号码")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "任务id")
+    private String rwid;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员  02.部门  03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "驳回消息Id")
+    private String bhtaskuserid;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收部门名称")
+    private String jsbmmc;
+
+    @ApiModelProperty(value = "接收巡组名称")
+    private String jsxzmc;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String grrwzt;
+
+    @ApiModelProperty(value = "移交时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUserAll.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUserAll.java
new file mode 100644
index 0000000..a7d11c2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rwzx/TbRwTaskUserAll.java
@@ -0,0 +1,181 @@
+package com.mosty.base.model.entity.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ * 任务表日志表--所有任务表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rw_task_user_all")
+@ApiModel(value = "TbRwTaskUser 对象", description = "任务表日志表")
+public class TbRwTaskUserAll extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务  05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwfqsj;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwwcsj;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务执行人员数量")
+    private Integer rwzxrysl;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成 5.超期未完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "创建人")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人电话号码")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "任务id")
+    private String rwid;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员  02.部门  03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "驳回消息Id")
+    private String bhtaskuserid;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收部门名称")
+    private String jsbmmc;
+
+    @ApiModelProperty(value = "接收巡组名称")
+    private String jsxzmc;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String grrwzt;
+
+    @ApiModelProperty(value = "移交时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzDyjk.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzDyjk.java
new file mode 100644
index 0000000..0299290
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzDyjk.java
@@ -0,0 +1,99 @@
+package com.mosty.base.model.entity.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 接口调用日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rz_dyjk")
+@ApiModel(value = "TbRzDyjk对象", description = "接口调用日志表")
+public class TbRzDyjk extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "调用功能，存菜单名称")
+    private String dygn;
+
+    @ApiModelProperty(value = "接口系统")
+    private String jkxt;
+
+    @ApiModelProperty(value = "接口URL")
+    private String jkurl;
+
+    @ApiModelProperty(value = "接口入参")
+    private String jkrc;
+
+    @ApiModelProperty(value = "接口返回")
+    private String jkfh;
+
+    @ApiModelProperty(value = "调用时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dysj;
+
+    @ApiModelProperty(value = "返回时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fhsj;
+
+    @ApiModelProperty(value = "耗时间（秒）")
+    private Integer hs;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否成功（字典：0-否，1-是）")
+    private String sfcg;
+
+    @ApiModelProperty(value = "操作人ID")
+    private String czrid;
+
+    @ApiModelProperty(value = "操作人身份证号")
+    private String czrsfzh;
+
+    @ApiModelProperty(value = "操作人姓名")
+    private String czrxm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzHj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzHj.java
new file mode 100644
index 0000000..2b1d057
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzHj.java
@@ -0,0 +1,124 @@
+package com.mosty.base.model.entity.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 呼叫日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rz_hj")
+@ApiModel(value = "TbRzHj对象", description = "呼叫日志表")
+public class TbRzHj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_HJLY（呼叫来源）呼叫来源：01-巡组呼叫，02-事件呼叫")
+    private String hjly;
+
+    @ApiModelProperty(value = "来源ID")
+    private String lyId;
+
+    @ApiModelProperty(value = "呼叫人id")
+    private String fjrId;
+
+    @ApiModelProperty(value = "呼叫人身份证号")
+    private String fjrSfzh;
+
+    @ApiModelProperty(value = "呼叫人")
+    private String fjrXm;
+
+    @ApiModelProperty(value = "呼叫开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "呼叫结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "--D_BZ_HJFS(呼叫方式)呼叫方式：01-对讲机，02-执法记录仪语音，03-执法记录仪语音视频")
+    private String fjfs;
+
+    @ApiModelProperty(value = "呼叫唯一号码")
+    private String hjhm;
+
+    @ApiModelProperty(value = "被呼叫人id")
+    private String bfjrId;
+
+    @ApiModelProperty(value = "被呼叫人身份证号")
+    private String bfjrSfzh;
+
+    @ApiModelProperty(value = "被呼叫人姓名")
+    private String bfjrXm;
+
+    @ApiModelProperty(value = "被呼叫人部门")
+    private String bfjrSsbm;
+
+    @ApiModelProperty(value = "被呼叫人部门id")
+    private String bfjrSsbmdm;
+
+    @ApiModelProperty(value = "被呼叫人县公安局")
+    private String bfjrSsxgaj;
+
+    @ApiModelProperty(value = "被呼叫人县公安局id")
+    private String bfjrSsxgajdm;
+
+    @ApiModelProperty(value = "被呼叫人市公安局")
+    private String bfjrSssgaj;
+
+    @ApiModelProperty(value = "被呼叫人市公安局id")
+    private String bfjrSssgajdm;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否成功（字典：0-否，1-是）")
+    private String sfcg;
+
+    @ApiModelProperty(value = "附件ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzSpbf.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzSpbf.java
new file mode 100644
index 0000000..ff2963d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzSpbf.java
@@ -0,0 +1,99 @@
+package com.mosty.base.model.entity.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频播放日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rz_spbf")
+@ApiModel(value = "TbSpxlSpxlfa对象", description = "视频播放日志表")
+public class TbRzSpbf extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "摄像头ID")
+    private String sxtid;
+
+    @ApiModelProperty(value = "摄像头名称")
+    private String sxtmc;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "播放说明（存通过什么功能播放的，如：勤务首页播放）")
+    private String bfsm;
+
+    @ApiModelProperty(value = "是否成功（字典：0-否，1-是）")
+    private String sfcg;
+
+    @ApiModelProperty(value = "播放视频的ip地址")
+    private String czip;
+
+    @ApiModelProperty(value = "操作人ID")
+    private String czrid;
+
+    @ApiModelProperty(value = "操作人身份证号")
+    private String czrsfzh;
+
+    @ApiModelProperty(value = "操作人姓名")
+    private String czrxm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzXtfk.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzXtfk.java
new file mode 100644
index 0000000..e01bcb4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/rzzx/TbRzXtfk.java
@@ -0,0 +1,89 @@
+package com.mosty.base.model.entity.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频播放日志表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rz_xtfk")
+@ApiModel(value = "TbSpxlSpxlfa对象", description = "视频播放日志表")
+public class TbRzXtfk extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "反馈类型1-系统问题，2-功能改进建议，3-新需求")
+    private String fklx;
+
+    @ApiModelProperty(value = "反馈系统")
+    private String fkxt;
+
+    @ApiModelProperty(value = "反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date fksj;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "反馈附件")
+    private String fkfj;
+
+    @ApiModelProperty(value = "反馈人ID")
+    private String fkrid;
+
+    @ApiModelProperty(value = "反馈人身份证号")
+    private String fkrsfzh;
+
+    @ApiModelProperty(value = "反馈人姓名")
+    private String fkrxm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbCaseType.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbCaseType.java
new file mode 100644
index 0000000..c0f4081
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbCaseType.java
@@ -0,0 +1,78 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 19:24:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_case_type")
+@ApiModel(value = "案由类型对象", description = "案由类型表")
+public class TbCaseType implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "案由ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Integer id;
+
+    @ApiModelProperty(value = "案由编码", name = "code")
+    private String code;
+
+    @ApiModelProperty(value = "案由名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "案由全称", name = "fullName")
+    private String fullName;
+
+    @ApiModelProperty(value = "警种代码", name = "alarmCategory")
+    private Integer alarmCategory;
+
+    @ApiModelProperty(value = "级案由代码", name = "parentCode")
+    private String parentCode;
+
+    @ApiModelProperty(value = "案由级别", name = "level")
+    private Integer level;
+
+    @ApiModelProperty(value = "案由音头", name = "pinyin")
+    private String pinyin;
+
+    @ApiModelProperty(value = "是否需要匿名", name = "needAnonymous")
+    private String needAnonymous;
+
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间", name = "updateTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "有效标志", name = "available")
+    private String available;
+
+    @ApiModelProperty(value = "来话类别", name = "callinType")
+    private String callinType;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJq.java
new file mode 100644
index 0000000..e23d0f7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJq.java
@@ -0,0 +1,264 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 19:24:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq")
+@ApiModel(value = "TbJq对象", description = "警情表")
+public class TbJq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情表ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警情ID（为110系统的警情表的ID）", name = "jq110Id")
+    private String jq110Id;
+
+    @ApiModelProperty(value = "接警单编号", name = "jjdbh")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "接警单位编号", name = "jjdwbh")
+    private String jjdwbh;
+
+    @ApiModelProperty(value = "接警单位名称", name = "jjdwmc")
+    private String jjdwmc;
+
+    @ApiModelProperty(value = "关联接警单编号", name = "gljjdbh")
+    private String gljjdbh;
+
+    @ApiModelProperty(value = "接警员编号", name = "jjybh")
+    private String jjybh;
+
+    @ApiModelProperty(value = "接警员姓名", name = "jjyxm")
+    private String jjyxm;
+
+    @ApiModelProperty(value = "接警台编号", name = "jjtbh")
+    private String jjtbh;
+
+    @ApiModelProperty(value = "接警台IP", name = "jjtip")
+    private String jjtip;
+
+    @ApiModelProperty(value = "呼入时间", name = "hrsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date hrsj;
+
+    @ApiModelProperty(value = "来话类型编号", name = "lhlxbh")
+    private String lhlxbh;
+
+    @ApiModelProperty(value = "报警方式编号", name = "bjfsbh")
+    private String bjfsbh;
+
+    @ApiModelProperty(value = "报警日期", name = "bjrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bjrq;
+
+    @ApiModelProperty(value = "报警时间", name = "bjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bjsj;
+
+    @ApiModelProperty(value = "接警时间", name = "jjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jjsj;
+
+    @ApiModelProperty(value = "警情发生开始日期年份", name = "jqfsksnf")
+    private Integer jqfsksnf;
+
+    @ApiModelProperty(value = "警情发生开始日期月份", name = "jqfsksyf")
+    private Integer jqfsksyf;
+
+    @ApiModelProperty(value = "警情发生开始日期年月", name = "jqfsksny")
+    private Integer jqfsksny;
+
+    @ApiModelProperty(value = "警情发生开始日期周数", name = "jqfskszs")
+    private Integer jqfskszs;
+
+    @ApiModelProperty(value = "警情发生开始日期", name = "jqfsksrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jqfsksrq;
+
+    @ApiModelProperty(value = "警情发生开始时间", name = "jqfskssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfskssj;
+
+    @ApiModelProperty(value = "警情发生开始小时数（存24小时制的数字）", name = "jqfsksxs")
+    private Integer jqfsksxs;
+
+    @ApiModelProperty(value = "警情发生结束时间", name = "jqfsjssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfsjssj;
+
+    @ApiModelProperty(value = "呼入时长", name = "hrsc")
+    private Integer hrsc;
+
+    @ApiModelProperty(value = "接警时长", name = "jjsc")
+    private Integer jjsc;
+
+    @ApiModelProperty(value = "接警录音号", name = "jjlyh")
+    private String jjlyh;
+
+    @ApiModelProperty(value = "报警电话", name = "bjdh")
+    private String bjdh;
+
+    @ApiModelProperty(value = "报警电话用户姓名", name = "bjdhYhxm")
+    private String bjdhYhxm;
+
+    @ApiModelProperty(value = "报警电话用户地址", name = "bjdhYhdz")
+    private String bjdhYhdz;
+
+    @ApiModelProperty(value = "报警人身份证号", name = "bjrSfzh")
+    private String bjrSfzh;
+
+    @ApiModelProperty(value = "报警人姓名", name = "bjrXm")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警人性别", name = "bjrXb")
+    private String bjrXb;
+
+    @ApiModelProperty(value = "报警人联系电话", name = "bjrLxdh")
+    private String bjrLxdh;
+
+    @ApiModelProperty(value = "报警人住址单位", name = "bjrZzdw")
+    private String bjrZzdw;
+
+    @ApiModelProperty(value = "事发地址行政区划", name = "sfdzxzqh")
+    private String sfdzxzqh;
+
+    @ApiModelProperty(value = "事发地址", name = "sfdz")
+    private String sfdz;
+
+    @ApiModelProperty(value = "路灯杆编号", name = "ldgbh")
+    private String ldgbh;
+
+    @ApiModelProperty(value = "报警内容", name = "bjnr")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别", name = "jqjb")
+    private String jqjb;
+
+    @ApiModelProperty(value = "案由", name = "ay")
+    private String ay;
+
+    @ApiModelProperty(value = "报警类别", name = "bjlb")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类型", name = "bjlx")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警细类", name = "bjxl")
+    private String bjxl;
+
+    @ApiModelProperty(value = "报警类别名称", name = "bjlbmc")
+    private String bjlbmc;
+
+    @ApiModelProperty(value = "报警类型名称", name = "bjlxmc")
+    private String bjlxmc;
+
+    @ApiModelProperty(value = "报警细类名称", name = "bjxlmc")
+    private String bjxlmc;
+
+    @ApiModelProperty(value = "被困人数", name = "bkrs")
+    private Integer bkrs;
+
+    @ApiModelProperty(value = "受伤人数", name = "ssrs")
+    private Integer ssrs;
+
+    @ApiModelProperty(value = "死亡人数", name = "swrs")
+    private Integer swrs;
+
+    @ApiModelProperty(value = "有无危险物质(0：无，1：有，默认为无)", name = "ywwxwz")
+    private String ywwxwz;
+
+    @ApiModelProperty(value = "有无爆炸/泄漏(0：无，1：有，默认为无)", name = "ywbzxl")
+    private String ywbzxl;
+
+    @ApiModelProperty(value = " 有无被困人员(0：无，1：有，默认为无)", name = "ywbkry")
+    private String ywbkry;
+
+    @ApiModelProperty(value = "是否涉外(0：无，1：有，默认为无)", name = "sfsw")
+    private String sfsw;
+
+    @ApiModelProperty(value = "是否是外语报警(0：无，1：有，默认为无)", name = "sfswybj")
+    private String sfswybj;
+
+    @ApiModelProperty(value = "是否重大警情(0：否，1：是)", name = "sfswybj")
+    private String sfzdjq;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    @TableField(exist = false)
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "处置状态 0.未处置 1.处置中 2.已完成", name = "czzt")
+    private String czzt;
+
+    @ApiModelProperty(value = "重大警情添加类型 01.系统推送 02.手动添加 03.一键报警", name = "zdjqtjlx")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否街面警情", name = "sfjmjq")
+    private String sfjmjq;
+
+    @ApiModelProperty(value = "管辖部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "管辖部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "管辖县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "管辖县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "管辖市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "管辖市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "颜色", name = "color")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqAll.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqAll.java
new file mode 100644
index 0000000..bc65711
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqAll.java
@@ -0,0 +1,260 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author dw
+ * @Date 2022-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq_all")
+@ApiModel(value = "TbJqAll 对象", description = "警情表-所有数据")
+public class TbJqAll extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情表ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警情ID（为110系统的警情表的ID）", name = "jq110Id")
+    private String jq110Id;
+
+    @ApiModelProperty(value = "接警单编号", name = "jjdbh")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "接警单位编号", name = "jjdwbh")
+    private String jjdwbh;
+
+    @ApiModelProperty(value = "接警单位名称", name = "jjdwmc")
+    private String jjdwmc;
+
+    @ApiModelProperty(value = "关联接警单编号", name = "gljjdbh")
+    private String gljjdbh;
+
+    @ApiModelProperty(value = "接警员编号", name = "jjybh")
+    private String jjybh;
+
+    @ApiModelProperty(value = "接警员姓名", name = "jjyxm")
+    private String jjyxm;
+
+    @ApiModelProperty(value = "接警台编号", name = "jjtbh")
+    private String jjtbh;
+
+    @ApiModelProperty(value = "接警台IP", name = "jjtip")
+    private String jjtip;
+
+    @ApiModelProperty(value = "呼入时间", name = "hrsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date hrsj;
+
+    @ApiModelProperty(value = "来话类型编号", name = "lhlxbh")
+    private String lhlxbh;
+
+    @ApiModelProperty(value = "报警方式编号", name = "bjfsbh")
+    private String bjfsbh;
+
+    @ApiModelProperty(value = "报警日期", name = "bjrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bjrq;
+
+    @ApiModelProperty(value = "报警时间", name = "bjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bjsj;
+
+    @ApiModelProperty(value = "接警时间", name = "jjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jjsj;
+
+    @ApiModelProperty(value = "警情发生开始日期年份", name = "jqfsksnf")
+    private Integer jqfsksnf;
+
+    @ApiModelProperty(value = "警情发生开始日期月份", name = "jqfsksyf")
+    private Integer jqfsksyf;
+
+    @ApiModelProperty(value = "警情发生开始日期年月", name = "jqfsksny")
+    private Integer jqfsksny;
+
+    @ApiModelProperty(value = "警情发生开始日期周数", name = "jqfskszs")
+    private Integer jqfskszs;
+
+    @ApiModelProperty(value = "警情发生开始日期", name = "jqfsksrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jqfsksrq;
+
+    @ApiModelProperty(value = "警情发生开始时间", name = "jqfskssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfskssj;
+
+    @ApiModelProperty(value = "警情发生开始小时数（存24小时制的数字）", name = "jqfsksxs")
+    private Integer jqfsksxs;
+
+    @ApiModelProperty(value = "警情发生结束时间", name = "jqfsjssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfsjssj;
+
+    @ApiModelProperty(value = "呼入时长", name = "hrsc")
+    private Integer hrsc;
+
+    @ApiModelProperty(value = "接警时长", name = "jjsc")
+    private Integer jjsc;
+
+    @ApiModelProperty(value = "接警录音号", name = "jjlyh")
+    private String jjlyh;
+
+    @ApiModelProperty(value = "报警电话", name = "bjdh")
+    private String bjdh;
+
+    @ApiModelProperty(value = "报警电话用户姓名", name = "bjdhYhxm")
+    private String bjdhYhxm;
+
+    @ApiModelProperty(value = "报警电话用户地址", name = "bjdhYhdz")
+    private String bjdhYhdz;
+
+    @ApiModelProperty(value = "报警人身份证号", name = "bjrSfzh")
+    private String bjrSfzh;
+
+    @ApiModelProperty(value = "报警人姓名", name = "bjrXm")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警人性别", name = "bjrXb")
+    private String bjrXb;
+
+    @ApiModelProperty(value = "报警人联系电话", name = "bjrLxdh")
+    private String bjrLxdh;
+
+    @ApiModelProperty(value = "报警人住址单位", name = "bjrZzdw")
+    private String bjrZzdw;
+
+    @ApiModelProperty(value = "事发地址行政区划", name = "sfdzxzqh")
+    private String sfdzxzqh;
+
+    @ApiModelProperty(value = "事发地址", name = "sfdz")
+    private String sfdz;
+
+    @ApiModelProperty(value = "路灯杆编号", name = "ldgbh")
+    private String ldgbh;
+
+    @ApiModelProperty(value = "报警内容", name = "bjnr")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别", name = "jqjb")
+    private String jqjb;
+
+    @ApiModelProperty(value = "案由", name = "ay")
+    private String ay;
+
+    @ApiModelProperty(value = "报警类别", name = "bjlb")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类型", name = "bjlx")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警细类", name = "bjxl")
+    private String bjxl;
+
+    @ApiModelProperty(value = "报警类别名称", name = "bjlbmc")
+    private String bjlbmc;
+
+    @ApiModelProperty(value = "报警类型名称", name = "bjlxmc")
+    private String bjlxmc;
+
+    @ApiModelProperty(value = "报警细类名称", name = "bjxlmc")
+    private String bjxlmc;
+
+    @ApiModelProperty(value = "被困人数", name = "bkrs")
+    private Integer bkrs;
+
+    @ApiModelProperty(value = "受伤人数", name = "ssrs")
+    private Integer ssrs;
+
+    @ApiModelProperty(value = "死亡人数", name = "swrs")
+    private Integer swrs;
+
+    @ApiModelProperty(value = "有无危险物质(0：无，1：有，默认为无)", name = "ywwxwz")
+    private String ywwxwz;
+
+    @ApiModelProperty(value = "有无爆炸/泄漏(0：无，1：有，默认为无)", name = "ywbzxl")
+    private String ywbzxl;
+
+    @ApiModelProperty(value = " 有无被困人员(0：无，1：有，默认为无)", name = "ywbkry")
+    private String ywbkry;
+
+    @ApiModelProperty(value = "是否涉外(0：无，1：有，默认为无)", name = "sfsw")
+    private String sfsw;
+
+    @ApiModelProperty(value = "是否是外语报警(0：无，1：有，默认为无)", name = "sfswybj")
+    private String sfswybj;
+
+    @ApiModelProperty(value = "是否重大警情(0：否，1：是)", name = "sfswybj")
+    private String sfzdjq;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "处置状态 0.未处置 1.处置中 2.已完成", name = "czzt")
+    private String czzt;
+
+    @ApiModelProperty(value = "重大警情添加类型 01.系统推送 02.手动添加 03.一键报警", name = "zdjqtjlx")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "是否街面警情", name = "sfjmjq")
+    private String sfjmjq;
+
+    @ApiModelProperty(value = "管辖部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "管辖部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "管辖县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "管辖县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "管辖市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "管辖市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+
+    @ApiModelProperty("距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqCjdb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqCjdb.java
new file mode 100644
index 0000000..db836a1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqCjdb.java
@@ -0,0 +1,136 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author dw
+ * @Date 2022-11-13
+ * 警情-处警单表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq_cjdb")
+@ApiModel(value = "TbJqCjdb 对象", description = "警情-处警单表")
+public class TbJqCjdb extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情表ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "处警单编号")
+    private String cjdbh;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "通知单编号")
+    private String tzdbh;
+
+    @ApiModelProperty(value = "处警单位名称")
+    private String cjdwmc;
+
+    @ApiModelProperty(value = "处警单位编号")
+    private String cjdwbh;
+
+    @ApiModelProperty(value = "处警员姓名")
+    private String cjyxm;
+
+    @ApiModelProperty(value = "处警员编号")
+    private String cjybh;
+
+    @ApiModelProperty(value = "首次反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date scfksj;
+
+    @ApiModelProperty(value = "处警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cjsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+16")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "处警完毕时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cjwbsj;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "出警情况")
+    private String cjqk;
+
+    @ApiModelProperty(value = "处理结果类型")
+    private String cljglx;
+
+    @ApiModelProperty(value = "处理结果")
+    private String cljg;
+
+    @ApiModelProperty(value = "出动人员")
+    private String cdry;
+
+    @ApiModelProperty(value = "出动车辆")
+    private String cdcl;
+
+    @ApiModelProperty(value = "行政区划")
+    private String xzqh;
+
+    @ApiModelProperty(value = "")
+    private String cjyj;
+
+    @ApiModelProperty(value = "审计单位代码")
+    private String sjdwdm;
+
+    @ApiModelProperty(value = "审计员编号")
+    private String sjybh;
+
+    @ApiModelProperty(value = "审计员姓名")
+    private String sjyxm;
+
+    @ApiModelProperty(value = "")
+    private String pdddsj;
+
+    @ApiModelProperty(value = "")
+    private String pdjssj;
+
+    @ApiModelProperty(value = "处置类别编号")
+    private String czlbbh;
+
+    @ApiModelProperty(value = "处置类别名称")
+    private String czlbmc;
+
+    @ApiModelProperty(value = "入库时间（CJD那边的入库时间）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date rksj;
+
+    @ApiModelProperty(value = "反馈定位X坐标(处置现场位置)")
+    private BigDecimal fkdwxzb;
+
+    @ApiModelProperty(value = "反馈定位Y坐标(处置现场位置)")
+    private BigDecimal fkdwyzb;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqDz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqDz.java
new file mode 100644
index 0000000..1c4d304
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqDz.java
@@ -0,0 +1,97 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author dw
+ * @Date 2022-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq_dz")
+@ApiModel(value = "TbJqDz 对象", description = "警情地址表")
+public class TbJqDz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情表ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警情ID", name = "jqId")
+    private String jqId;
+
+    @ApiModelProperty(value = "地址调整时间", name = "dztzSj")
+    private Date dztzSj;
+
+    @ApiModelProperty(value = "地址调整人员id", name = "dztzRyid")
+    private String dztzRyid;
+
+    @ApiModelProperty(value = "地址调整人员身份证号", name = "dztzRysfzh")
+    private String dztzRysfzh;
+
+    @ApiModelProperty(value = "地址调整人员姓名", name = "dztzRyxm")
+    private String dztzRyxm;
+
+    @ApiModelProperty(value = "经度", name = "jd;")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）地址行政区划代码", name = "dzxzqh")
+    private String dzxzqh;
+
+    @ApiModelProperty(value = "地址", name = "dz;")
+    private String dz;
+
+    @ApiModelProperty(value = "图片ID", name = "tpId;")
+    private String tpId;
+
+    @ApiModelProperty(value = "管辖部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "管辖部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "管辖县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "管辖县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "管辖市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "管辖市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+
+    @ApiModelProperty("距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqZxr.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqZxr.java
new file mode 100644
index 0000000..c30284d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbJqZxr.java
@@ -0,0 +1,133 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/31
+ * 警情-执行人表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq_zxr")
+@ApiModel(value = "TbJqZxr 对象", description = "警情-执行人表")
+public class TbJqZxr extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;;
+
+    @ApiModelProperty(value = "警情ID")
+    private String jqId;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "执行时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zxsj;
+
+    @ApiModelProperty(value = "执行过程代码")
+    private String zxgcdm;
+
+    @ApiModelProperty(value = "执行过程名称")
+    private String zxgcmc;
+
+    @ApiModelProperty(value = "处置内容")
+    private String cznr;
+
+    @ApiModelProperty(value = "处警人id")
+    private String cjrId;
+
+    @ApiModelProperty(value = "处警人身份证号")
+    private String cjrSfzh;
+
+    @ApiModelProperty(value = "处警人姓名")
+    private String cjrXm;
+
+    @ApiModelProperty(value = "处警人联系电话")
+    private String cjrLxdh;
+
+    @ApiModelProperty(value = "处警单编号")
+    private String cjdbh;
+
+    @ApiModelProperty(value = "通知单编号")
+    private String tzdbh;
+
+    @ApiModelProperty(value = "处警员编号")
+    private String cjybh;
+
+    @ApiModelProperty(value = "处警单位编号")
+    private String cjdwbh;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "处理完毕时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date clwbsj;
+
+    @ApiModelProperty(value = "首次反馈时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date scfksj;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "出警情况")
+    private String cjqk;
+
+    @ApiModelProperty(value = "出动人员")
+    private String cdry;
+
+    @ApiModelProperty(value = "出动车辆")
+    private String cdcl;
+
+    @ApiModelProperty(value = "状态")
+    private Integer zt;
+
+    @ApiModelProperty(value = "处置类型")
+    private Integer czlx;
+
+    @ApiModelProperty(value = "处警人部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "处警人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "处警人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "处警人所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "处警人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "处警人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSj.java
new file mode 100644
index 0000000..befd20c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSj.java
@@ -0,0 +1,157 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-14 11:43:17
+ */
+@Data
+@TableName("tb_sj")
+@ApiModel(value = "事件")
+@Accessors(chain = true)
+public class TbSj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "来源ID", name = "ywId")
+    private String ywId;
+
+    @ApiModelProperty(value = "事件来源:01-感知预警，02-警情，03-一键增援，04-犯罪分析，99-自行发起", name = "sjFl")
+    private String sjFl;
+
+    @ApiModelProperty(value = "事件级别", name = "sjJb")
+    private String sjJb;
+
+    @ApiModelProperty(value = "发生时间", name = "sjFssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date sjFssj;
+
+    @ApiModelProperty(value = "事件标题", name = "sjBt")
+    private String sjBt;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String bjrxm;
+
+    @ApiModelProperty(value = "报警人电话")
+    private String bjrlxdh;
+
+    @ApiModelProperty(value = "事件内容", name = "sjNr")
+    private String sjNr;
+
+    @ApiModelProperty(value = "事件初始经度", name = "csjd")
+    private BigDecimal csjd;
+
+    @ApiModelProperty(value = "事件初始纬度", name = "cswd")
+    private BigDecimal cswd;
+
+    @ApiModelProperty(value = "事件初始坐标", name = "cszb")
+    private Point cszb;
+
+    @ApiModelProperty(value = "事件初始坐标hash", name = "cszbhash")
+    private String cszbhash;
+
+    @ApiModelProperty(value = "事件初始地址行政区划代码", name = "csdzxzqh")
+    private String csdzxzqh;
+
+    @ApiModelProperty(value = "事件初始地址", name = "csdz")
+    private String csdz;
+
+    @ApiModelProperty(value = "事件当前经度", name = "dqjd")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "事件当前纬度", name = "dqwd")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "事件当前坐标", name = "dqzb")
+    private Point dqzb;
+
+    @ApiModelProperty(value = "事件当前坐标HASH", name = "dqzbhash")
+    private String dqzbhash;
+
+    @ApiModelProperty(value = "事件当前地址行政区划代码", name = "dqdzxzqh")
+    private String dqdzxzqh;
+
+    @ApiModelProperty(value = "事件当前地址", name = "dqdz")
+    private String dqdz;
+
+    @ApiModelProperty(value = "处置开始时间", name = "czkssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czkssj;
+
+    @ApiModelProperty(value = "处置结束时间", name = "czjssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czjssj;
+
+    @ApiModelProperty(value = "圈层-核心圈", name = "qcHx")
+    private Integer qcHx;
+
+    @ApiModelProperty(value = "圈层-警戒圈", name = "qcJj")
+    private Integer qcJj;
+
+    @ApiModelProperty(value = "圈层-关注圈", name = "qcGz")
+    private Integer qcGz;
+
+    @ApiModelProperty(value = "圈层更新次数", name = "qcGxcs")
+    private Integer qcGxcs;
+
+    @ApiModelProperty(value = "圈层更新时间", name = "qcGxsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qcGxsj;
+
+    @ApiModelProperty(value = "图片ID", name = "tpId")
+    private String tpId;
+
+    @ApiModelProperty(value = "处置状态 0.未处置  1.已处置", name = "czzt")
+    private String czzt;
+
+    @ApiModelProperty(value = "处置说明", name = "czsm")
+    private String czsm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjCyjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjCyjl.java
new file mode 100644
index 0000000..1f9c08b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjCyjl.java
@@ -0,0 +1,139 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-14 11:43:17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_sj")
+@ApiModel(value = "TbSj对象", description = "事件表")
+public class TbSjCyjl extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "报备ID")
+    private String bbId;
+
+    @ApiModelProperty(value = "警力id")
+    private String jlId;
+
+    @ApiModelProperty(value = "警力身份证号")
+    private String jlSfzh;
+
+    @ApiModelProperty(value = "警力姓名")
+    private String jlXm;
+
+    @ApiModelProperty(value = "警力联系电话")
+    private String jlLxdh;
+
+    @ApiModelProperty(value = "收到指令时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sdzlsj;
+
+    @ApiModelProperty(value = "签收指令时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qszlsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "参与结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "--D_BZ_JLLX（警力类型）民警辅警（字典）")
+    private String mjfj;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否专业警种")
+    private String sfzyjz;
+
+    @ApiModelProperty(value = "专业标签代码")
+    private String zybqdm;
+
+    @ApiModelProperty(value = "专业标签")
+    private String zybq;
+
+    @ApiModelProperty(value = "当前位置")
+    private String dqwz;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "坐标时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zbsj;
+
+    @ApiModelProperty(value = "--D_BZ_JLZT（警力状态，在岗、不在岗）警力状态（采用指令状态字典）")
+    private String jlzt;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjDz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjDz.java
new file mode 100644
index 0000000..d7a8ea4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjDz.java
@@ -0,0 +1,100 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/25
+ * 事件地址表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_sj_dz")
+@ApiModel(value = "TbSjDz对象", description = "事件地址表")
+public class TbSjDz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "地址调整时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dztzSj;
+
+    @ApiModelProperty(value = "地址调整人员id")
+    private String dztzRyid;
+
+    @ApiModelProperty(value = "地址调整人员身份证号")
+    private String dztzRysfzh;
+
+    @ApiModelProperty(value = "地址调整人员姓名")
+    private String dztzRyxm;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）地址行政区划代码")
+    private String dzxzqh;
+
+    @ApiModelProperty(value = "地址")
+    private String dz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjRz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjRz.java
new file mode 100644
index 0000000..5740e4e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjRz.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.entity.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/25
+ * 事件日志记录表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_sj_rz")
+@ApiModel(value = "TbSjRz对象", description = "事件日志记录表")
+public class TbSjRz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "日志内容")
+    private String rzms;
+
+    @ApiModelProperty(value = "操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date czsj;
+
+    @ApiModelProperty(value = "操作人员id")
+    private String czryId;
+
+    @ApiModelProperty(value = "操作人员身份证号")
+    private String czrySfzh;
+
+    @ApiModelProperty(value = "操作人员姓名")
+    private String czryXm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjSpbf.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjSpbf.java
new file mode 100644
index 0000000..f85e779
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/sjzx/TbSjSpbf.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.entity.sjzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-20 09:45:42
+ */
+@EqualsAndHashCode(callSuper = false)
+@Data
+@TableName("tb_sj_spbf")
+@ApiModel(value = "SPBF对象", description = "视频播放")
+@Accessors(chain = true)
+public class TbSjSpbf extends BaseEntity implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "标识ID", name = "id", required = false)
+    private String id;
+
+    @ApiModelProperty(value = "事件ID", name = "sjId", required = false)
+    private String sjId;
+
+    @ApiModelProperty(value = "摄像头id", name = "sxtId", required = false)
+    private String sxtId;
+
+    @ApiModelProperty(value = "播放开始时间", name = "bfkssj", required = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bfkssj;
+
+    @ApiModelProperty(value = "播放结束时间", name = "bfjssj", required = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bfjssj;
+
+    @ApiModelProperty(value = "摆放位置", name = "wz", required = false)
+    private String wz;
+
+    @ApiModelProperty(value = "图片ID", name = "tpId", required = false)
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfa.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfa.java
new file mode 100644
index 0000000..8d3174c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfa.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.entity.spxl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_spxl_spxlfa")
+@ApiModel(value = "TbSpxlSpxlfa对象", description = "视频巡逻方案表")
+public class TbSpxlSpxlfa extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "方案开始时间（时间段HH:mm）")
+    private String kssj;
+
+    @ApiModelProperty(value = "方案结束时间（时间段HH:mm）")
+    private String jssj;
+
+    @ApiModelProperty(value = "方案类型 1.基础巡逻  2.定制巡逻")
+    private String falx;
+
+    @ApiModelProperty(value = "分屏数 1,4,6,9")
+    private String fps;
+
+    @ApiModelProperty(value = "间隔时间（分钟）轮播时长")
+    private Integer jgsj;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "摄像头组列表")
+    @TableField(exist = false)
+    private List<TbSpxlSpxlfaSxtz> sxtzList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxt.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxt.java
new file mode 100644
index 0000000..276a446
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxt.java
@@ -0,0 +1,56 @@
+package com.mosty.base.model.entity.spxl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案摄像头表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_spxl_spxlfa_sxt")
+@ApiModel(value = "TbSpxlSpxlfaSxt对象", description = "视频巡逻方案-摄像头表")
+public class TbSpxlSpxlfaSxt extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案ID")
+    private String faid;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "摄像头组名称")
+    private String sxtzid;
+
+    @ApiModelProperty(value = "摄像头ID（对应国标编号）")
+    private String sxtid;
+
+    @ApiModelProperty(value = "摄像头名称")
+    private String sxtmc;
+
+    @ApiModelProperty(value = "巡逻类型  1.定速巡航  2.定位看守  3.综合配置")
+    private String xllx;
+
+    @ApiModelProperty(value = "摄像头配置信息")
+    @TableField(exist = false)
+    private TbSpxlSpxlfaSxtPz pz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtPz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtPz.java
new file mode 100644
index 0000000..b5c8630
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtPz.java
@@ -0,0 +1,68 @@
+package com.mosty.base.model.entity.spxl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案-摄像头-配置表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_spxl_spxlfa_sxt_pz")
+@ApiModel(value = "TbSpxlSpxlfaSxtPz对象", description = "视频巡逻方案-摄像头-配置表")
+public class TbSpxlSpxlfaSxtPz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案ID")
+    private String faid;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "摄像头组id")
+    private String sxtzid;
+
+    @ApiModelProperty(value = "摄像头id（zhjmxf_spxl_spxlfa_sxt表主键）")
+    private String sxtid;
+
+    @ApiModelProperty(value = "视频编号（对应摄像头的国标编码）")
+    private String spbh;
+
+    @ApiModelProperty(value = "预置点1（当方案类型为定位看守时，该字段表示定位点）")
+    private String yzd1;
+
+    @ApiModelProperty(value = "预置点2（当方案类型为定位看守时，该字段为null)")
+    private String yzd2;
+
+    @ApiModelProperty(value = "开始时间（HH:mm)")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间（HH:mm）")
+    private String jssj;
+
+    @ApiModelProperty(value = "转速（1-15）")
+    private String zs;
+
+    @ApiModelProperty(value = "归位时间（分），代表多长时间回到开始位置，即定位时间")
+    private String gwsj;
+
+    @ApiModelProperty(value = "巡逻类型  1.定速巡航  2.定位看守")
+    private String xllx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtz.java
new file mode 100644
index 0000000..4dc3b99
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/spxl/TbSpxlSpxlfaSxtz.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.entity.spxl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案-摄像头组表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_spxl_spxlfa_sxtz")
+@ApiModel(value = "TbSpxlSpxlfaSxtz对象", description = "视频巡逻方案-摄像头组表")
+public class TbSpxlSpxlfaSxtz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "方案ID")
+    private String faid;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "摄像头组名称")
+    private String sxtzmc;
+
+    @ApiModelProperty(value = "摄像头列表")
+    @TableField(exist = false)
+    private List<TbSpxlSpxlfaSxt> sxtList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjgl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjgl.java
new file mode 100644
index 0000000..51939e9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjgl.java
@@ -0,0 +1,162 @@
+package com.mosty.base.model.entity.trs;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 拓尔思预警指令关联表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA_GX.VW_ALARM_YJGJ")
+@ApiModel(value = "VwAlermYjgl 对象", description = "拓尔思预警指令关联表")
+public class VwAlermYjgl implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "活动发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date hdfssj;
+
+    @ApiModelProperty(value = "活动发生地址")
+    private String hdfsdd;
+
+    @ApiModelProperty(value = "活动详情")
+    private String hdxq;
+
+    @ApiModelProperty(value = "")
+    private String hdlyzj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "活动发生地详址")
+    private String hdfsdxz;
+
+    @ApiModelProperty(value = "行政区划")
+    private String hdfsdqh;
+
+    @ApiModelProperty(value = "来源ID")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal hdjd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal hdwd;
+
+    @ApiModelProperty(value = "预警指令ID")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "来源")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "预警来源代码")
+    private String yjlyDm;
+
+    @ApiModelProperty(value = "预警来源")
+    private String yjly;
+
+    @ApiModelProperty(value = "")
+    private String yjlyzj;
+
+    @ApiModelProperty(value = "")
+    private String xnlylx;
+
+    @ApiModelProperty(value = "预警来源级别代码")
+    private String yjlyjbDm;
+
+    @ApiModelProperty(value = "预警来源级别")
+    private String yjlyjb;
+
+    @ApiModelProperty(value = "")
+    private String tdzt;
+
+    @ApiModelProperty(value = "文件地址")
+    private String fileids;
+
+    @ApiModelProperty(value = "预警来源表")
+    private String yjlyb;
+
+    @ApiModelProperty(value = "关联身份证号")
+    private String glsfzh;
+
+    @ApiModelProperty(value = "关联其他号码")
+    private String glqthm;
+
+    @ApiModelProperty(value = "关联姓名")
+    private String glxm;
+
+    @ApiModelProperty(value = "布控类型")
+    private String bklx;
+
+    @ApiModelProperty(value = "人员细类")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "申请人证件号码")
+    private String sqrzjhm;
+
+    @ApiModelProperty(value = "申请人单位代码")
+    private String sqrdwdh;
+
+    @ApiModelProperty(value = "布控信息主键")
+    private String bkxxzj;
+
+    @ApiModelProperty(value = "是否发送到本地代码")
+    private String issendtolocalDm;
+
+    @ApiModelProperty(value = "是否发送到本地")
+    private String issendtolocal;
+
+    @ApiModelProperty(value = "")
+    private String localunitcode;
+
+    @ApiModelProperty(value = "")
+    private String isjudgelocalDm;
+
+    @ApiModelProperty(value = "")
+    private String isjudgelocal;
+
+    @ApiModelProperty(value = "")
+    private String issendtocommunityDm;
+
+    @ApiModelProperty(value = "")
+    private String issendtocommunity;
+
+    @ApiModelProperty(value = "")
+    private String localcommunitycode;
+
+    @ApiModelProperty(value = "")
+    private String isjudgecommunityDm;
+
+    @ApiModelProperty(value = "")
+    private String isjudgecommunity;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzl.java
new file mode 100644
index 0000000..a3960b0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzl.java
@@ -0,0 +1,94 @@
+package com.mosty.base.model.entity.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 拓尔思预警指令列表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA_GX.VW_ALARM_YJZL")
+@ApiModel(value = "VwAlermYjzl 对象", description = "拓尔思预警指令列表")
+public class VwAlermYjzl implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "")
+    private String bkzj;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "状态'0','未签收','1','正常签收','2','超时签收','3','已下发','4','正常反馈'," +
+            "'6','超时反馈'")
+    private String status;
+
+    @ApiModelProperty(value = "指令等级")
+    private String lev;
+
+    @ApiModelProperty(value = "")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "指令编号")
+    private String zlbh;
+
+    @ApiModelProperty(value = "指令类型")
+    private String zllx;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "最后修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date lastupdatetime;
+
+    @ApiModelProperty(value = "人员细类")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "布控来源表")
+    private String bklyb;
+
+    @ApiModelProperty(value = "")
+    private String bklyzj;
+
+    @ApiModelProperty(value = "预警细类")
+    private String yjlx;
+
+    @ApiModelProperty(value = "")
+    private String yjgjid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzlUser.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzlUser.java
new file mode 100644
index 0000000..8ebc644
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwAlermYjzlUser.java
@@ -0,0 +1,82 @@
+package com.mosty.base.model.entity.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 拓尔思预警指令-接收用户表列表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA_GX.VW_ALARM_YJZL_USER")
+@ApiModel(value = "VwAlermYjzlUser 对象", description = "拓尔思预警指令-接收用户表列表")
+public class VwAlermYjzlUser implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "预警指令主键")
+    private String yjzlzj;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idcard;
+
+    @ApiModelProperty(value = "姓名")
+    private String username;
+
+    @ApiModelProperty(value = "单位代码")
+    private String unitcode;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitname;
+
+    @ApiModelProperty(value = "")
+    private String sourceunitcode;
+
+    @ApiModelProperty(value = "")
+    private String sourceunitname;
+
+    @ApiModelProperty(value = "")
+    private String sourceidcard;
+
+    @ApiModelProperty(value = "")
+    private String sourceusername;
+
+    @ApiModelProperty(value = "签收状态")
+    private String statusCode;
+
+    @ApiModelProperty(value = "签收状态中文")
+    private String statusName;
+
+    @ApiModelProperty(value = "签收状态中文")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signtime;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date crttime;
+
+    @ApiModelProperty(value = "")
+    private String typeCode;
+
+    @ApiModelProperty(value = "")
+    private String typeName;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPersonVisitRecord.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPersonVisitRecord.java
new file mode 100644
index 0000000..e9bfdba
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPersonVisitRecord.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.entity.trs;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/26
+ * 拓尔思走访记录表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA_GX.VW_PERSON_VISIT_RECORD")
+@ApiModel(value = "VwPersonVisitRecord 对象", description = "拓尔思走访记录表")
+public class VwPersonVisitRecord implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "走访时间")
+    private Date time;
+
+    @ApiModelProperty(value = "走访方式代码")
+    private String methodCode;
+
+    @ApiModelProperty(value = "走访方式名称")
+    private String methodName;
+
+    @ApiModelProperty(value = "控制类型")
+    private String inControl;
+
+    @ApiModelProperty(value = "控制类型 0.失控 1.在控 2.待反馈")
+    private String inControlCode;
+
+    @ApiModelProperty(value = "脱离控制事件")
+    private Date outOfControlTime;
+
+    @ApiModelProperty(value = "目的的")
+    private String destination;
+
+    @ApiModelProperty(value = "说明")
+    private String info;
+
+    @ApiModelProperty(value = "走访人员")
+    private String visitBy;
+
+    @ApiModelProperty(value = "经度")
+    private String lng;
+
+    @ApiModelProperty(value = "维度")
+    private String lat;
+
+    @ApiModelProperty(value = "图片")
+    private String imageUrl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPsPersonZy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPsPersonZy.java
new file mode 100644
index 0000000..f91302e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/trs/VwPsPersonZy.java
@@ -0,0 +1,128 @@
+package com.mosty.base.model.entity.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/26
+ * 拓尔思走访人员表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("TRS_BIGDATA_GX.VW_PS_PERSON_ZY")
+@ApiModel(value = "VwPsPersonZy 对象", description = "拓尔思走访人员表")
+public class VwPsPersonZy implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    private String id;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String idNumber;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    @ApiModelProperty(value = "曾用名")
+    private String formerName;
+
+    @ApiModelProperty(value = "绰号")
+    private String nickName;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String politicalStatus;
+
+    @ApiModelProperty(value = "宗教信仰")
+    private String religiousBelief;
+
+    @ApiModelProperty(value = "现职业")
+    private String currentJob;
+
+    @ApiModelProperty(value = "联系方式")
+    private String contactInformation;
+
+    @ApiModelProperty(value = "户籍地")
+    private String registeredResidence;
+
+    @ApiModelProperty(value = "现住地")
+    private String currentResidence;
+
+    @ApiModelProperty(value = "管控状态")
+    private String controlStatus;
+
+    @ApiModelProperty(value = "管控状态 '1', '已列管', '2', '已布控', '3', '已归档'")
+    private String controlStatusCode;
+
+    @ApiModelProperty(value = "婚姻状态")
+    private String maritalStatus;
+
+    @ApiModelProperty(value = "基本情况")
+    private String basicInfo;
+
+    @ApiModelProperty(value = "区县编码")
+    private String areaCode;
+
+    @ApiModelProperty(value = "证件类型")
+    private String idType;
+
+    @ApiModelProperty(value = "是否在控")
+    private String isInControl;
+
+    @ApiModelProperty(value = "是否在控")
+    private String isInControlName;
+
+    @ApiModelProperty(value = "人员类别")
+    private String rylb;
+
+    @ApiModelProperty(value = "人员细类")
+    private String ryxl;
+
+    @ApiModelProperty(value = "责任警种")
+    private String zrjz;
+
+    @ApiModelProperty(value = "派出所代码")
+    private String sspcsmc;
+
+    @ApiModelProperty(value = "派出所名称")
+    private String sspcsdm;
+
+    @ApiModelProperty(value = "控制级别")
+    private String controlLevel;
+
+    @ApiModelProperty(value = "社区")
+    private String sssq;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date crTime;
+
+    @ApiModelProperty(value = "最后更新人")
+    private String upBy;
+
+    @ApiModelProperty(value = "最后更新时间")
+    private Date upTime;
+
+    @ApiModelProperty(value = "创建部门")
+    private String crDept;
+
+    @ApiModelProperty(value = "创建部门编号")
+    private String crDeptCode;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzLswz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzLswz.java
new file mode 100644
index 0000000..ee896dd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzLswz.java
@@ -0,0 +1,137 @@
+package com.mosty.base.model.entity.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_wz_lswz")
+@ApiModel(value = "TbWzLswz对象", description = "位置-历史位置表")
+public class TbWzLswz extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY(位置数据来源)数据来源（01 udp推送 02 移动设备）")
+    private String sjlydm;
+
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ(位置提供者)位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzRywz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzRywz.java
new file mode 100644
index 0000000..d6b5ec4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzRywz.java
@@ -0,0 +1,121 @@
+package com.mosty.base.model.entity.wzzx;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 位置-人员位置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_wz_rywz")
+@ApiModel(value = "TbWzRywz对象", description = "位置-人员位置表")
+public class TbWzRywz extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户身份证号")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "坐标线")
+    private LineString zb;
+
+    @ApiModelProperty(value = "坐标线（字符串类型），方便存入redis中")
+    @TableField(exist = false)
+    private List<BigDecimal[]> zbList;
+
+    @ApiModelProperty(value = "坐标点数量")
+    private Integer zbsl;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "定位日期", name = "dwrq", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dwrq;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "开始时间", name = "kssj", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "结束时间", name = "jssj", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "时长（分）")
+    private Integer sc;
+
+    @ApiModelProperty(value = "里程（米）")
+    private Integer lc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "结束时间", name = "jssj", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zhgxsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSblswz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSblswz.java
new file mode 100644
index 0000000..a5aec75
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSblswz.java
@@ -0,0 +1,151 @@
+package com.mosty.base.model.entity.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 位置-历史位置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_wz_sblswz")
+@ApiModel(value = "TbWzLswz对象", description = "位置-历史位置表")
+public class TbWzSblswz extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY(位置数据来源)数据来源（01 udp推送 02 移动设备）")
+    private String sjlydm;
+
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @ApiModelProperty(value = "设备ID")
+    private String sbid;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(exist = false)
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ(位置提供者)位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSbsswz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSbsswz.java
new file mode 100644
index 0000000..b61ab96
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSbsswz.java
@@ -0,0 +1,149 @@
+package com.mosty.base.model.entity.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 位置-历史位置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_wz_sbsswz")
+@ApiModel(value = "TbWzLswz对象", description = "位置-历史位置表")
+public class TbWzSbsswz extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY(位置数据来源)数据来源（86-对讲机udp推送，80-执法记录仪，84-无人机，04-机器人,05-车辆）")
+    private String sjlydm;
+
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @ApiModelProperty(value = "设备ID")
+    private String sbid;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ(位置提供者)位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSswz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSswz.java
new file mode 100644
index 0000000..db45add
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzSswz.java
@@ -0,0 +1,139 @@
+package com.mosty.base.model.entity.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_wz_sswz")
+@ApiModel(value = "TbWzSswz对象", description = "位置-实时位置表（只存7天数据）")
+public class TbWzSswz extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY（位置数据来源）数据来源（01 udp推送 02 移动设备）")
+    private String sjlydm;
+
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ（位置提供者）位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "接入编号")
+    private String jrbh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzXfwz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzXfwz.java
new file mode 100644
index 0000000..3fa1d28
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/wzzx/TbWzXfwz.java
@@ -0,0 +1,126 @@
+package com.mosty.base.model.entity.wzzx;
+
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-14 15:38:06
+ */
+@Data
+@TableName("tb_wz_xfwz")
+@ApiModel(value = "Entity Of tb_wz_xfwz")
+@Accessors(chain = true)
+public class TbWzXfwz extends BaseEntity implements Serializable {
+    
+    @ApiModelProperty(value = "唯一标识ID", name = "id")
+    private String id;
+    
+    @ApiModelProperty(value = "报备业务ID", name = "bbId")
+    private String bbId;
+    
+    @ApiModelProperty(value = "用户ID", name = "yhId")
+    private String yhId;
+    
+    @ApiModelProperty(value = "用户身份证号", name = "yhSfzh")
+    private String yhSfzh;
+    
+    @ApiModelProperty(value = "用户姓名", name = "yhXm")
+    private String yhXm;
+    
+    @ApiModelProperty(value = "警组ID", name = "jzId")
+    private String jzId;
+    
+    @ApiModelProperty(value = "警组名称", name = "jzMc")
+    private String jzMc;
+
+    @ApiModelProperty(value = "坐标线", dataType = "java.util.List")
+    private LineString zb;
+
+    @ApiModelProperty(value = "坐标线（保存redis使用）", dataType = "java.util.List")
+    @TableField(exist = false)
+    private List<BigDecimal[]> zbList;
+    
+    @ApiModelProperty(value = "坐标点数量", name = "zbsl")
+    private long zbsl;
+    
+    @ApiModelProperty(value = "定位日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dwrq;
+    
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "开始时间", name = "kssj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+    
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "结束时间", name = "jssj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jssj;
+   
+    @ApiModelProperty(value = "巡防时长（分）", name = "sc")
+    private Integer sc;
+    
+    @ApiModelProperty(value = "巡防里程（米）", name = "lc")
+    private Integer lc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "结束时间", name = "zhgxsj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zhgxsj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "在线状态", name = "zxzt")
+    @TableField(exist = false)
+    private String zxzt;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Czxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Czxx.java
new file mode 100644
index 0000000..cf6b9c1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Czxx.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.entity.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(value = "view_czxx")
+@ApiModel(value = "view_czxx 对象", description = "处置信息")
+public class Czxx {
+
+    @TableField(value = "id")
+    private String id;
+
+    @TableField(value = "phone")
+    private String phone;
+
+    @TableField(value = "time")
+    private String time;
+
+    @TableField(value = "mode1")
+    private String mode1;
+
+    @TableField(value = "jjdbh")
+    private String jjdbh;
+
+    @TableField(value = "jjyxm")
+    private String jjyxm;
+
+    @TableField(value = "zxid")
+    private String zxid;
+
+    @TableField(value = "lyh")
+    private String lyh;
+
+    @TableField(value = "units")
+    private String units;
+
+    @TableField(value = "lon")
+    private String lon;
+
+    @TableField(value = "lat")
+    private String lat;
+
+    @TableField(value = "bz")
+    private String bz;
+
+    @TableField(value = "cjdbh")
+    private String cjdbh;
+
+    @TableField(value = "fkdbh")
+    private String fkdbh;
+
+    @TableField(value = "rksj")
+    private String rksj;
+
+    @TableField(value = "gxsjc")
+    private String gxsjc;
+
+    @TableField(value = "rkr")
+    private String rkr;
+
+    @TableField(value = "gxr")
+    private String gxr;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAlarmAll.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAlarmAll.java
new file mode 100644
index 0000000..e28e704
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAlarmAll.java
@@ -0,0 +1,233 @@
+package com.mosty.base.model.entity.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 新稚警情表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gx_alarm_all")
+@ApiModel(value = "GxAlarmAll 对象", description = "新稚警情表")
+public class GxAlarmAll implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "事件编号")
+    private String incidentCode;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String adminCode;
+
+    @ApiModelProperty(value = "第一次呼入时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date firstCallinTime;
+
+    @ApiModelProperty(value = "第一次接入时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date firstFinishReceiveTime;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiptCode;
+
+    @ApiModelProperty(value = "市局代码")
+    private String firstReceiveOrgId;
+
+    @ApiModelProperty(value = "市局名称")
+    private String firstReceiveOrgName;
+
+    @ApiModelProperty(value = "")
+    private String firstReceivePersonId;
+
+    @ApiModelProperty(value = "接入人姓名")
+    private String firstReceivePersonName;
+
+    @ApiModelProperty(value = "呼入类型")
+    private String callinType;
+
+    @ApiModelProperty(value = "报警方式编号")
+    private String alarmMode;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String alarmPersonName;
+
+    @ApiModelProperty(value = "性别")
+    private String alarmPersonSex;
+
+    @ApiModelProperty(value = "报警电话")
+    private String contactTelNo;
+
+    @ApiModelProperty(value = "报警地址")
+    private String contactAddress;
+
+    @ApiModelProperty(value = "报警内容")
+    private String alarmContent;
+
+    @ApiModelProperty(value = "分局代码")
+    private String subBureauId;
+
+    @ApiModelProperty(value = "分局名称")
+    private String subBureauName;
+
+    @ApiModelProperty(value = "单位代码")
+    private String mainOrgId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String mainOrgName;
+
+    @ApiModelProperty(value = "报警类型")
+    private String alarmCategory;
+
+    @ApiModelProperty(value = "报警级别")
+    private String alarmLevel;
+
+    @ApiModelProperty(value = "报警等级")
+    private String important;
+
+    @ApiModelProperty(value = "报警类型")
+    private String caseType;
+
+    @ApiModelProperty(value = "警情类别")
+    private String alarmMajorType;
+
+    @ApiModelProperty(value = "警情类型")
+    private String alarmSubType;
+
+    @ApiModelProperty(value = "警情细类")
+    private String alarmMinorType;
+
+    @ApiModelProperty(value = "报警地址")
+    private String alarmAddress;
+
+    @ApiModelProperty(value = "")
+    private String alarmLocation;
+
+    @ApiModelProperty(value = "")
+    private String locationTarget;
+
+    @ApiModelProperty(value = "")
+    private String alarmAddressType;
+
+    @ApiModelProperty(value = "")
+    private String incidentStatus;
+
+    @ApiModelProperty(value = "")
+    private String resultsType;
+
+    @ApiModelProperty(value = "")
+    private String handleSituation;
+
+    @ApiModelProperty(value = "")
+    private String relatedIncidentCode;
+
+    @ApiModelProperty(value = "")
+    private String anonymous;
+
+    @ApiModelProperty(value = "")
+    private String maybeHarass;
+
+    @ApiModelProperty(value = "")
+    private String dispatchedUnits;
+
+    @ApiModelProperty(value = "")
+    private String lockedBy;
+
+    @ApiModelProperty(value = "")
+    private String feedbackConfirmed;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "")
+    private String updateTime;
+
+    @ApiModelProperty(value = "")
+    private String firstStartReceiveTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmStartTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmEndTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmCommunity;
+
+    @ApiModelProperty(value = "")
+    private String focused;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiveSeatNo;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiveSeatIp;
+
+    @ApiModelProperty(value = "")
+    private String firstReceivePersonPoliceNo;
+
+    @ApiModelProperty(value = "")
+    private String labelPredict;
+
+    @ApiModelProperty(value = "")
+    private String receiveSatisfaction;
+
+    @ApiModelProperty(value = "")
+    private String policeSatisfaction;
+
+    @ApiModelProperty(value = "")
+    private String returnVisitRecordCode;
+
+    @ApiModelProperty(value = "")
+    private String firstCallinCode;
+
+    @ApiModelProperty(value = "")
+    private String firstRecordingNo;
+
+    @ApiModelProperty(value = "")
+    private String idNumber;
+
+    @ApiModelProperty(value = "")
+    private String alarmSource;
+
+    @ApiModelProperty(value = "")
+    private String holdWeapons;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "维度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "")
+    private String isFlag;
+
+    @ApiModelProperty(value = "")
+    private String policeName;
+
+    @ApiModelProperty(value = "")
+    private String policeNo;
+
+    @ApiModelProperty(value = "")
+    private String isOtherUnit;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAy.java
new file mode 100644
index 0000000..c31868b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxAy.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.entity.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/31
+ * 新稚警情分类表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gx_ay")
+@ApiModel(value = "GxAy 对象", description = "新稚警情分类表")
+public class GxAy implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "code")
+    private String code;
+
+    @ApiModelProperty(value = "事件编号")
+    private String name;
+
+    @ApiModelProperty(value = "等级")
+    private Integer level;
+
+    @ApiModelProperty(value = "父级代码")
+    private String parent_code;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxCjdb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxCjdb.java
new file mode 100644
index 0000000..ec4ae94
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/GxCjdb.java
@@ -0,0 +1,83 @@
+package com.mosty.base.model.entity.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/07
+ * 新稚警情出警单表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("gx_cjdb")
+@ApiModel(value = "GxCjdb 对象", description = "新稚警情出警单表")
+public class GxCjdb implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "处警单编号")
+    private String cjdbh;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "行政区划")
+    private Integer xzqh;
+
+    @ApiModelProperty(value = "处警单位代码")
+    private String cjdwbm;
+
+    @ApiModelProperty(value = "处警单位名称")
+    private String cjdwmc;
+
+    @ApiModelProperty(value = "处警员编号")
+    private String cjybh;
+
+    @ApiModelProperty(value = "处警员姓名")
+    private String cjyxm;
+
+    @ApiModelProperty(value = "处警时间")
+    private Date cjsj;
+
+    @ApiModelProperty(value = "")
+    private String cjyj;
+
+    @ApiModelProperty(value = "审计单位代码")
+    private String sjdwdm;
+
+    @ApiModelProperty(value = "审计员编号")
+    private String sjybh;
+
+    @ApiModelProperty(value = "审计员姓名")
+    private String sjyxm;
+
+    @ApiModelProperty(value = "")
+    private String pdddsj;
+
+    @ApiModelProperty(value = "")
+    private String pdjssj;
+
+    @ApiModelProperty(value = "")
+    private String ddxcsj;
+
+    @ApiModelProperty(value = "")
+    private String cjwbsj;
+
+    @ApiModelProperty(value = "处置类别编号")
+    private String czlbbh;
+
+    @ApiModelProperty(value = "处置类别名称")
+    private String czlbmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Jjdb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Jjdb.java
new file mode 100644
index 0000000..e3e1d87
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/xinzhi/Jjdb.java
@@ -0,0 +1,250 @@
+package com.mosty.base.model.entity.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName(value = "v_jjdb")
+@ApiModel(value = "JJDB 对象", description = "接警单")
+public class Jjdb {
+
+    @ApiModelProperty(value = "事件编号")
+    @TableField(value = "xzqhdm")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "接警单位代码")
+    @TableField(value = "jjdwdm")
+    private String jjdwdm;
+
+    @ApiModelProperty(value = "接警单编号")
+    @TableField(value = "jjdbh")
+    @TableId(value = "jjdbh")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "关联主接警单编号")
+    @TableField(value = "glzjjdbh")
+    private String glzjjdbh;
+
+    @ApiModelProperty(value = "接警类型")
+    @TableField(value = "jjlx")
+    private String jjlx;
+
+    @ApiModelProperty(value = "警情来源方式")
+    @TableField(value = "jqlyfs")
+    private String jqlyfs;
+
+    @ApiModelProperty(value = "来话类型")
+    @TableField(value = "lhlx")
+    private String lhlx;
+
+    @ApiModelProperty(value = "接警录音号")
+    @TableField(value = "jjlyh")
+    private String jjlyh;
+
+    @ApiModelProperty(value = "接警员编号")
+    @TableField(value = "jjybh")
+    private String jjybh;
+
+    @ApiModelProperty(value = "接警员姓名")
+    @TableField(value = "jjyxm")
+    private String jjyxm;
+
+    @ApiModelProperty(value = "报警时间")
+    @TableField(value = "bjsj")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bjsj;
+
+    @ApiModelProperty(value = "接警时间")
+    @TableField(value = "jjsj")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jjsj;
+
+    @ApiModelProperty(value = "接警完成时间")
+    @TableField(value = "jjwcsj")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jjwcsj;
+
+    @ApiModelProperty(value = "报警电话")
+    @TableField(value = "bjdh")
+    private String bjdh;
+
+    @ApiModelProperty(value = "报警电话用户名")
+    @TableField(value = "bjdhyhm")
+    private String bjdhyhm;
+
+    @ApiModelProperty(value = "报警电话用户地址")
+    @TableField(value = "bjdhyhdz")
+    private String bjdhyhdz;
+
+    @ApiModelProperty(value = "报警人名称")
+    @TableField(value = "bjrmc")
+    private String bjrmc;
+
+    @ApiModelProperty(value = "报警人性别代码")
+    @TableField(value = "bjrxbdm")
+    private String bjrxbdm;
+
+    @ApiModelProperty(value = "联系电话")
+    @TableField(value = "lxdh")
+    private String lxdh;
+
+    @ApiModelProperty(value = "报警人证件代码")
+    @TableField(value = "bjrzjdm")
+    private String bjrzjdm;
+
+    @ApiModelProperty(value = "报警人证件号码")
+    @TableField(value = "bjrzjhm")
+    private String bjrzjhm;
+
+    @ApiModelProperty(value = "报警地址")
+    @TableField(value = "bjdz")
+    private String bjdz;
+
+    @ApiModelProperty(value = "警情地址")
+    @TableField(value = "jqdz")
+    private String jqdz;
+
+    @ApiModelProperty(value = "报警内容")
+    @TableField(value = "bjnr")
+    private String bjnr;
+
+    @ApiModelProperty(value = "管辖单位代码")
+    @TableField(value = "gxdwdm")
+    private String gxdwdm;
+
+    @ApiModelProperty(value = "警情类别代码")
+    @TableField(value = "jqlbdm")
+    private String jqlbdm;
+
+    @ApiModelProperty(value = "警情类型代码")
+    @TableField(value = "jqlxdm")
+    private String jqlxdm;
+
+    @ApiModelProperty(value = "警情细类代码")
+    @TableField(value = "jqxldm")
+    private String jqxldm;
+
+    @ApiModelProperty(value = "警情子类代码")
+    @TableField(value = "jqzldm")
+    private String jqzldm;
+
+    @ApiModelProperty(value = "特征点编号")
+    @TableField(value = "tzdbh")
+    private String tzdbh;
+
+    @ApiModelProperty(value = "作案人数")
+    @TableField(value = "zars")
+    private Integer zars;
+
+    @ApiModelProperty(value = "有无持武器")
+    @TableField(value = "ywcwq")
+    private String ywcwq;
+
+    @ApiModelProperty(value = "有无危险物质")
+    @TableField(value = "ywwxwz")
+    private String ywwxwz;
+
+    @ApiModelProperty(value = "有无爆炸/泄漏")
+    @TableField(value = "ywbzxl")
+    private String ywbzxl;
+
+    @ApiModelProperty(value = "被困人员情况说明")
+    @TableField(value = "bkryqksm")
+    private String bkryqksm;
+
+    @ApiModelProperty(value = "受伤人员情况说明")
+    @TableField(value = "ssryqksm")
+    private String ssryqksm;
+
+    @ApiModelProperty(value = "死亡人员情况说明")
+    @TableField(value = "swryqksm")
+    private String swryqksm;
+
+    @ApiModelProperty(value = "是否是外语报警")
+    @TableField(value = "sfswybj")
+    private String sfswybj;
+
+    @ApiModelProperty(value = "报警人定位X坐标")
+    @TableField(value = "bjrxzb")
+    private BigDecimal bjrxzb;
+
+    @ApiModelProperty(value = "报警人定位Y坐标")
+    @TableField(value = "bjryzb")
+    private BigDecimal bjryzb;
+
+    @ApiModelProperty(value = "反向定位X坐标")
+    @TableField(value = "fxdwjd")
+    private BigDecimal fxdwjd;
+
+    @ApiModelProperty(value = "反向定位Y坐标")
+    @TableField(value = "fxdwwd")
+    private BigDecimal fxdwwd;
+
+    @ApiModelProperty(value = "补充接警内容")
+    @TableField(value = "bcjjnr")
+    private String bcjjnr;
+
+    @ApiModelProperty(value = "警情等级代码")
+    @TableField(value = "jqdjdm")
+    private String jqdjdm;
+
+    @ApiModelProperty(value = "警情处理状态代码")
+    @TableField(value = "jqclztdm")
+    private String jqclztdm;
+
+    @ApiModelProperty(value = "应急救援等级代码")
+    @TableField(value = "yjjydjdm")
+    private String yjjydjdm;
+
+    @ApiModelProperty(value = "涉及车号牌种类代码")
+    @TableField(value = "sjchpzldm")
+    private String sjchpzldm;
+
+    @ApiModelProperty(value = "涉及车牌号")
+    @TableField(value = "sjcph")
+    private String sjcph;
+
+    @ApiModelProperty(value = "是否是危化车辆")
+    @TableField(value = "sfswhcl")
+    private String sfswhcl;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "cjsj")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String cjsj;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(value = "gxsj")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String gxsj;
+
+    @ApiModelProperty(value = "警情标签是对警情内容关键要素的提取和标注")
+    @TableField(value = "jqbq")
+    private String jqbq;
+
+    @ApiModelProperty(value = "是否保密")
+    @TableField(value = "sfbm")
+    private String sfbm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yisa/LocationBase.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yisa/LocationBase.java
new file mode 100644
index 0000000..39149b6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yisa/LocationBase.java
@@ -0,0 +1,63 @@
+package com.mosty.base.model.entity.yisa;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 以撒感知源表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("location")
+@ApiModel(value = "LocationBase 对象", description = "以撒感知源表")
+public class LocationBase implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "名称")
+    private String pointname;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "点位类型 1:卡口,2:电警,3:混合,4:虚拟卡口,5:小区停车场,6:收费站99其他")
+    private String locationType;
+
+    @ApiModelProperty(value = "0不限 1车头 2车尾")
+    private String passfunc;
+
+    @ApiModelProperty(value = "")
+    private String regioncode;
+
+    @ApiModelProperty(value = "1：进行交通检测")
+    private String istraffic;
+
+    @ApiModelProperty(value = "位置名")
+    private String place;
+
+    @ApiModelProperty(value = "管辖单位，关联部门id")
+    private String orgcode;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzyc.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzyc.java
new file mode 100644
index 0000000..e9e7855
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzyc.java
@@ -0,0 +1,117 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@TableName("tb_fzyc")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzyc对象", description = "犯罪预测表")
+public class TbFzyc extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    private String realDate;
+
+    @ApiModelProperty(value = "预测定义")
+    private BigDecimal defId;
+
+    @ApiModelProperty(value = "预测类型")
+    private String category;
+
+    @ApiModelProperty(value = "预测时段")
+    private String timeRange;
+
+    @ApiModelProperty(value = "网格大小")
+    private String gridType;
+
+    @ApiModelProperty(value = "网格ID")
+    private String gridNum;
+
+    @ApiModelProperty(value = "网格坐标X1")
+    private BigDecimal x1;
+
+    @ApiModelProperty(value = "网格坐标Y1")
+    private BigDecimal y1;
+
+    @ApiModelProperty(value = "网格坐标X2")
+    private BigDecimal x2;
+
+    @ApiModelProperty(value = "网格坐标Y2")
+    private BigDecimal y2;
+
+    @ApiModelProperty(value = "案发概率")
+    private BigDecimal prob;
+
+    @ApiModelProperty(value = "巡区 ID")
+    private BigDecimal subId;
+
+    @ApiModelProperty(value = "案发背景信息")
+    private String refInfos;
+
+    @ApiModelProperty(value = "智慧街面巡防指令ID")
+    private String zhjmxfZlid;
+
+    @ApiModelProperty(value = "是否已巡逻")
+    private String sfxl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "中心X")
+    private BigDecimal zxX;
+
+    @ApiModelProperty(value = "中心Y")
+    private BigDecimal zxY;
+
+    @ApiModelProperty(value = "定位id")
+    private String dwId;
+
+    @ApiModelProperty(value = "历史id")
+    private String lsId;
+
+    @ApiModelProperty(value = "班次")
+    private String bc;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycJsdx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycJsdx.java
new file mode 100644
index 0000000..d7da5ac
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycJsdx.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@TableName("tb_fzyc_jsdx")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycJsdx对象", description = "犯罪预测接收对象表")
+public class TbFzycJsdx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "犯罪预测id")
+    private String fzycId;
+
+    @ApiModelProperty(value = "巡区id")
+    private String xfqId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "定位id")
+    private String dwId;
+
+    @ApiModelProperty(value = "历史id")
+    private String lsId;
+
+    @ApiModelProperty(value = "巡防区名称")
+    private String xfqMc;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycPz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycPz.java
new file mode 100644
index 0000000..8565f13
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycPz.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@TableName("tb_fzyc_pz")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycPz对象", description = "犯罪预测单位配置表")
+public class TbFzycPz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "预测部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "预测部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXfxz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXfxz.java
new file mode 100644
index 0000000..4e161aa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXfxz.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@TableName("tb_fzyc_xfxz")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycXfxz对象", description = "犯罪预测下发指令巡组")
+public class TbFzycXfxz extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "犯罪预测id")
+    private String fzycId;
+
+    @ApiModelProperty(value = "报备ID")
+    private String bbId;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "是否签收 0否")
+    private String sfqs;
+
+    @ApiModelProperty(value = "巡组名称")
+    private String xzmc;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXljl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXljl.java
new file mode 100644
index 0000000..975f7f9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbFzycXljl.java
@@ -0,0 +1,104 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("tb_fzyc_xljl")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycXljl对象", description = "犯罪预测巡逻记录表")
+public class TbFzycXljl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "巡逻报备ID")
+    private String xlbbId;
+
+    @ApiModelProperty(value = "犯罪预警预测指令ID")
+    private String fzyjyczlId;
+
+    @ApiModelProperty(value = "巡逻开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xlkssj;
+
+    @ApiModelProperty(value = "巡逻结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xljssj;
+
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "距离中心点距离（米）")
+    private BigDecimal zxJl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "报备部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "报备部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "巡防时长")
+    private int xfsc;
+
+    @ApiModelProperty(value = "巡防里程")
+    private int xflc;
+
+    @ApiModelProperty(value = "坐标线", dataType = "java.util.List")
+    private LineString zb;
+
+    @ApiModelProperty(value = "坐标线（保存redis使用）", dataType = "java.util.List")
+    @TableField(exist = false)
+    private List<BigDecimal[]> zbList;
+
+    @ApiModelProperty(value = "巡组名称")
+    private String xzmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjDyyjxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjDyyjxx.java
new file mode 100644
index 0000000..874fbe1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjDyyjxx.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 订阅预警信息表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yj_dyyjxx")
+@ApiModel(value = "TbYjDyyjxx 对象", description = "订阅预警信息表")
+public class TbYjDyyjxx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "是否短信通知")
+    private String sfdxtz;
+
+    @ApiModelProperty(value = "短信内容")
+    private String dxnr;
+
+    @ApiModelProperty(value = "短信手机号")
+    private String dxjssjh;
+
+    @ApiModelProperty(value = "发送时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dxfssj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmx.java
new file mode 100644
index 0000000..f160b65
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmx.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@TableName("tb_yjmx")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbYjmx对象", description = "预警明细实体表")
+public class TbYjmx extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "模型名称", name = "mxmc")
+    private String mxmc;
+
+    @ApiModelProperty(value = "模型类型 01.街面违法犯罪预警 02.重点巡防区域预警", name = "mxlx")
+    private String mxlx;
+
+    @ApiModelProperty(value = "模型说明", name = "mxsm")
+    private String mxsm;
+
+    @ApiModelProperty(value = "运行周期", name = "yxzq")
+    private Integer yxzq;
+
+    @ApiModelProperty(value = "模型状态 01-使用中 02-已停止", name = "mxzt")
+    private String mxzt;
+
+    @ApiModelProperty(value = "运行次数", name = "yxcs")
+    private Integer yxcs;
+
+    @ApiModelProperty(value = "预警次数", name = "yjcs")
+    private Integer yjcs;
+
+    @ApiModelProperty(value = "所属辖区名称", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属辖区代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属辖区ID", name = "ssbmid")
+    private String ssbmid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmxCsb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmxCsb.java
new file mode 100644
index 0000000..876d7f0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjmxCsb.java
@@ -0,0 +1,41 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@TableName("tb_yjmx_csb")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbYjmxCsb对象", description = "预警模式参数实体表")
+public class TbYjmxCsb extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "模型ID", name = "mxid")
+    private String mxid;
+
+    @ApiModelProperty(value = "参数代码", name = "csdm")
+    private String csdm;
+
+    @ApiModelProperty(value = "参数名称", name = "csmc")
+    private String csmc;
+
+    @ApiModelProperty(value = "参数值", name = "csz")
+    private String csz;
+
+    @ApiModelProperty(value = "参数类型 01-时间（分）02-次数 03-人数 04-距离（米）", name = "cslx")
+    private String cslx;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxx.java
new file mode 100644
index 0000000..e91a3d1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxx.java
@@ -0,0 +1,183 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 20:04:27
+ */
+@Data
+@TableName("tb_yjxx")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbYjxx对象", description = "预警信息实体表")
+public class TbYjxx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "预警来源类型 01.感知预警  02.派发预警", name = "yjLylx")
+    private String yjLylx;
+
+    @ApiModelProperty(value = "预警类型;1-人员预警，2-车辆预警，3-人员和车辆预警，4-事件预警（拉横幅、打架等），5-警情", name = "yjLx")
+    private String yjLx;
+
+    @ApiModelProperty(value = "感知源id", name = "yjGzyid")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "感知源名称", name = "yjGzymc")
+    private String yjGzymc;
+
+    @ApiModelProperty(value = "发生年份")
+    private Integer yjFsnf;
+
+    @ApiModelProperty(value = "发生月份")
+    private Integer yjFsyf;
+
+    @ApiModelProperty(value = "发生年月")
+    private Integer yjFsny;
+
+    @ApiModelProperty(value = "发生周数")
+    private Integer yjFszs;
+
+    @ApiModelProperty(value = "发生小时")
+    private Integer yjFsxs;
+
+    @ApiModelProperty(value = "发生日期", name = "yjFsrq")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date yjFsrq;
+
+    @ApiModelProperty(value = "发生时间", name = "yjFssj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间", name = "yjSj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "预警级别（10红、20橙、30黄、40蓝）", name = "yjJb")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题", name = "yjBt")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容", name = "yjNr")
+    private String yjNr;
+
+    @ApiModelProperty(value = "预警次数", name = "yjCs")
+    private long yjCs;
+
+    @ApiModelProperty(value = "今日预警次数", name = "yjJrcs")
+    private long yjJrcs;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+//    @ApiModelProperty(value = "坐标", name = "zb")
+//    private Point zb;
+
+//    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+//    private String zbhash;
+
+    @ApiModelProperty(value = "预警地址-行政区划代码", name = "yjDzXzqh")
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "预警地址", name = "yjDz")
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警人员姓名", name = "yjRyxm")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警人员身份证号码（人员预警必填）", name = "yjRysfzh")
+    private String yjRysfzh;
+
+    @ApiModelProperty(value = "相似度", name = "xsd")
+    private BigDecimal xsd;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌类型）车牌类型", name = "yjHplx")
+    private String yjHplx;
+
+    @ApiModelProperty(value = "预警车辆车牌号;车辆预警必填", name = "yjClcph")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "预警标签", name = "yjbq")
+    private String yjbq;
+
+    @ApiModelProperty(value = "预警标签详情", name = "yjbqmc")
+    private String yjbqmc;
+
+    @ApiModelProperty(value = "是否发送指令", name = "sfFszl")
+    private String sfFszl;
+
+    @ApiModelProperty(value = "是否误报", name = "sfWb")
+    private String sfWb;
+
+    @ApiModelProperty(value = "预警图片", name = "yjTp")
+    private String yjTp;
+
+    @ApiModelProperty(value = "预警小图片", name = "yjXtp")
+    private String yjXtp;
+
+    @ApiModelProperty(value = "预警来源Id", name = "yjlyid")
+    private String yjlyid;
+
+    @ApiModelProperty(value = "预警来源名称", name = "yjlyBqmc")
+    private String yjlyBqmc;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "三方预警id")
+    private String sfYjid;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxCl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxCl.java
new file mode 100644
index 0000000..0cb077e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxCl.java
@@ -0,0 +1,172 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_cl")
+@ApiModel(value = "TbYjxxCl对象", description = "预警信息-车辆表")
+public class TbYjxxCl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警车辆表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）车辆标签 1-临控  2-被抢盗  3-套牌  4-假牌  5-双胞胎车 6-未系安全带 7-接打电话")
+    private String yjClbq;
+
+    @ApiModelProperty(value = "车辆标签名称")
+    private String yjClbqmc;
+
+    @ApiModelProperty(value = "预警来源标签名称")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-mm-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-mm-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌类型）车牌类型")
+    private String yjCphlx;
+
+    @ApiModelProperty(value = "车牌号")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "机动车所有人号码（身份证号或组织机构代码）")
+    private String yjCljdcsyrhm;
+
+    @ApiModelProperty(value = "机动车所有人")
+    private String yjCljdcsyr;
+
+    @ApiModelProperty(value = "--D_BZ_CPHYS（车牌号颜色）车牌号颜色")
+    private String yjCphys;
+
+    @ApiModelProperty(value = "--D_BZ_CLYS（车辆颜色）车身颜色")
+    private String yjClys;
+
+    @ApiModelProperty(value = "--D_BZ_CLPP（车辆品牌）车辆品牌")
+    private String yjClpp;
+
+    @ApiModelProperty(value = "--D_BZ_CLLX（车辆类型）车辆类型，如：轿车、客车、牵引车、摩托车")
+    private String yjCllx;
+
+    @ApiModelProperty(value = "车辆年款")
+    private String yjClnk;
+
+    @ApiModelProperty(value = "行驶方向")
+    private String yjXsfx;
+
+    @ApiModelProperty(value = "行驶速度")
+    private BigDecimal yjXssd;
+
+    @ApiModelProperty(value = "车内人数")
+    private Integer yjClrs;
+
+    @ApiModelProperty(value = "出现时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-mm-dd HH:mm:ss", timezone = "GMT+8")
+    private Date clCxsj;
+
+    @ApiModelProperty(value = "消失时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-mm-dd HH:mm:ss", timezone = "GMT+8")
+    private Date clXssj;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警地点-行政区划代码")
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "预警地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "预警图片")
+    private String yjTp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxClBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxClBq.java
new file mode 100644
index 0000000..08a5f43
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxClBq.java
@@ -0,0 +1,41 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预警信息-车辆-标签表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_cl_bq")
+@ApiModel(value="TbYjxxClBq对象", description="预警信息-车辆-标签表")
+public class TbYjxxClBq extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警车辆标签表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "预警车辆表标识ID")
+    private String yjclId;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）车辆标签代码：字典")
+    private String clbqdm;
+
+    @ApiModelProperty(value = "车辆标签")
+    private String clbqmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypz.java
new file mode 100644
index 0000000..56eac3a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypz.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz")
+@ApiModel(value="TbYjxxDypz对象", description="预警信息-订阅配置表")
+public class TbYjxxDypz extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）订阅预警级别")
+    private String dyYjjb;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）订阅人员标签")
+    private String dyYjrybq;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）订阅车辆标签")
+    private String dyYjclbq;
+
+    @ApiModelProperty(value = "订阅感知源数量")
+    private Integer dyGzysl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzClbq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzClbq.java
new file mode 100644
index 0000000..aff9b99
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzClbq.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz_clbq")
+@ApiModel(value="TbYjxxDypzClbq对象", description="预警信息-订阅-车辆标签表")
+public class TbYjxxDypzClbq extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅表id")
+    private String dyId;
+
+    @ApiModelProperty(value = "订阅人ID")
+    private String dyRyid;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）订阅车辆标签")
+    private String dyClbq;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzGzy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzGzy.java
new file mode 100644
index 0000000..bc95d2b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzGzy.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz_gzy")
+@ApiModel(value="TbYjxxDypzGzy对象", description="预警信息-订阅-感知源表")
+public class TbYjxxDypzGzy extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警信息人员类型订阅表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅表id")
+    private String dyId;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyRyid;
+
+    @ApiModelProperty(value = "订阅感知源id")
+    private String dyGzyid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzRybq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzRybq.java
new file mode 100644
index 0000000..ea5ad03
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzRybq.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz_rybq")
+@ApiModel(value="TbYjxxDypzRybq对象", description="预警信息-订阅-人员标签表")
+public class TbYjxxDypzRybq extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警信息人员类型订阅表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅ID")
+    private String dyId;
+
+    @ApiModelProperty(value = "订阅人ID")
+    private String dyRyid;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）订阅预警人员标签")
+    private String dyRybq;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzSjbq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzSjbq.java
new file mode 100644
index 0000000..ffea747
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzSjbq.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz_sjbq")
+@ApiModel(value="TbYjxxDypzSjbq对象", description="预警信息-订阅-事件标签表")
+public class TbYjxxDypzSjbq extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅表id")
+    private String dyId;
+
+    @ApiModelProperty(value = "订阅人ID")
+    private String dyRyid;
+
+    @ApiModelProperty(value = "--D_BZ_SJBQ（事件标签）订阅事件标签")
+    private String dySjbq;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzYjjb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzYjjb.java
new file mode 100644
index 0000000..6ced672
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDypzYjjb.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz_yjjb")
+@ApiModel(value="TbYjxxDypzYjjb对象", description="预警信息-订阅-预警级别表")
+public class TbYjxxDypzYjjb extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅id")
+    private String dyId;
+
+    @ApiModelProperty(value = "订阅人ID")
+    private String dyRyid;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String dyYjjb;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDyyjxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDyyjxx.java
new file mode 100644
index 0000000..2bd0174
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxDyyjxx.java
@@ -0,0 +1,85 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 订阅预警信息表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dyyjxx")
+@ApiModel(value="TbYjxxDyyjxx对象", description="订阅预警信息表")
+public class TbYjxxDyyjxx extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjsj;
+
+    @ApiModelProperty(value = "是否短信通知")
+    private String sfdxtz;
+
+    @ApiModelProperty(value = "短信内容")
+    private String dxnr;
+
+    @ApiModelProperty(value = "短信手机号")
+    private String dxjssjh;
+
+    @ApiModelProperty(value = "发送时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dxfssj;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxMxyj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxMxyj.java
new file mode 100644
index 0000000..99a2989
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxMxyj.java
@@ -0,0 +1,172 @@
+package com.mosty.base.model.entity.yjzl;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("tb_yjxx_mxyj")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbYjxxMxyj 对象", description = "预警信息-模型预警实体表")
+public class TbYjxxMxyj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "预警类型;1-人员预警，2-车辆预警", name = "yjLx")
+    private String yjLx;
+
+    @ApiModelProperty(value = "模型ID", name = "mxid")
+    private String mxid;
+
+    @ApiModelProperty(value = "关联预警表id", name = "yjid")
+    private String yjid;
+
+    @ApiModelProperty(value = "关联预警Id（多预警用逗号拼接）", name = "yjids")
+    private String yjids;
+
+    @ApiModelProperty(value = "感知源id", name = "yjGzyid")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "感知源名称", name = "yjGzymc")
+    private String yjGzymc;
+
+    @ApiModelProperty(value = "发生年份")
+    private Integer yjFsnf;
+
+    @ApiModelProperty(value = "发生月份")
+    private Integer yjFsyf;
+
+    @ApiModelProperty(value = "发生年月")
+    private Integer yjFsny;
+
+    @ApiModelProperty(value = "发生周数")
+    private Integer yjFszs;
+
+    @ApiModelProperty(value = "发生小时")
+    private Integer yjFsxs;
+
+    @ApiModelProperty(value = "发生日期", name = "yjFsrq")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date yjFsrq;
+
+    @ApiModelProperty(value = "发生时间", name = "yjFssj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间", name = "yjSj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "预警级别（10红、20橙、30黄、40蓝）", name = "yjJb")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题", name = "yjBt")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容", name = "yjNr")
+    private String yjNr;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "距离", name = "jl")
+    private Integer jl;
+
+    @ApiModelProperty(value = "预警地址-行政区划代码", name = "yjDzXzqh")
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "预警地址", name = "yjDz")
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警人员姓名", name = "yjRyxm")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警人员身份证号码（人员预警必填）", name = "yjRysfzh")
+    private String yjRysfzh;
+
+    @ApiModelProperty(value = "相似度", name = "xsd")
+    private BigDecimal xsd;
+
+    @ApiModelProperty(value = "人数、车数", name = "yjsl")
+    private Integer yjsl;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌类型）车牌类型", name = "yjHplx")
+    private String yjHplx;
+
+    @ApiModelProperty(value = "预警车辆车牌号;车辆预警必填", name = "yjClcph")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "预警标签", name = "yjbq")
+    private String yjbq;
+
+    @ApiModelProperty(value = "预警标签详情", name = "yjbqmc")
+    private String yjbqmc;
+
+    @ApiModelProperty(value = "是否发送指令", name = "sfFszl")
+    private String sfFszl;
+
+    @ApiModelProperty(value = "是否误报", name = "sfWb")
+    private String sfWb;
+
+    @ApiModelProperty(value = "预警来源Id", name = "yjlyid")
+    private String yjlyid;
+
+    @ApiModelProperty(value = "预警来源名称", name = "yjlyBqmc")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRy.java
new file mode 100644
index 0000000..b313ee2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRy.java
@@ -0,0 +1,198 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 预警信息-人员表
+ * </p>
+ *
+ * @author DW
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_ry")
+@ApiModel(value = "TbYjxxRy对象", description = "预警信息-人员表")
+public class TbYjxxRy extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警人员标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "乘坐车辆ID")
+    private String yjClid;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_SJLYUAN（事件来源）预警数据来源")
+    private String yjSjly;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "感知源名称")
+    private String yjGzymc;
+
+    @ApiModelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）预警人员标签")
+    private String yjRybq;
+
+    @ApiModelProperty(value = "预警人员标签详情")
+    private String yjRybqmc;
+
+    @ApiModelProperty(value = "预警来源标签名称")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）预警证件类型")
+    private String yjZjlx;
+
+    @ApiModelProperty(value = "预警证件号码")
+    private String yjZjhm;
+
+    @ApiModelProperty(value = "预警人员姓名")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警人员性别")
+    private String yjRyxb;
+
+    @ApiModelProperty(value = "预警人员年龄")
+    private Integer yjRynl;
+
+    @ApiModelProperty(value = "预警人员民族")
+    private String yjRymz;
+
+    @ApiModelProperty(value = "预警人员籍贯")
+    private String yjRyjg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警人员户籍地行政区划")
+    private String yjRyhjdXzqh;
+
+    @ApiModelProperty(value = "预警人员户籍地")
+    private String yjRyhjd;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警人员居住址行政区划代码")
+    private String yjRyjzdXzqh;
+
+    @ApiModelProperty(value = "预警人员居住址")
+    private String yjRyjzd;
+
+    @ApiModelProperty(value = "预警人员工作单位id(关联实有单位)")
+    private String yjRygzdwid;
+
+    @ApiModelProperty(value = "预警人员工作单位")
+    private String yjRygzdw;
+
+    @ApiModelProperty(value = "预警人员联系电话")
+    private String yjRylxdh;
+
+    @ApiModelProperty(value = "预警人员相似度")
+    private BigDecimal yjXsd;
+
+    @ApiModelProperty(value = "人员行为描述")
+    private String yjXwms;
+
+    @ApiModelProperty(value = "左上角 X 坐标")
+    private BigDecimal ltx;
+
+    @ApiModelProperty(value = "左上角 Y 坐标")
+    private BigDecimal lty;
+
+    @ApiModelProperty(value = "右下角 X 坐标")
+    private BigDecimal rbx;
+
+    @ApiModelProperty(value = "右下角Y坐标")
+    private BigDecimal rby;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警地点行政区划代码")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "预警地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "预警封面图片")
+    private String coverImage;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRyBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRyBq.java
new file mode 100644
index 0000000..914925a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRyBq.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预警信息-人员-标签表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_ry_bq")
+@ApiModel(value="TbYjxxRyBq对象", description="预警信息-人员-标签表")
+public class TbYjxxRyBq extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警人员标签表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "预警人员表标识ID")
+    private String yjryId;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）人员标签代码，字典")
+    private String rybqdm;
+
+    @ApiModelProperty(value = "人员标签")
+    private String rybqmc;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRySjaj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRySjaj.java
new file mode 100644
index 0000000..81252b3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxRySjaj.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 预警信息-人员-涉及案件表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_ry_sjaj")
+@ApiModel(value="TbYjxxRySjaj对象", description="预警信息-人员-涉及案件表")
+public class TbYjxxRySjaj extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警人员标签表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "预警人员表标识ID")
+    private String yjryId;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别代码（部标字典）")
+    private String ajlbdm;
+
+    @ApiModelProperty(value = "案件类别名称")
+    private String ajlbmc;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "犯罪时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fzsj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSj.java
new file mode 100644
index 0000000..53a627a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSj.java
@@ -0,0 +1,123 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 预警信息-事件表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_sj")
+@ApiModel(value="TbYjxxSj对象", description="预警信息-事件表")
+public class TbYjxxSj extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警事件标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "事件分类:01-人员滞留，02-人员排徊，03-人员入侵，04-人员越线，05-人员逆行，" +
+            "06-人员离开，07-人员跌倒，08-人员聚集，09-攀爬栏杆，10-爬墙攀高，11-打架斗殴，12-横幅检测，" +
+            "13-标语检测，14-夜间暗影，15-街头躺卧，16-街头蹲坐，17-机动车违停，18-道路积水。D_BZ_SJBQ（事件标签）")
+    private String sjFl;
+
+    @ApiModelProperty(value = "事件分类")
+    private String sjFlmc;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "事件标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "事件内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）事件地址行政区划代码")
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "事件地址")
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警图片")
+    private String yjTp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSjGlrycl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSjGlrycl.java
new file mode 100644
index 0000000..4d17dfd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxSjGlrycl.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_sj_glrycl")
+@ApiModel(value="TbYjxxSjGlrycl对象", description="预警-事件-关联人员车辆表")
+public class TbYjxxSjGlrycl  extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警人员或车辆ID")
+    private String yjryclId;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "--D_BZ_YJLX（预警类型）预警类型（1-人员;2-车辆）")
+    private String yjlxdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxYjczjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxYjczjl.java
new file mode 100644
index 0000000..29b2337
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbYjxxYjczjl.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_yjczjl")
+@ApiModel(value="TbYjxxYjczjl对象", description="预警信息-操作记录表")
+public class TbYjxxYjczjl extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警信息已阅人员表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "查看时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cksj;
+
+    @ApiModelProperty(value = "--D_BZ_CZFS（操作方式）操作方式：0-查看，1-人工转为指令，2-系统转为指令")
+    private String czfs;
+
+    @ApiModelProperty(value = "查看人员ID")
+    private String ryId;
+
+    @ApiModelProperty(value = "查看人员姓名")
+    private String ryxm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlJq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlJq.java
new file mode 100644
index 0000000..9a3450d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlJq.java
@@ -0,0 +1,245 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("tb_zl_jq")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZlJq对象", description = "指令警情实体表")
+public class TbZlJq  extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令警情表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "警情ID")
+    private String jqId;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "关联接警单编号")
+    private String gljjdbh;
+
+    @ApiModelProperty(value = "报警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bjsj;
+
+    @ApiModelProperty(value = "接警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jjsj;
+
+    @ApiModelProperty(value = "警情发生开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jqfskssj;
+
+    @ApiModelProperty(value = "警情发生结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jqfsjssj;
+
+    @ApiModelProperty(value = "报警电话")
+    private String bjdh;
+
+    @ApiModelProperty(value = "报警电话用户姓名")
+    private String bjdhYhxm;
+
+    @ApiModelProperty(value = "报警电话用户地址")
+    private String bjdhYhdz;
+
+    @ApiModelProperty(value = "报警人身份证号")
+    private String bjrSfzh;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警人性别--D_BZ_XB（性别）")
+    private String bjrXb;
+
+    @ApiModelProperty(value = "报警人联系电话")
+    private String bjrLxdh;
+
+    @ApiModelProperty(value = "报警人住址单位")
+    private String bjrZzdw;
+
+    @ApiModelProperty(value = "事发地址行政区划--D_BZ_XZQHDM（行政区划代码）")
+    private String sfdzxzqh;
+
+    @ApiModelProperty(value = "事发地址")
+    private String sfdz;
+
+    @ApiModelProperty(value = "路灯杆编号")
+    private String ldgbh;
+
+    @ApiModelProperty(value = "报警内容")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别")
+    private String jqjb;
+
+    @ApiModelProperty(value = "案由")
+    private String ay;
+
+    @ApiModelProperty(value = "报警类别")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类别名称")
+    private String bjlbmc;
+
+    @ApiModelProperty(value = "报警类型")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警类型名称")
+    private String bjlxmc;
+
+    @ApiModelProperty(value = "报警细类")
+    private String bjxl;
+
+    @ApiModelProperty(value = "报警细类名称")
+    private String bjxlmc;
+
+    @ApiModelProperty(value = "被困人数")
+    private Integer bkrs;
+
+    @ApiModelProperty(value = "受伤人数")
+    private Integer ssrs;
+
+    @ApiModelProperty(value = "死亡人数")
+    private Integer swrs;
+
+    @ApiModelProperty(value = "有无危险物质(0：无，1：有，默认为无)--D_BZ_SF（是否）")
+    private String ywwxwz;
+
+    @ApiModelProperty(value = "有无爆炸/泄漏(0：无，1：有，默认为无)--D_BZ_SF（是否）")
+    private String ywbzxl;
+
+    @ApiModelProperty(value = "有无被困人员(0：无，1：有，默认为无)--D_BZ_SF（是否）")
+    private String ywbkry;
+
+    @ApiModelProperty(value = "是否涉外(0：无，1：有，默认为无)--D_BZ_SF（是否）")
+    private String sfsw;
+
+    @ApiModelProperty(value = "是否是外语报警(0：无，1：有，默认为无)--D_BZ_SF（是否）")
+    private String sfswybj;
+
+    @ApiModelProperty(value = "是否重大警情D_BZ_SF")
+    private String sfzdjq;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "重大警情添加类型 01.系统推送 02.手动添加 03.一键报警--D_BZ_ZDJQTJLX（重大警情添加类型）")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    @ApiModelProperty(value = "签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    @ApiModelProperty(value = "指令签收有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "处置情况说明")
+    private String czqk;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlRg.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlRg.java
new file mode 100644
index 0000000..ef259ef
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlRg.java
@@ -0,0 +1,192 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-人工指令表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_rg")
+@ApiModel(value = "TbZlRg 对象", description = "指令-人工指令表实体表")
+public class TbZlRg extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令-人工指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "指令表ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "人工指令类型：01-应急增援、02-巡逻、03-查找、04-盘查、05-抓捕、06-布防")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象，如：01：人员，02：部门，03-巡组--D_BZ_ZLJSDX")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令签收有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "签收状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收，04-已转发）")
+    private String qszt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "到达现场状态--D_BZ_ZXZTAI（11-巡逻中, 21-待到达现场，22-自动确认到达现场，" +
+            "23-手动确认到达现场，24-手动确认到达现场,25-超时到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "指令完结有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令完结状态--D_BZ_ZXZTAI（91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXl.java
new file mode 100644
index 0000000..ed75c64
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXl.java
@@ -0,0 +1,237 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-巡逻指令表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_xl")
+@ApiModel(value = "TbZlXl", description = "指令-巡逻指令表")
+public class TbZlXl  extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 巡防指令表标识ID
+     */
+    @ApiModelProperty(value = "巡防指令表标识ID")
+    private String id;
+
+    /**
+     * 指令ID
+     */
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    /**
+     * 巡逻方案id
+     */
+    @ApiModelProperty(value = "巡逻方案id")
+    private String xlfaId;
+
+    /**
+     * 指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB
+     */
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    /**
+     * 指令标题
+     */
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    /**
+     * 指令内容
+     */
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    /**
+     * 指令发送日期
+     */
+    @ApiModelProperty(value = "指令发送日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlfsrq;
+
+    /**
+     * 指令发送时间
+     */
+    @ApiModelProperty(value = "指令发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlfssj;
+
+    /**
+     * 指令计划执行结束日期
+     */
+    @ApiModelProperty(value = "指令计划执行结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlzxrq;
+
+    /**
+     * 指令计划执行结束时间
+     */
+    @ApiModelProperty(value = "指令计划执行结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlzxjssj;
+
+    /**
+     * 巡防点位数
+     */
+    @ApiModelProperty(value = "巡防点位数")
+    private Integer xfdws;
+
+    /**
+     * 已巡防点位数
+     */
+    @ApiModelProperty(value = "已巡防点位数")
+    private Integer yxdws;
+
+    /**
+     * 签收状态（01-待签收，02-正常签收，03-超时签收）
+     */
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    /**
+     * 签收时间
+     */
+    @ApiModelProperty(value = "指令计划执行结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    /**
+     * 指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典
+     */
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    /**
+     * 指令完结时间
+     */
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    /**
+     * 指令完结说明
+     */
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    /**
+     * 指令发起人ID
+     */
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    /**
+     * 指令发起人姓名
+     */
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    /**
+     * 指令发起人身份证
+     */
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    /**
+     * 指令发起人电话
+     */
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    /**
+     * 附件ID
+     */
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    /**
+     * 所属部门代码
+     */
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    /**
+     * 所属部门ID
+     */
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    /**
+     * 所属县公安局
+     */
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    /**
+     * 所属县公安局代码
+     */
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    /**
+     * 所属县公安局ID
+     */
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    /**
+     * 所属市公安局
+     */
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    /**
+     * 所属市公安局代码
+     */
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    /**
+     * 所属市公安局id
+     */
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxd.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxd.java
new file mode 100644
index 0000000..7318b8f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxd.java
@@ -0,0 +1,300 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-巡逻指令-必巡点表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_xl_bxd")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlXlBxd对象", description = "指令-巡逻指令-必巡点表")
+public class TbZlXlBxd  extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 必巡点表标识ID
+     */
+    @ApiModelProperty(value = "必巡点表标识ID")
+    private String id;
+
+    /**
+     * 指令id
+     */
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    /**
+     * 巡逻指令id
+     */
+    @ApiModelProperty(value = "巡逻指令id")
+    private String zlXlId;
+
+    /**
+     * 必巡点id
+     */
+    @ApiModelProperty(value = "必巡点id")
+    private String bxdId;
+
+    /**
+     * 所属巡防区域ID
+     */
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    /**
+     * 必巡点名称
+     */
+    @ApiModelProperty(value = "必巡点名称")
+    private String bxdMc;
+
+    /**
+     * 必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域，5、综合分析重点巡防点--D_BZ_BXDLX
+     */
+    @ApiModelProperty(value = "必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域，5、综合分析重点巡防点--D_BZ_BXDLX")
+    private String bxdLx;
+
+    /**
+     * 必巡点来源-01 经验必巡点 02 登记必巡点 --D_BZ_BXDLYDM
+     */
+    @ApiModelProperty(value = "必巡点来源-01 经验必巡点 02 登记必巡点 --D_BZ_BXDLYDM")
+    private String bxdlydm;
+
+    /**
+     * 必巡原因
+     */
+    @ApiModelProperty(value = "必巡原因")
+    private String bxyy;
+
+    /**
+     * 要求巡逻开始时间
+     */
+    @ApiModelProperty(value = "要求巡逻开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yqkssj;
+
+    /**
+     * 要求巡逻结束时间
+     */
+    @ApiModelProperty(value = "要求巡逻结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yqjssj;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    /**
+     * 坐标
+     */
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    /**
+     * 坐标hash值
+     */
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    /**
+     * 必巡点行政区划代码--D_BZ_XZQHDM
+     */
+    @ApiModelProperty(value = "必巡点行政区划代码--D_BZ_XZQHDM")
+    private String xzqhdm;
+
+    /**
+     * 必巡点详细地址
+     */
+    @ApiModelProperty(value = "必巡点详细地址")
+    private String yqKssj;
+
+    /**
+     * 必巡点图片;逗号分隔
+     */
+    @ApiModelProperty(value = "必巡点图片;逗号分隔")
+    private String yqJssj;
+
+    /**
+     * 要求停留时长
+     */
+    @ApiModelProperty(value = "要求停留时长")
+    private Integer yqTlsc;
+
+    /**
+     * 要求是否盘查
+     */
+    @ApiModelProperty(value = "要求是否盘查")
+    private String yqSfpc;
+
+    /**
+     * 要求盘查人员数量
+     */
+    @ApiModelProperty(value = "要求盘查人员数量")
+    private Integer yqPcrysl;
+
+    /**
+     * 要求盘查车辆数量
+     */
+    @ApiModelProperty(value = "要求盘查车辆数量")
+    private Integer yqPcclsl;
+
+    /**
+     * 有效期
+     */
+    @ApiModelProperty(value = "有效期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yxq;
+
+    /**
+     * 是否巡逻（是否字典）
+     */
+    @ApiModelProperty(value = "是否巡逻（是否字典）")
+    private String sfxl;
+
+    /**
+     * 巡逻次数
+     */
+    @ApiModelProperty(value = "巡逻次数")
+    private Integer sjXlcs;
+
+    /**
+     * 实际巡逻开始时间
+     */
+    @ApiModelProperty(value = "实际巡逻开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjKssj;
+
+    /**
+     * 实际巡逻离开时间
+     */
+    @ApiModelProperty(value = "实际巡逻离开时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjLksj;
+
+    /**
+     * 实际巡逻停留时长
+     */
+    @ApiModelProperty(value = "实际巡逻停留时长")
+    private Integer sjTlsc;
+
+    /**
+     * 实际盘查人员数量
+     */
+    @ApiModelProperty(value = "实际盘查人员数量")
+    private Integer sjPcrysl;
+
+    /**
+     * 实际盘查车辆数量
+     */
+    @ApiModelProperty(value = "实际盘查车辆数量")
+    private Integer sjPcclsl;
+
+    /**
+     * 指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典
+     */
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    /**
+     * 指令完结时间
+     */
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    /**
+     * 指令完结说明
+     */
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    /**
+     * 所属部门代码
+     */
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    /**
+     * 所属部门ID
+     */
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    /**
+     * 所属县公安局
+     */
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    /**
+     * 所属县公安局代码
+     */
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    /**
+     * 所属县公安局ID
+     */
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    /**
+     * 所属市公安局
+     */
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    /**
+     * 所属市公安局代码
+     */
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    /**
+     * 所属市公安局id
+     */
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxdXljl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxdXljl.java
new file mode 100644
index 0000000..ab89e39
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlXlBxdXljl.java
@@ -0,0 +1,159 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-巡逻指令-必巡点巡逻记录表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_xl_bxd_xljl")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlXlBxdXljl", description = "指令-巡逻指令-必巡点巡逻记录表")
+public class TbZlXlBxdXljl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 必巡点表标识ID
+     */
+    @ApiModelProperty(value = "必巡点表标识ID")
+    private String id;
+
+    /**
+     * 指令id
+     */
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    /**
+     * 巡逻指令id
+     */
+    @ApiModelProperty(value = "巡逻指令id")
+    private String zlXlId;
+
+    /**
+     * 巡逻指令-必巡点ID
+     */
+    @ApiModelProperty(value = "巡逻指令-必巡点ID")
+    private String zlXlBxdId;
+
+    /**
+     * 必巡点id
+     */
+    @ApiModelProperty(value = "必巡点id")
+    private String bxdId;
+
+    /**
+     * 所属巡防区域ID
+     */
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    /**
+     * 实际巡逻开始时间
+     */
+    @ApiModelProperty(value = "实际巡逻开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjKssj;
+
+    /**
+     * 实际巡逻离开时间
+     */
+    @ApiModelProperty(value = "实际巡逻离开时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sjLksj;
+
+    /**
+     * 实际巡逻停留时长
+     */
+    @ApiModelProperty(value = "实际巡逻停留时长")
+    private Integer sjTlsc;
+
+    /**
+     * 实际盘查人员数量
+     */
+    @ApiModelProperty(value = "实际盘查人员数量")
+    private Integer sjPcrysl;
+
+    /**
+     * 实际盘查车辆数量
+     */
+    @ApiModelProperty(value = "实际盘查车辆数量")
+    private Integer sjPcclsl;
+
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    /**
+     * 所属部门代码
+     */
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    /**
+     * 所属部门ID
+     */
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    /**
+     * 所属县公安局
+     */
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    /**
+     * 所属县公安局代码
+     */
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    /**
+     * 所属县公安局ID
+     */
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    /**
+     * 所属市公安局
+     */
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    /**
+     * 所属市公安局代码
+     */
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    /**
+     * 所属市公安局id
+     */
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjCl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjCl.java
new file mode 100644
index 0000000..aef61bc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjCl.java
@@ -0,0 +1,250 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-车辆预警指令表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_yj_cl")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlYjCl", description = "指令-车辆预警指令表")
+public class TbZlYjCl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警车辆表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警车辆表ID")
+    private String yjclId;
+
+    @ApiModelProperty(value = "车辆标签1临控2被抢盗3套牌4假牌，9-正常车辆--D_BZ_CLBQ（车辆标签）")
+    private String yjClbq;
+
+    @ApiModelProperty(value = "车辆标签")
+    private String yjClbqmc;
+
+    @ApiModelProperty(value = "预警来源标签名称")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "车辆预警类型（1-车内人员预警，2-车辆预警，3-车辆和人员预警）")
+    private String yjClyjlx;
+
+    @ApiModelProperty(value = "发生时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "预警级别--D_BZ_TYJB（通用级别）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlBt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlNr;
+
+    @ApiModelProperty(value = "车牌类型--D_BZ_HPZL（号牌类型）")
+    private String zlCphlx;
+
+    @ApiModelProperty(value = "车牌号")
+    private String zlClcph;
+
+    @ApiModelProperty(value = "机动车所有人号码（身份证号或组织机构代码）")
+    private String zlCljdcsyrhm;
+
+    @ApiModelProperty(value = "机动车所有人")
+    private String zlCljdcsyr;
+
+    @ApiModelProperty(value = "车牌号颜色--D_BZ_CPHYS（车牌号颜色）")
+    private String zlCphys;
+
+    @ApiModelProperty(value = "车身颜色--D_BZ_CLYS（车辆颜色）")
+    private String zlClys;
+
+    @ApiModelProperty(value = "车辆品牌--D_BZ_CLPP（车辆品牌）")
+    private String zlClpp;
+
+    @ApiModelProperty(value = "车辆类型，如：轿车、客车、牵引车、摩托车--D_BZ_CLLX（车辆类型）")
+    private String zlCllx;
+
+    @ApiModelProperty(value = "车辆年款")
+    private String zlClnk;
+
+    @ApiModelProperty(value = "行驶方向")
+    private String zlXsfx;
+
+    @ApiModelProperty(value = "行驶速度")
+    private BigDecimal zlXssd;
+
+    @ApiModelProperty(value = "车内人数")
+    private Integer zlClrs;
+
+    @ApiModelProperty(value = "出现时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date clCxsj;
+
+    @ApiModelProperty(value = "消失时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date clXssj;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令地点-行政区划代码--D_BZ_XZQHDM")
+    private String zlDzXzqh;
+
+    @ApiModelProperty(value = "指令地点")
+    private String zlDz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    @ApiModelProperty(value = "签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    @ApiModelProperty(value = "签收有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，" +
+            "24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "核查状态（1-核查到指定对象，2-未核查到指定对象）")
+    private String hczt;
+
+    @ApiModelProperty(value = "盘查车辆ID")
+    private String hcid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjClCnry.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjClCnry.java
new file mode 100644
index 0000000..e547c70
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjClCnry.java
@@ -0,0 +1,454 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-车辆乘坐人员预警指令表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_yj_cl_cnry")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlYjClCnry", description = "指令-车辆乘坐人员预警指令表")
+public class TbZlYjClCnry extends BaseEntity implements Serializable, Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 指令-车内人员表标识ID
+     */
+    @ApiModelProperty(value = "指令-车内人员表标识ID")
+    private String id;
+
+    /**
+     * 指令id
+     */
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    /**
+     * 车辆指令ID
+     */
+    @ApiModelProperty(value = "车辆指令ID")
+    private String zlClid;
+
+    /**
+     * 预警表ID
+     */
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    /**
+     * 人员预警表id
+     */
+    @ApiModelProperty(value = "人员预警表id")
+    private String ryyjId;
+
+    /**
+     * 发生时间
+     */
+    @ApiModelProperty(value = "发生时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    /**
+     * 预警时间
+     */
+    @ApiModelProperty(value = "预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    /**
+     * 预警级别--D_BZ_TYJB（通用级别）
+     */
+    @ApiModelProperty(value = "预警级别--D_BZ_TYJB（通用级别）")
+    private String yjJb;
+
+    /**
+     * 指令发送日期
+     */
+    @ApiModelProperty(value = "指令发送日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlfsrq;
+
+    /**
+     * 指令发送时间
+     */
+    @ApiModelProperty(value = "指令发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlfssj;
+
+    /**
+     * 指令标题
+     */
+    @ApiModelProperty(value = "指令标题")
+    private String zlBt;
+
+    /**
+     * 指令内容
+     */
+    @ApiModelProperty(value = "指令内容")
+    private String zlNr;
+
+    /**
+     * 指令人员标签--D_BZ_RYBQ（人员标签）
+     */
+    @ApiModelProperty(value = "指令人员标签--D_BZ_RYBQ（人员标签）")
+    private String zlRybq;
+
+    /**
+     * 指令人员标签详情
+     */
+    @ApiModelProperty(value = "指令人员标签详情")
+    private String zlRybqxq;
+
+    /**
+     * 指令人员证件类型--D_BZ_ZJLX（证件类型）
+     */
+    @ApiModelProperty(value = "指令人员证件类型--D_BZ_ZJLX（证件类型）")
+    private String zlZjlx;
+
+    /**
+     * 指令人员证件号码
+     */
+    @ApiModelProperty(value = "指令人员证件号码")
+    private String zlZjhm;
+
+    /**
+     * 指令人员姓名
+     */
+    @ApiModelProperty(value = "指令人员姓名")
+    private String zlRyxm;
+
+    /**
+     * 指令人员性别
+     */
+    @ApiModelProperty(value = "指令人员性别")
+    private String zlRyxb;
+
+    /**
+     * 指令人员年龄
+     */
+    @ApiModelProperty(value = "指令人员年龄")
+    private Integer zlRynl;
+
+    /**
+     * 指令人员民族
+     */
+    @ApiModelProperty(value = "指令人员民族")
+    private String zlRymz;
+
+    /**
+     * 指令人员籍贯
+     */
+    @ApiModelProperty(value = "指令人员籍贯")
+    private String zlRyjg;
+
+    /**
+     * 指令人员户籍地行政区划--D_BZ_XZQHDM（行政区划代码）
+     */
+    @ApiModelProperty(value = "指令人员户籍地行政区划--D_BZ_XZQHDM（行政区划代码）")
+    private String zlRyhjdXzqh;
+
+    /**
+     * 指令人员户籍地
+     */
+    @ApiModelProperty(value = " 指令人员户籍地")
+    private String zlRyhjd;
+
+    /**
+     * 指令人员居住址行政区划代码
+     */
+    @ApiModelProperty(value = " 指令人员居住址行政区划代码")
+    private String zlRyjzdXzqh;
+
+    /**
+     * 指令人员居住址
+     */
+    @ApiModelProperty(value = "指令人员居住址")
+    private String zlRyjzd;
+
+    /**
+     * 指令人员工作单位id(关联实有单位)
+     */
+    @ApiModelProperty(value = "指令人员工作单位id(关联实有单位)")
+    private String zlRygzdwid;
+
+    /**
+     * 指令人员工作单位
+     */
+    @ApiModelProperty(value = "指令人员工作单位")
+    private String zlRygzdw;
+
+    /**
+     * 指令人员联系电话
+     */
+    @ApiModelProperty(value = "指令人员联系电话")
+    private String zlRylxdh;
+
+    /**
+     * 指令人员相似度
+     */
+    @ApiModelProperty(value = "指令人员相似度")
+    private BigDecimal zlXsd;
+
+    /**
+     * 人员行为描述
+     */
+    @ApiModelProperty(value = "人员行为描述")
+    private String zlXwms;
+
+    /**
+     * 左上角 X 坐标
+     */
+    @ApiModelProperty(value = "左上角 X 坐标")
+    private BigDecimal ltx;
+
+    /**
+     * 左上角 Y 坐标
+     */
+    @ApiModelProperty(value = "左上角 Y 坐标")
+    private BigDecimal lty;
+
+    /**
+     * 右下角 X 坐标
+     */
+    @ApiModelProperty(value = "右下角 X 坐标")
+    private BigDecimal rbx;
+
+    /**
+     * 右下角Y坐标
+     */
+    @ApiModelProperty(value = "右下角Y坐标")
+    private BigDecimal rby;
+
+    /**
+     * 感知源id
+     */
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    /**
+     * 坐标
+     */
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    /**
+     * 坐标hash
+     */
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    /**
+     * 指令地点行政区划代码--D_BZ_XZQHDM（行政区划代码）
+     */
+    @ApiModelProperty(value = "指令地点行政区划代码--D_BZ_XZQHDM（行政区划代码）")
+    private String yjDzxzqh;
+
+    /**
+     * 指令地点
+     */
+    @ApiModelProperty(value = "指令地点")
+    private String yjDz;
+
+    /**
+     * 指令图片ID
+     */
+    @ApiModelProperty(value = "指令图片ID")
+    private String tpId;
+
+    /**
+     * 指令封面图片
+     */
+    @ApiModelProperty(value = "指令封面图片")
+    private String coverImage;
+
+    /**
+     * 指令来源标签名称
+     */
+    @ApiModelProperty(value = "指令来源标签名称")
+    private String yjlyBqmc;
+
+    /**
+     * 签收状态（01-待签收，02-正常签收，03-超时签收）
+     */
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    /**
+     * 签收时间
+     */
+    @ApiModelProperty(value = "签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    /**
+     * 到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典
+     */
+    @ApiModelProperty(value = "到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    /**
+     * 到达现场时间
+     */
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    /**
+     * 指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典
+     */
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    /**
+     * 指令完结时间
+     */
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    /**
+     * 指令完结说明
+     */
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，" +
+            "92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    /**
+     * 指令发起人ID
+     */
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    /**
+     * 指令发起人姓名
+     */
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    /**
+     * 指令发起人身份证
+     */
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    /**
+     * 指令发起人电话
+     */
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    /**
+     * 核查状态（1-核查到指定对象，2-未核查到指定对象）
+     */
+    @ApiModelProperty(value = "核查状态（1-核查到指定对象，2-未核查到指定对象）")
+    private String hczt;
+
+    /**
+     * 盘查人员ID
+     */
+    @ApiModelProperty(value = "盘查人员ID")
+    private String hcid;
+
+    /**
+     * 所属部门
+     */
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    /**
+     * 所属部门代码
+     */
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    /**
+     * 所属部门ID
+     */
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    /**
+     * 所属县公安局
+     */
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    /**
+     * 所属县公安局代码
+     */
+    @ApiModelProperty(value = " 所属县公安局代码")
+    private String ssxgajdm;
+
+    /**
+     * 所属县公安局ID
+     */
+    @ApiModelProperty(value = " 所属县公安局ID")
+    private String ssxgajid;
+
+    /**
+     * 所属市公安局
+     */
+    @ApiModelProperty(value = " 所属市公安局")
+    private String sssgaj;
+
+    /**
+     * 所属市公安局代码
+     */
+    @ApiModelProperty(value = " 所属市公安局代码")
+    private String sssgajdm;
+
+    /**
+     * 所属市公安局id
+     */
+    @ApiModelProperty(value = " 所属市公安局id")
+    private String sssgajid;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjRy.java
new file mode 100644
index 0000000..64309f0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjRy.java
@@ -0,0 +1,267 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_yj_ry")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlYjRy", description = "指令-人员预警指令表")
+public class TbZlYjRy extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令-预警人员标识ID")
+    private String id;
+
+
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "人员预警表id")
+    private String ryyjId;
+
+    @ApiModelProperty(value = "发生时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = " 预警级别--D_BZ_TYJB（通用级别）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令发送日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlfsrq;
+
+    @ApiModelProperty(value = "指令发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlfssj;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlBt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlNr;
+
+    @ApiModelProperty(value = "指令人员标签--D_BZ_RYBQ（人员标签）")
+    private String zlRybq;
+
+    @ApiModelProperty(value = "指令人员标签详情")
+    private String zlRybqmc;
+
+    @ApiModelProperty(value = "指令人员证件类型--D_BZ_ZJLX（证件类型）")
+    private String zlZjlx;
+
+    @ApiModelProperty(value = "指令人员证件号码")
+    private String zlZjhm;
+
+    @ApiModelProperty(value = "指令人员姓名")
+    private String zlRyxm;
+
+    @ApiModelProperty(value = "指令人员性别")
+    private String zlRyxb;
+
+    @ApiModelProperty(value = "指令人员年龄")
+    private Integer zlRynl;
+
+    @ApiModelProperty(value = "指令人员民族")
+    private String zlRymz;
+
+    @ApiModelProperty(value = "指令人员籍贯")
+    private String zlRyjg;
+
+    @ApiModelProperty(value = "指令人员户籍地行政区划--D_BZ_XZQHDM（行政区划代码）")
+    private String zlRyhjdXzqh;
+
+    @ApiModelProperty(value = "指令人员户籍地")
+    private String zlRyhjd;
+
+    @ApiModelProperty(value = "指令人员居住址行政区划代码")
+    private String zlRyjzdXzqh;
+
+    @ApiModelProperty(value = "指令人员居住址")
+    private String zlRyjzd;
+
+    @ApiModelProperty(value = "指令人员工作单位id(关联实有单位)")
+    private String zlRygzdwid;
+
+    @ApiModelProperty(value = "指令人员工作单位")
+    private String zlRygzdw;
+
+    @ApiModelProperty(value = "指令人员联系电话")
+    private String zlRylxdh;
+
+    @ApiModelProperty(value = "指令人员相似度")
+    private BigDecimal zlXsd;
+
+    @ApiModelProperty(value = "人员行为描述")
+    private String zlXwms;
+
+    @ApiModelProperty(value = "左上角 X 坐标")
+    private BigDecimal ltx;
+
+    @ApiModelProperty(value = "左上角 Y 坐标")
+    private BigDecimal lty;
+
+    @ApiModelProperty(value = "右下角 X 坐标")
+    private BigDecimal rbx;
+
+    @ApiModelProperty(value = "右下角Y坐标")
+    private BigDecimal rby;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令地点行政区划代码--D_BZ_XZQHDM（行政区划代码）")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "指令地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "指令图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "指令封面图片")
+    private String coverImage;
+
+    @ApiModelProperty(value = "指令来源标签名称")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    @ApiModelProperty(value = "签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    @ApiModelProperty(value = "到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "签收有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "完结有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，" +
+            "93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "核查状态（1-核查到指定对象，2-未核查到指定对象）")
+    private String hczt;
+
+    @ApiModelProperty(value = "盘查人员ID")
+    private String hcid;
+
+    @ApiModelProperty(value = " 所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjSj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjSj.java
new file mode 100644
index 0000000..1ff9c70
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlYjSj.java
@@ -0,0 +1,203 @@
+package com.mosty.base.model.entity.yjzl;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 指令-事件预警指令表
+ * </p>
+ *
+ * @author
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("tb_zl_yj_sj")
+@Accessors(chain = true)
+@ApiModel(value = "TbZlYjSj", description = "指令-事件预警指令表")
+public class TbZlYjSj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "事件指令标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警事件表ID")
+    private String yjSjid;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "事件分类:01-人员滞留，02-人员排徊，03-人员入侵，04-人员越线，05-人员逆行，06-人员离开，07-人员跌倒，08-人员聚集，09-攀爬栏杆，10-爬墙攀高，11-打架斗殴，12-横幅检测，13-标语检测，14-夜间暗影，15-街头躺卧，16-街头蹲坐，17-机动车违停，18-道路积水。D_BZ_SJBQ（事件标签）")
+    private String sjFl;
+
+    @ApiModelProperty(value = "事件分类")
+    private String sjFlmc;
+
+    @ApiModelProperty(value = "预警级别--D_BZ_TYJB（通用级别）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "发生时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = " 指令发送日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlfsrq;
+
+    @ApiModelProperty(value = "指令发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlfssj;
+
+    @ApiModelProperty(value = "事件标题")
+    private String zlBt;
+
+    @ApiModelProperty(value = "事件内容")
+    private String zlNr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "事件地址行政区划代码--D_BZ_XZQHDM（行政区划代码）")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "事件地址")
+    private String yjDz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = " 指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    @ApiModelProperty(value = " 签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    @ApiModelProperty(value = " 到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = " 到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = " 指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = " 指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+
+
+    @ApiModelProperty(value = " 完结有效事件")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = " 签收有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = " 到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = " 指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 " +
+            "，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = " 处置情况说明")
+    private String czqk;
+
+    @ApiModelProperty(value = " 所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = " 所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = " 所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = " 所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = " 所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = " 所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = " 所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = " 所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = " 所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxx.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxx.java
new file mode 100644
index 0000000..a89c79e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxx.java
@@ -0,0 +1,200 @@
+package com.mosty.base.model.entity.yjzl;
+
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author dw
+ * @Date 2022-10-13
+ */
+@Data
+@TableName("tb_zlxx")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZlxx 对象", description = "指令实体表")
+public class TbZlxx extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令、08.事务指令、09.犯罪预测指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控，08-事务,09-犯罪预测）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令签收有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "签收状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收，04-已转发）")
+    private String qszt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "到达现场状态--D_BZ_ZXZTAI（21-待到达现场，22-自动确认到达现场，" +
+            "23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "指令完结有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令完结状态--D_BZ_ZXZTAI（91-未完成，92-已完成，93-超时完成，" +
+            "94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "指令下发类型")
+    private String zlxflx;
+
+    @ApiModelProperty(value = "范围")
+    @TableField(exist = false)
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxPcrycl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxPcrycl.java
new file mode 100644
index 0000000..b13d978
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxPcrycl.java
@@ -0,0 +1,67 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zlxx_pcrycl")
+@ApiModel(value = "TbZlxxPcrycl 对象", description = "指令-盘查人员车辆表")
+public class TbZlxxPcrycl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "盘查人员或车辆ID")
+    private String pcryclId;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "--D_BZ_PCLX（盘查类型）盘查类型（1-盘人;2-盘车）")
+    private String pclxdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxjl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxjl.java
new file mode 100644
index 0000000..827eb31
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxjl.java
@@ -0,0 +1,130 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-01
+ * 指令-执行记录表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zlxx_zxjl")
+@ApiModel(value="TbZlxxZxjl 对象", description="指令-执行记录表")
+public class TbZlxxZxjl extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "执行时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zxsj;
+
+    @ApiModelProperty(value = "指令执行动作--D_BZ_ZLZXDZ（00-接收指令，01-签收，02-到达现场，03-已处置，" +
+            "04-反馈，05-下发消息，06-转发，07-转发确认，08-转发退回，09-研判，" +
+            "10-反馈，91-指令过期，99-完结）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "执行内容")
+    private String zxnr;
+
+    @ApiModelProperty(value = "语音时长")
+    private Integer yysc;
+
+    @ApiModelProperty(value = "视频首帧图片")
+    private String sptpid;
+
+    @ApiModelProperty(value = "执行附件（图片）")
+    private String zxfj;
+
+    @ApiModelProperty(value = "指令执行地点行政区划代码--D_BZ_XZQHDM")
+    private String zlzxddXzqhdm;
+
+    @ApiModelProperty(value = "指令执行地点")
+    private String zlzxdd;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zlzxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zlzxrId;
+
+    @ApiModelProperty(value = "指令执行人名称")
+    private String zlzxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zlzxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zlzxrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "距离（米）")
+    @TableField(exist = false)
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxr.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxr.java
new file mode 100644
index 0000000..00c7d52
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZlxxZxr.java
@@ -0,0 +1,171 @@
+package com.mosty.base.model.entity.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_zlxx_zxr")
+@ApiModel(value = "TbZlxxZxr 对象", description = "指令-执行人或部门或巡组表")
+public class TbZlxxZxr extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "业务id")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "指令接收对象类型，如：01：人员，02：部门，03-巡组--D_BZ_ZLJSDX")
+    private String zxrLx;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zxrId;
+
+    @ApiModelProperty(value = "指令执行人警力类型 01 民警  02 辅警")
+    private String zxrJllx;
+
+    @ApiModelProperty(value = "指令执行人姓名")
+    private String zxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zxrDh;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String dqzt;
+
+    @ApiModelProperty(value = "当前状态时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dqztSj;
+
+    @ApiModelProperty(value = "当前状态说明（如：此指令为单人执行指令，因XXXX签收指令结束）")
+    private String dqztsm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZxzb.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZxzb.java
new file mode 100644
index 0000000..ae5c5cf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/TbZxzb.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.entity.yjzl;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 中心坐标
+ */
+@Data
+@TableName("tb_zxzb")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZxzb对象", description = "中心坐标实体表")
+public class TbZxzb implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "坐标类型 01 预警  02 警情", name = "zblx")
+    private String zblx;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "中心点数量", name = "zxdsl")
+    private Integer zxdsl;
+
+    @ApiModelProperty(value = "发生日期", name = "yjFsrq")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zbrq;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsDl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsDl.java
new file mode 100644
index 0000000..ba3bc70
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsDl.java
@@ -0,0 +1,121 @@
+package com.mosty.base.model.entity.yszx;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-12 09:39:13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsDl对象", description = "要素-地理要素表")
+@TableName("tb_ys_dl")
+public class TbYsDl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类", name = "ysdl")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类", name = "yszl")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类", name = "ysxl")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称", name = "ysmc")
+    private String ysmc;
+
+    @ApiModelProperty(value = "要素简称", name = "ysjc")
+    private String ysjc;
+
+    @ApiModelProperty(value = "要素位置行政区划代码", name = "yswzXzqh")
+    private String yswzXzqh;
+
+    @ApiModelProperty(value = "要素位置（行政区划名称+地址详址）", name = "yswzXz")
+    private String yswzXz;
+
+    @ApiModelProperty(value = "要素位置别称", name = "yswzBc")
+    private String yswzBc;
+
+    @ApiModelProperty(value = "地球经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "地图面，如：公安局、派出所、巡防区、快反点的面", name = "dtm")
+    private Polygon dtm;
+
+    @ApiModelProperty(value = "智能设备标识", name = "znsbbs")
+    private String znsbbs;
+
+    @ApiModelProperty(value = "来源表名", name = "lybm")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id", name = "lyid")
+    private String lyid;
+
+    @ApiModelProperty(value = "检索内容（存要素名称、简称、位置、别称）", name = "jsnr")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "查询距离")
+    @TableField(exist = false)
+    private BigDecimal cxjl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajg.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajg.java
new file mode 100644
index 0000000..416f5e5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajg.java
@@ -0,0 +1,125 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素-公安机关要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_gajg")
+@ApiModel(value = "TbYsGajg对象", description = "要素-公安机关要素表")
+public class TbYsGajg extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String gajgjc;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）要素位置行政区划代码")
+    private String wzXzqh;
+
+    @ApiModelProperty(value = "位置（行政区划名称+地址详址）")
+    private String wzXz;
+
+    @ApiModelProperty(value = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "管辖区域，如：公安局、派出所、巡防区、快反点的面")
+    private Polygon dtm;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示2圈层")
+    private Polygon dtm1;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示3圈层")
+    private Polygon dtm2;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "检索内容（设备名称+地址）")
+    private String jsnr;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajgGlbm.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajgGlbm.java
new file mode 100644
index 0000000..62f86c5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsGajgGlbm.java
@@ -0,0 +1,69 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素-公安机关-关联部门要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_gajg_glbm")
+@ApiModel(value = "TbYsGajgGlbm对象", description = "要素-公安机关-关联部门要素表")
+public class TbYsGajgGlbm extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "公安机关ID")
+    private String gajgId;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRy.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRy.java
new file mode 100644
index 0000000..77db664
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRy.java
@@ -0,0 +1,110 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_ry")
+@ApiModel(value = "TbYsRy 对象", description = "要素-人员要素表")
+public class TbYsRy extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "出生日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date csrq;
+
+    @ApiModelProperty(value = "--D_BZ_MZ（民族）民族")
+    private String mz;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）户籍地行政区划")
+    private String hjdXzqh;
+
+    @ApiModelProperty(value = "户籍地址")
+    private String hjdXz;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）居住地行政区划")
+    private String jzdXzqh;
+
+    @ApiModelProperty(value = "居住地址")
+    private String jzdXz;
+
+    @ApiModelProperty(value = "工作单位ID(实有单位id)")
+    private String gzdwid;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyBq.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyBq.java
new file mode 100644
index 0000000..8716da2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyBq.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员标签要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_ry_bq")
+@ApiModel(value = "TbYsRyBq 对象", description = "要素-人员标签要素表")
+public class TbYsRyBq extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "人员id")
+    private String ryid;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）标签代码")
+    private String bqdm;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bqrq;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）标签案件类别")
+    private String bqajlx;
+
+    @ApiModelProperty(value = "标签来源说明")
+    private String bqlysm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyDh.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyDh.java
new file mode 100644
index 0000000..b15ab7f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsRyDh.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员电话要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_ry_dh")
+@ApiModel(value = "TbYsRyDh 对象", description = "要素-人员电话要素表")
+public class TbYsRyDh extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "人员id")
+    private String ryid;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "IMSI")
+    private String imsi;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxt.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxt.java
new file mode 100644
index 0000000..49671f2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxt.java
@@ -0,0 +1,133 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素-摄像头要素表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_sxt")
+@ApiModel(value = "TbYsSxt对象", description = "要素-摄像头要素表")
+public class TbYsSxt extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "监控点国标编号")
+    private String jkdbgbh;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "厂商名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "IP地址")
+    private String ipdz;
+
+    @ApiModelProperty(value = "IPV6地址")
+    private String ipv6dz;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+//    @ApiModelProperty(value = "坐标")
+//    private Point zb;
+//
+//    @ApiModelProperty(value = "坐标hash值")
+//    private String zbhash;
+
+    @ApiModelProperty(value = "-D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "地址名称")
+    private String dzmc;
+
+    @ApiModelProperty(value = "--D_BZ_GZSBLX（感知设备类型）感知设备类型代码（1 枪机 2 球机）")
+    private String sblxdm;
+
+    @ApiModelProperty(value = "--D_BZ_CJSJLX（采集数据类型）采集数据类型代码")
+    private String sjlxdm;
+
+    @ApiModelProperty(value = "--D_BZ_JSFX(监视方向)监视方向代码")
+    private String jsfxdm;
+
+    @ApiModelProperty(value = "监视区域说明")
+    private String jsqysm;
+
+    @ApiModelProperty(value = "--D_BZ_SXJWZLX(摄像机位置类型)摄像机位置类型代码")
+    private String sxjwzlxdm;
+
+    @ApiModelProperty(value = "--D_BZ_SXJYT(摄像机用途)摄像机用途代码")
+    private String sxjytdm;
+
+    @ApiModelProperty(value = "--D_BZ_SBZT(设备状态)设备状态 （0:离线、 1:在线）")
+    private String sbzt;
+
+    @ApiModelProperty(value = "--D_BZ_SBLX（设备类型）设备类型（01-视频监控  02-交通卡 03-人卡 04-车卡 05-电子围栏 06-WIFI探针 07-IMSI、IMEI）")
+    private String sblx;
+
+    @ApiModelProperty(value = "检索内容（设备名称+地址）")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxtGl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxtGl.java
new file mode 100644
index 0000000..d2b3ce3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsSxtGl.java
@@ -0,0 +1,72 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 基础管理-巡防区域、警务站、快反点与摄像头关联表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_sxt_gl")
+@ApiModel(value = "TbYsSxtGl对象", description = "基础管理-巡防区域、警务站、快反点与摄像头关联表")
+public class TbYsSxtGl extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "摄像头ID")
+    private String sxtId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "关联ID")
+    private String glId;
+
+    @ApiModelProperty(value = "--D_BZ_SXTGLDXLX（摄像头关联对象类型）关联对象类型01-市公安局，10-县公安局，20-派出所，50-警务站，55-巡防区，60-快反点1分钟，61-快反点3分钟，62-快反点5分钟")
+    private String glLx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsaj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsaj.java
new file mode 100644
index 0000000..479155f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsaj.java
@@ -0,0 +1,117 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素-行事案件要素
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_xsaj")
+@ApiModel(value = "TbYsXsaj对象", description = "要素-行事案件要素")
+public class TbYsXsaj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "发案日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date farq;
+
+    @ApiModelProperty(value = "发案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fasj;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "案件类别名称")
+    private String aymc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）发案地行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "发案地")
+    private String dzmc;
+
+    @ApiModelProperty(value = "检索内容（案件编号+案件名称+案件内容+地址）")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsxzajWffzry.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsxzajWffzry.java
new file mode 100644
index 0000000..adec07b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXsxzajWffzry.java
@@ -0,0 +1,107 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素-行事行政案件人员要素
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_xsxzaj_wffzry")
+@ApiModel(value = "TbYsXsxzajWffzry对象", description = "要素-行事行政案件人员要素")
+public class TbYsXsxzajWffzry extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "案件ID")
+    private String ajid;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件分类：1-刑事案件，2-行政案件")
+    private String ajfl;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "出生日期")
+    private String csrq;
+
+    @ApiModelProperty(value = "--D_BZ_MZ（民族）民族")
+    private String mz;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）户籍地行政区划")
+    private String hjd_xzqh;
+
+    @ApiModelProperty(value = "户籍地址")
+    private String hjd_xz;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）居住地行政区划")
+    private String jzd_xzqh;
+
+    @ApiModelProperty(value = "居住地址")
+    private String jzd_xz;
+
+    @ApiModelProperty(value = "工作单位ID(实有单位id)")
+    private String gzdwid;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXzaj.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXzaj.java
new file mode 100644
index 0000000..e0ebe9d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yszx/TbYsXzaj.java
@@ -0,0 +1,117 @@
+package com.mosty.base.model.entity.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素-行政案件要素
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_ys_xzaj")
+@ApiModel(value = "TbYsXzaj对象", description = "要素-行政案件要素")
+public class TbYsXzaj extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "发案日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date farq;
+
+    @ApiModelProperty(value = "发案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fasj;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "案件类别名称")
+    private String aymc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）发案地行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "发案地")
+    private String dzmc;
+
+    @ApiModelProperty(value = "检索内容（案件编号+案件名称+案件内容+地址）")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwCyryPageQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwCyryPageQuery.java
new file mode 100644
index 0000000..22d62e9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwCyryPageQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.afjcsj;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "VwSydwCyryPageQuery 对象", description = "实有单位从业人员列表查询dto")
+public class VwSydwCyryPageQuery extends BasePage implements Serializable {
+
+    @ApiModelProperty("实有单位ID")
+    private String dwid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwJbxxGxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwJbxxGxQuery.java
new file mode 100644
index 0000000..2a6e72c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSydwJbxxGxQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.afjcsj;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "VwSydwJbxxGxQuery 对象", description = "实有单位列表查询dto")
+public class VwSydwJbxxGxQuery extends BasePage implements Serializable {
+
+    @ApiModelProperty("管理等级 1.A 2.B 3.C")
+    private String gldj;
+
+    @ApiModelProperty("模糊查询字段")
+    private String keyword;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxListQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxListQuery.java
new file mode 100644
index 0000000..d79843f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxListQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.afjcsj;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "VwSyrkJzgjGxListQuery 对象", description = "实有人口轨迹查询列表")
+public class VwSyrkJzgjGxListQuery extends BasePage implements Serializable {
+
+    @ApiModelProperty("预警人员身份证号")
+    private String zjhm;
+
+    @ApiModelProperty("预警车辆车牌号")
+    private String cph;
+
+    @ApiModelProperty("开始时间")
+    private String kssj;
+
+    @ApiModelProperty("结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxQuery.java
new file mode 100644
index 0000000..6c547fd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/afjcsj/VwSyrkJzgjGxQuery.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.query.afjcsj;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "VwSyrkJzgjGxQuery 对象", description = "实有人口轨迹查询列表")
+public class VwSyrkJzgjGxQuery extends BasePage implements Serializable {
+
+    @ApiModelProperty("管理等级代码 1.A 2.B 3.C")
+    private String gldjdm;
+
+    @ApiModelProperty("模糊查询字段")
+    private String keyword;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetMyMessageQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetMyMessageQuery.java
new file mode 100644
index 0000000..4404c77
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetMyMessageQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.base;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-27
+ * 我的消息列表查询dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GetMyMessageQuery 对象", description = "我的消息列表查询dto")
+public class GetMyMessageQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetSysDeptListQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetSysDeptListQuery.java
new file mode 100644
index 0000000..874e0b3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/GetSysDeptListQuery.java
@@ -0,0 +1,162 @@
+package com.mosty.base.model.query.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author zhangzhao
+ * @description 组织机构部门查询对象
+ * @modifier zhangzhao
+ * @modifiedTime 2023/3/7 19:56
+ * @since 2023/3/7 19:56
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GetSysDeptListQuery对象", description = "组织机构部门查询对象")
+public class GetSysDeptListQuery implements Serializable, Cloneable {
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 组织机构代码
+     */
+    @ApiModelProperty(value = "组织机构代码")
+    private String orgCode;
+
+    /**
+     * 组织机构名称
+     */
+    @ApiModelProperty(value = "组织机构名称")
+    private String orgName;
+
+    /**
+     * 组织机构类型
+     */
+    @ApiModelProperty(value = "组织机构类型")
+    private String orgType;
+
+    /**
+     * 不需要的组织机构类型
+     */
+    @ApiModelProperty(value = "不需要的组织机构类型")
+    private String orgTypeRid;
+
+    /**
+     * 组织机构等级
+     */
+    @ApiModelProperty(value = "组织机构等级")
+    private String orgLevel;
+
+    /**
+     * 不需要的组织机构等级
+     */
+    @ApiModelProperty(value = "不需要的组织机构等级")
+    private String orgLevelRid;
+
+    /**
+     * 组织机构业务类型
+     */
+    @ApiModelProperty(value = "组织机构业务类型")
+    private String orgBizType;
+
+    /**
+     * 不需要的组织机构业务类型
+     */
+    @ApiModelProperty(value = "不需要的组织机构业务类型")
+    private String orgBizTypeRid;
+
+    /**
+     * 组织机构编号
+     */
+    @ApiModelProperty(value = "组织机构编号")
+    private String orgNo;
+
+    /**
+     * 上级组织机构主键ID
+     */
+    @ApiModelProperty(value = "上级组织机构主键ID")
+    private Long parentId;
+
+    /**
+     * 组织机构简称
+     */
+    @ApiModelProperty(value = "组织机构简称")
+    private String orgJc;
+
+    /**
+     * 组织机构全称
+     */
+    @ApiModelProperty(value = "组织机构全称")
+    private String orgQc;
+
+    /**
+     * 组织机构地址
+     */
+    @ApiModelProperty(value = "组织机构地址")
+    private String address;
+
+    /**
+     * 组织机构电话
+     */
+    @ApiModelProperty(value = "组织机构电话")
+    private String linkTel;
+
+    /**
+     * 组织机构联系人
+     */
+    @ApiModelProperty(value = "组织机构联系人")
+    private String linkMan;
+
+    /**
+     * 组织机构联系人电话
+     */
+    @ApiModelProperty(value = "组织机构联系人电话")
+    private String linkManTel;
+
+    /**
+     * 组织机构主页地址
+     */
+    @ApiModelProperty(value = "组织机构主页地址")
+    private String webUrl;
+
+    /**
+     * 组织机构邮箱地址
+     */
+    @ApiModelProperty(value = "组织机构邮箱地址")
+    private String email;
+
+    /**
+     * 组织机构行政区划
+     */
+    @ApiModelProperty(value = "组织机构行政区划（0 有效， 1 失效）")
+    private String xzqh;
+
+    /**
+     * 注销标志（0 有效， 1 失效）
+     */
+    @ApiModelProperty(value = "注销标志（0 有效， 1 失效）")
+    private Integer xtZxbz;
+
+    /**
+     * 正序字段（使用英语逗号“,”分隔）
+     */
+    @ApiModelProperty(value = "正序字段（使用英语逗号“,”分隔）")
+    private String orderByAsc;
+
+    /**
+     * 倒序字段（使用英语逗号“,”分隔）
+     */
+    @ApiModelProperty(value = "倒序字段（使用英语逗号“,”分隔）")
+    private String orderByDesc;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/SysDeptQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/SysDeptQuery.java
new file mode 100644
index 0000000..fb1924a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/base/SysDeptQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.base;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-12-09
+ * 查询部门信息
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SysDeptQuery 对象", description = "我的消息列表查询dto")
+public class SysDeptQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "部门业务类型，多部门逗号拼接")
+    private String orgBizTypes;
+
+    @ApiModelProperty(value = "部门级别，多部门逗号拼接")
+    private String orgLevels;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkClSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkClSearchDto.java
new file mode 100644
index 0000000..c1b54a4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkClSearchDto.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.query.bkzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控车辆查询 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkClSearchDto对象", description = "布控车辆查询 dto")
+public class TbBkClSearchDto extends PageDomain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "号牌类型")
+    private String cplxdm;
+
+    @ApiModelProperty(value = "号牌号码")
+    private String cphm;
+
+    @ApiModelProperty(value = "布控级别")
+    private String bkjb;
+
+    @ApiModelProperty(value = "审核状态")
+    private String shzt;
+
+    @ApiModelProperty(value = "布控状态")
+    private String bkzt;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkRySearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkRySearchDto.java
new file mode 100644
index 0000000..ec1a808
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/bkzx/TbBkRySearchDto.java
@@ -0,0 +1,48 @@
+package com.mosty.base.model.query.bkzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-13
+ * 布控人员查询 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbBkRySearchDto对象", description = "控人员查询 dto")
+public class TbBkRySearchDto extends PageDomain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "布控类型 1.身份证布控 2.手机布控 3.护照布控 4.人脸布控")
+    private String bklx;
+
+    @ApiModelProperty(value = "布控内容")
+    private String keyword;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "布控级别")
+    private String bkjb;
+
+    @ApiModelProperty(value = "审核状态")
+    private String shzt;
+
+    @ApiModelProperty(value = "布控状态")
+    private String bkzt;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/HcTjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/HcTjQuery.java
new file mode 100644
index 0000000..01568e0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/HcTjQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.hczx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "HcTjQuery 对象", description = "核查统计")
+public class HcTjQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    @NotBlank(message = "所属部门不能为空")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/RyClTjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/RyClTjQuery.java
new file mode 100644
index 0000000..7ce503e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/RyClTjQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RyClTjQuery 对象", description = "要素中新查询DTO")
+public class RyClTjQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcclQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcclQuery.java
new file mode 100644
index 0000000..b20afac
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcclQuery.java
@@ -0,0 +1,94 @@
+package com.mosty.base.model.query.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-16
+ * 车辆盘查DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcclQuery 对象", description = "车辆盘查DTO")
+public class TbHcBpcclQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "号牌种类代码", name = "hpzl")
+    private String hpzl;
+
+    @ApiModelProperty(value = "号牌号码", name = "hphm")
+    private String hphm;
+
+    @ApiModelProperty(value = "盘查输入类型（1=自动识别;2=手工输入号牌;3=手工输入车辆识别号）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-车牌设备自动盘查，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+    @ApiModelProperty(value = "--D_BZ_PCCLJG（盘查处理结果）盘查处理结果（1 放行 2 移交 9盘查）")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "查询开始日期 yyyy-mm-dd")
+    private String kssj;
+
+    @ApiModelProperty("查询结束日期 yyyy-mm-dd")
+    private String jssj;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmid;
+
+    @ApiModelProperty("标签名称")
+    private String bqmc;
+
+
+    @ApiModelProperty("盘查民警姓名")
+    private String pcmjXm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcryQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcryQuery.java
new file mode 100644
index 0000000..ab84f39
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcBpcryQuery.java
@@ -0,0 +1,103 @@
+package com.mosty.base.model.query.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-13
+ * 人员盘查DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcryQuery 对象", description = "人员盘查DTO")
+public class TbHcBpcryQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "姓名", name = "xm")
+    private String xm;
+
+    @ApiModelProperty(value = "性别", name = "xbdm")
+    private String xbdm;
+
+    @ApiModelProperty(value = "出生日期", name = "csrq")
+    private String csrq;
+
+    @ApiModelProperty(value = "联系电话", name = "lxdh")
+    private String lxdh;
+
+    @ApiModelProperty(value = "盘查输入类型（1=刷身份证;2=手工输入身份证;3=电话号码查询;4=综合查询）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "--D_BZ_PCCLJG（盘查处理结果）盘查处理结果（1 放行 2 移交 9盘查）")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-人脸设备自动，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+    @ApiModelProperty(value = "查询开始日期 yyyy-mm-dd")
+    private String kssj;
+
+    @ApiModelProperty("查询结束日期 yyyy-mm-dd")
+    private String jssj;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty("标签名称")
+    private String bqmc;
+
+
+    @ApiModelProperty("盘查民警姓名")
+
+    private String pcmjXm;
+
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRyQuery.java
new file mode 100644
index 0000000..e214cf4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRyQuery.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.query.hczx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-09-13
+ * 人员盘查DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcRyQuery 对象", description = "人员盘查DTO")
+public class TbHcRyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "查询开始日期 yyyy-mm-dd")
+    private String kssj;
+
+    @ApiModelProperty("查询结束日期 yyyy-mm-dd")
+    private String jssj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRytzbqQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRytzbqQuery.java
new file mode 100644
index 0000000..1b3165d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcRytzbqQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.hczx;
+
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-09-17
+ * 人员特征标签查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcRytzbqQuery 对象", description = "人员特征标签查询DTO")
+public class TbHcRytzbqQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "特征标签类别(D_BZ_RYTZBQLB)", name = "tzbqlb")
+    private String tzbqlb;
+
+    @ApiModelProperty(value = "特征标签代码", name = "tzbqdm")
+    private String tzbqdm;
+
+    @ApiModelProperty(value = "特征标签名称", name = "tzbqmc")
+    private String tzbqmc;
+
+    @ApiModelProperty(value = "tzsx", name = "tzsx")
+    private String tzsx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcclQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcclQuery.java
new file mode 100644
index 0000000..5cd4175
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcclQuery.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.query.hczx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-02
+ * 今日被盘查车辆列表查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcTodayBpcclQuery对象", description = "今日被盘查车辆列表查询DTO")
+public class TbHcTodayBpcclQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "号牌种类")
+    private String hphm;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌种类代码）号牌种类代码")
+    private String hpzl;
+
+    @ApiModelProperty(value = "部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcryQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcryQuery.java
new file mode 100644
index 0000000..8fe0dd7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/hczx/TbHcTodayBpcryQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.hczx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-02
+ * 今日被盘查人员列表查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcTodayBpcryQuery对象", description = "今日被盘查人员列表查询DTO")
+public class TbHcTodayBpcryQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证")
+    private String sfzh;
+
+    @ApiModelProperty(value = "电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "部门代码")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglAbfcQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglAbfcQuery.java
new file mode 100644
index 0000000..c7b983a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglAbfcQuery.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/27
+ * 安保风采搜索类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglAbfcQuery 对象", description = "安保风采搜索类")
+public class TbJcglAbfcQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标题")
+    private String bt;
+
+    @ApiModelProperty(value = "摘要")
+    private String zy;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBqQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBqQuery.java
new file mode 100644
index 0000000..c0736f0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBqQuery.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防警力标签表（技能/经验）;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防警力标签表（技能/经验）", description = "")
+@TableName("tb_jcgl_bq")
+public class TbJcglBqQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 标签类型;EXP：经验标签，SKL：技能标签
+     */
+    @ApiModelProperty(value = "标签类型:EXP：经验标签，SKL：技能标签",name = "bqlx",example = "EXP")
+    private String bqlx;
+    /**
+     * 标签中文名称
+     */
+    @ApiModelProperty(value = "标签中文名称",name = "bqmc")
+    private String bqmc;
+    /**
+     * 标签拼音码;后端自动生成
+     */
+    @ApiModelProperty(value = "标签拼音码",name = "bqpym")
+    private String bqpym;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxdQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxdQuery.java
new file mode 100644
index 0000000..cf5078f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxdQuery.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_bxd")
+@ApiModel(value="TbJcglBxd对象", description="巡防区域必巡点查询")
+public class TbJcglBxdQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "必巡点名称")
+    private String bxdMc;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLX（必巡点类型）必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String bxdLx;
+
+    @ApiModelProperty(value = "必巡点详细地址")
+    private String xxdz;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLYDM（必巡点来源代码）01 经验必巡点 02 登记必巡点 03 区域分析必巡点")
+    private String bxdlydm;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "数据状态")
+    private String xtSjzt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxxQuery.java
new file mode 100644
index 0000000..a0cb857
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglBxxQuery.java
@@ -0,0 +1,48 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防区域-必巡线
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbJcglBxx对象", description="巡防区域-必巡线查询")
+public class TbJcglBxxQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "必巡线名称")
+    private String bxxMc;
+
+    @ApiModelProperty(value = "--D_BZ_BXDLX（必巡点类型）必巡点类型;1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String bxxLx;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglDsfQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglDsfQuery.java
new file mode 100644
index 0000000..18f008f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglDsfQuery.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ * 第三方表查询实体
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglDsfQuery 对象", description = "第三方表查询实体")
+public class TbJcglDsfQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "系统名称")
+    private String xtmc;
+
+    @ApiModelProperty(value = "服务类型 01.任务服务 02.位置服务 03.")
+    private String fwlx;
+
+    @ApiModelProperty(value = "责任人姓名")
+    private String zrrxm;
+
+    @ApiModelProperty(value = "状态 01.审核中 02.审核通过 03.已停用 04.已过期")
+    private String zt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJyqxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJyqxQuery.java
new file mode 100644
index 0000000..37993a6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJyqxQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.jcgl;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TbJcglJyqxQuery extends BasePage implements Serializable, Cloneable{
+
+  @ApiModelProperty(value = "器械名称")
+  private String qxMc;
+
+  @ApiModelProperty(value = "器械编号")
+  private String qxbh;
+
+  @ApiModelProperty(value = "设备分类")
+  private String scode;
+
+  @ApiModelProperty(value = "采购日期")
+  private String cgrq;
+
+  @ApiModelProperty(name = "所属部门代码")
+  private String ssbmdm;
+
+  @ApiModelProperty(name = "所属部门id")
+  private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJzQuery.java
new file mode 100644
index 0000000..9e83cf0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglJzQuery.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 勤务警组
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_jz")
+@ApiModel(value="TbJcglJz对象", description="勤务警组")
+public class TbJcglJzQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "勤务警组分类;1.民警小组，2、辅警小组，3、民警+辅警小组")
+    private String jzFl;
+
+    @ApiModelProperty(value = "带队民警身份证号")
+    private String ddMjsfzh;
+
+    @ApiModelProperty(value = "带队民警姓名")
+    private String ddMjxm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKfdQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKfdQuery.java
new file mode 100644
index 0000000..f2e61d9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKfdQuery.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 快反点查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKfdQuery对象", description = "快反点查询对象")
+public class TbJcglKfdQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "快返点名称", name = "kfdMc")
+    private String kfdMc;
+
+    @ApiModelProperty(value = "点位类型：01-快反点，02-检查站，50-2022世乒赛保卫点，多数据用逗号拼接")
+    private String dwlxs;
+
+    @ApiModelProperty(value = "快反点地址", name = "kfdDz")
+    private String kfdDz;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID", name = "ssbmid")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhbmQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhbmQuery.java
new file mode 100644
index 0000000..072e598
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhbmQuery.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhbmQuery  对象", description = "绩效考核部门查询VO")
+public class TbJcglKhbmQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhmxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhmxQuery.java
new file mode 100644
index 0000000..be1254e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhmxQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "考核模型", description = "")
+@TableName("tb_jcgl_khmx")
+public class TbJcglKhmxQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjQuery.java
new file mode 100644
index 0000000..bec9643
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjQuery.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhtjQuery  对象", description = "绩效考核部门统计查询DTO")
+public class TbJcglKhtjQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "01.天 02.月 03.季 04.年")
+    private String type;
+
+    @ApiModelProperty(value = "01.报备 02巡逻 03.签收")
+    private String searchType;
+
+    @ApiModelProperty(value = "天查询开始条件 yyyy-MM-dd")
+    private String kssj;
+
+    @ApiModelProperty(value = "天查询结束条件 yyyy-MM-dd")
+    private String jssj;
+
+    @ApiModelProperty(value = "月查询条件 yyyy-MM")
+    private String month;
+
+    @ApiModelProperty(value = "季度查询条件 01.一季度 02.二季度 03.三季度 04.四季度")
+    private String quarter;
+
+    @ApiModelProperty(value = "年查询条件 yyyy")
+    private String year;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询层级 01.第一层级  02.第二层级")
+    private String cxcj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjStatisticsQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjStatisticsQuery.java
new file mode 100644
index 0000000..b2131a9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglKhtjStatisticsQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhtjStatisticsQuery  对象", description = "绩效考核部门统计DTO")
+public class TbJcglKhtjStatisticsQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "01.报备 02巡逻 03.签收")
+    private String searchType;
+
+    @ApiModelProperty(value = "查询条件 yyyy-MM-dd")
+    private String time;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglShabllQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglShabllQuery.java
new file mode 100644
index 0000000..f75fd61
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglShabllQuery.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 社会安保力量-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglShabllQuery对象", description = "社会安保力量-分页查询对象")
+public class TbJcglShabllQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "安保力量类型")
+    private String ablllx;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "性别")
+    private String xbdm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfCyryQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfCyryQuery.java
new file mode 100644
index 0000000..2a21b41
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfCyryQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访从业人员", description = "")
+public class TbJcglXfCyryQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfDwglQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfDwglQuery.java
new file mode 100644
index 0000000..1f5ca03
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfDwglQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访单位管理", description = "")
+public class TbJcglXfDwglQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+
+    @ApiModelProperty(value = "单位名称")
+    private String dwmc;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "单位分类")
+    private String dwfl;
+
+    @ApiModelProperty(value = "单位类型")
+    private String dwlx;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfNrmbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfNrmbQuery.java
new file mode 100644
index 0000000..8fa7152
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfNrmbQuery.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访内容", description = "")
+public class TbJcglXfNrmbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "内容")
+    private String nr;
+
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfQuery.java
new file mode 100644
index 0000000..0074340
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfQuery.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 巡防警力标签表（技能/经验）;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访管理", description = "")
+public class TbJcglXfQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "巡访类型")
+    private String xflx;
+
+    @ApiModelProperty(value = "巡访单位")
+    private String xfdw;
+
+    @ApiModelProperty(value = "巡防民警")
+    private String xfmj;
+
+    @ApiModelProperty(value = "任务状态")
+    private String rwzt;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfRwQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfRwQuery.java
new file mode 100644
index 0000000..2628599
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfRwQuery.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防警力标签表（技能/经验）;
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访管理", description = "")
+public class TbJcglXfRwQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfZgQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfZgQuery.java
new file mode 100644
index 0000000..0cbdf28
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfZgQuery.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡访战果", description = "")
+public class TbJcglXfZgQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "申报类型")
+    private String sblx;
+
+    @ApiModelProperty(value = "申报状态")
+    private String sbzt;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclQuery.java
new file mode 100644
index 0000000..8a6edf7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclQuery.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8、12
+ * 巡防车辆-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfclQuery对象", description = "巡防车辆-分页查询对象")
+public class TbJcglXfclQuery extends BasePage implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "车牌类型")
+    private String cplx;
+
+    @ApiModelProperty(value = "车牌号")
+    private String cph;
+
+    @ApiModelProperty(value = "车辆品牌")
+    private String clpp;
+
+    @ApiModelProperty(value = "车辆类型;数据字典")
+    private String cllx;
+
+    @ApiModelProperty(value = "车辆型号")
+    private String clxh;
+
+    @ApiModelProperty(value = "车载电台")
+    private String czdt;
+
+    @ApiModelProperty(value = "车载监控")
+    private String czjk;
+
+    @ApiModelProperty(name = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(name = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclSbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclSbQuery.java
new file mode 100644
index 0000000..50df3dd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfclSbQuery.java
@@ -0,0 +1,52 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防车辆设备搜索类
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfclSbQuery 对象", description = "巡防车辆设备搜索类")
+public class TbJcglXfclSbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备唯一编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "设备分类")
+    private String sbFl;
+
+    @ApiModelProperty(value = "设备品牌")
+    private String sbPp;
+
+    @ApiModelProperty(value = "--D_BZ_AZWZ（安装位置）安装位置;1车辆内部，2车辆前部，3车辆后部，4车辆顶部（数据字典）")
+    private String azwz;
+
+    @ApiModelProperty(value = "设备IPv4")
+    private String sbIpv4;
+
+    @ApiModelProperty(value = "设备IPv6")
+    private String sbIpv6;
+
+    @ApiModelProperty(value = "设备图片")
+    private String sbTp;
+
+    @ApiModelProperty(value = "是否支持视频 0不支持 1支持")
+    private String sfsp;
+
+    @ApiModelProperty(value = "车辆id")
+    private String cId;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllFzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllFzQuery.java
new file mode 100644
index 0000000..0defbe5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllFzQuery.java
@@ -0,0 +1,28 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表查询条件", description = "")
+public class TbJcglXfllFzQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 3749357081830992531L;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzmc;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQuery.java
new file mode 100644
index 0000000..924161e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQuery.java
@@ -0,0 +1,67 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 巡防力量表;
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表查询条件", description = "")
+public class TbJcglXfllQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 3749357081830992531L;
+
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）", notes = "")
+    private String ryid;
+
+    @ApiModelProperty(value = "警员分类：01、民警，02、辅警", name = "fl")
+    private String fl;
+
+    @ApiModelProperty(value = "警员类型：01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警", name = "lx")
+    private String lx;
+
+    @ApiModelProperty(value = "姓名<模糊查询>", name = "xm")
+    private String xm;
+
+    @ApiModelProperty(value = "性别代码", name = "xbdm")
+    private String xbdm;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "警号", name = "jh")
+    private String jh;
+
+    @ApiModelProperty(value = "联系电话", name = "lxdh")
+    private String lxdh;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id", name = "ssbmid")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "巡防力量标签标识ID", name = "bqId")
+    private String bqId;
+
+    @ApiModelProperty(value = "巡防力量标签类型", name = "bqlx")
+    private String bqlx;
+
+    @ApiModelProperty(value = "数据状态：0、注销，1、正常，-1、封存",name = "xtSjzt")
+    private String xtSjzt;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQueryAllDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQueryAllDto.java
new file mode 100644
index 0000000..ad9d08b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfllQueryAllDto.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfllQueryAllDto", description = "巡防力量查询DTO")
+public class TbJcglXfllQueryAllDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty(value = "部门代码")
+    private String deptid;
+
+    @ApiModelProperty(name = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfqyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfqyQuery.java
new file mode 100644
index 0000000..a42e222
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfqyQuery.java
@@ -0,0 +1,48 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfqyQuery对象", description = "巡防区域查询对象")
+public class TbJcglXfqyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "--D_BZ_XQLX（巡区类型）巡防区类型1、一般区域，2、重点区域，3、核心区域，4、人员密集区域")
+    private String xfqLx;
+
+    @ApiModelProperty(value = "--D_BZ_XFQDJ（巡防区等级）巡防区等级;")
+    private String xfqDj;
+
+    @ApiModelProperty(value = "巡防区名称")
+    private String xfqMc;
+
+    @ApiModelProperty(value = "巡防区负责人")
+    private String xfqFzr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfwgQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfwgQuery.java
new file mode 100644
index 0000000..92324ce
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXfwgQuery.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 巡防网格
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_xfwg")
+@ApiModel(value="TbJcglXfwg对象", description="巡防网格")
+public class TbJcglXfwgQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防网格名称")
+    private String wgMc;
+
+    @ApiModelProperty(value = "巡防网格编号")
+    private String wgBh;
+
+    @ApiModelProperty(value = "巡防网格类型")
+    private String wglx;
+
+    @ApiModelProperty(value = "所属巡防区域ID")
+    private String ssXfqyId;
+
+    @ApiModelProperty(value = "多边形数据存储（JSON）")
+    private String pgis;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXlfaQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXlfaQuery.java
new file mode 100644
index 0000000..cf25dac
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglXlfaQuery.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ * 巡逻方案-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXlfaQuery对象", description = "巡逻方案-分页查询对象")
+public class TbJcglXlfaQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "执行周期（01-每年执行，02-每月，03-每周,99-固定日期）")
+    private String zxzq;
+
+    @ApiModelProperty(value = "执行周期描述，如：每年6月6日至9日执行高考巡逻方案")
+    private String zxms;
+
+    @ApiModelProperty(value = "执行年月日（根据执行周期来）")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zxksyr;
+
+    @ApiModelProperty(value = "执行星期几")
+    private Integer zxxq;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZjkQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZjkQuery.java
new file mode 100644
index 0000000..97d888c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZjkQuery.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 基础管理-专家库
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jcgl_zjk")
+@ApiModel(value="TbJcglZjk对象", description="基础管理-专家库")
+public class TbJcglZjkQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "--D_ZDY_ZJGL专家来源（1 内部 2 外部）")
+    private String zjly;
+
+    @ApiModelProperty(value = "关联人员ID")
+    private String glryId;
+
+    @ApiModelProperty(value = "专家姓名")
+    private String zjxm;
+
+    @ApiModelProperty(value = "专家身份证号码")
+    private String zjsfzh;
+
+    @ApiModelProperty(value = "管理部门代码")
+    private String glbmdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZnzbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZnzbQuery.java
new file mode 100644
index 0000000..72344d2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZnzbQuery.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.jcgl;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "装备类别")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_jcgl_znzb")
+public class TbJcglZnzbQuery extends BasePage implements Serializable, Cloneable{
+
+  @ApiModelProperty(value = "设备编码")
+  private String sbbh;
+
+  @ApiModelProperty(value = "设备名称")
+  private String sbmc;
+
+  @ApiModelProperty(value = "设备分类")
+  private String scode;
+
+  @ApiModelProperty(value = "设备类型名称")
+  private String sname;
+
+  @ApiModelProperty(value = "采购日期")
+  private String cgrq;
+
+  @ApiModelProperty(value = "到期时间")
+  private String dqsj;
+
+  @ApiModelProperty("是否专业装备")
+  private String sfzy;
+
+  @ApiModelProperty("是否融合")
+  private String sfrh;
+  @ApiModelProperty(value = "所属单位")
+  private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZyzbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZyzbQuery.java
new file mode 100644
index 0000000..5b222ee
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbJcglZyzbQuery.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.query.jcgl;
+
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "智能装备-专业装备查询")
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TbJcglZyzbQuery extends BasePage implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "关联id")
+    private String glid;
+
+    @ApiModelProperty(value = "接入类型")
+    private String jrlx;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbSjRzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbSjRzQuery.java
new file mode 100644
index 0000000..464006b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/TbSjRzQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.jcgl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-08-25
+ * 日志记录查询 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjRzQuery 对象", description = "日志记录查询 dto")
+public class TbSjRzQuery extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 7390057038182466339L;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "日志内容")
+    private String rzms;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/XfqyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/XfqyQuery.java
new file mode 100644
index 0000000..e49e342
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/jcgl/XfqyQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.jcgl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XfqyQuery 对象", description = "各区县重点巡防区域DTO")
+public class XfqyQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+    
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbCountQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbCountQuery.java
new file mode 100644
index 0000000..e95d837
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbCountQuery.java
@@ -0,0 +1,47 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb")
+@ApiModel(value="TbQwBmjlbb对象", description="警力报备统计查询实体")
+public class TbQwBmjlbbCountQuery implements Serializable,Cloneable{
+
+    @ApiModelProperty(value = "开始日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbJlmxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbJlmxQuery.java
new file mode 100644
index 0000000..31d813d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbJlmxQuery.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 部门每日警力报备-警力明细
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb_jlmx")
+@ApiModel(value="TbQwBmjlbbJlmx对象", description="部门每日警力报备-警力明细")
+public class TbQwBmjlbbJlmxQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "警力报备ID")
+    private String jlbbId;
+
+    @ApiModelProperty(value = "警力ID")
+    private String jlId;
+
+    @ApiModelProperty(value = "警力类型（01 民警  02 辅警）")
+    private String jllx;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbQuery.java
new file mode 100644
index 0000000..501c85f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwBmjlbbQuery.java
@@ -0,0 +1,58 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 部门每日警力报备表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb")
+@ApiModel(value="TbQwBmjlbb对象", description="部门每日警力报备表")
+public class TbQwBmjlbbQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwFaQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwFaQuery.java
new file mode 100644
index 0000000..9c625ef
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwFaQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防方案", description = "")
+public class TbQwFaQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJjrQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJjrQuery.java
new file mode 100644
index 0000000..4ba9023
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJjrQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwJjrQuery 对象", description = "节假日查询DTO")
+public class TbQwJjrQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日期类型0-节假日，1-工作日")
+    private String rqlx;
+
+    @ApiModelProperty(value = "节假日")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private String jjrq;
+
+    @ApiModelProperty(value = "节假日名称")
+    private String jjrmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJmxzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJmxzSearchDto.java
new file mode 100644
index 0000000..2e80880
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwJmxzSearchDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-11-23
+ * APP 查询街面巡组列表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbQwJmxzSearchDto 对象", description = "APP 查询街面巡组列表")
+public class TbQwJmxzSearchDto extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty("查询类型 1.本部门 2.全部")
+    private String type;
+
+    @ApiModelProperty("关键字")
+    private String keyword;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwbcQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwbcQuery.java
new file mode 100644
index 0000000..d60b09f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwbcQuery.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 勤务班次表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qwbc")
+@ApiModel(value="TbQwQwbc对象", description="勤务班次表")
+public class TbQwQwbcQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "班次名称")
+    private String bcmc;
+
+    @ApiModelProperty(value = "班次开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "班次结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "排班级别（01 市级  02 县级 03 科所队 ）")
+    private String pbjb;
+
+    @ApiModelProperty(value = "班次类型（01 勤务值班 02 巡防排班）")
+    private String bclx;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwdjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwdjQuery.java
new file mode 100644
index 0000000..36ff0b2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQwdjQuery.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 勤务等级表
+ * </p>
+ *
+ * @author kevin
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qwdj")
+@ApiModel(value="TbQwQwdj对象", description="勤务等级表")
+public class TbQwQwdjQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "执行范围执行范围：01-全省、02-全市、03-全县、04-部门")
+    private String zxfw;
+
+    @ApiModelProperty(value = "勤务开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "勤务结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "发布状态（0 未发布  1已发布）")
+    private String fbzt;
+
+    @ApiModelProperty(value = "当前时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date currentTime;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjMyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjMyQuery.java
new file mode 100644
index 0000000..e853e75
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjMyQuery.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-11-23
+ * 我的请休假查询查询对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwQxjMyQuery 对象", description="我的请休假查询查询对象")
+public class TbQwQxjMyQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "请假类型（01 调休  02 事假 03 病假  04 年假 05婚假 06 产假 07 陪产假 08 丧假）字典")
+    private String qjlx;
+
+    @ApiModelProperty(value = "请假开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "请假结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjQuery.java
new file mode 100644
index 0000000..8faf15e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwQxjQuery.java
@@ -0,0 +1,60 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 请休假
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_qxj")
+@ApiModel(value="TbQwQxj对象", description="请休假")
+public class TbQwQxjQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "申请人类型（01-民警 02-辅警）")
+    private String sqrlx;
+
+    @ApiModelProperty(value = "申请部门代码")
+    private String sqbmdm;
+
+    @ApiModelProperty(value = "申请部门id")
+    private String sqbmid;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrXm;
+
+    @ApiModelProperty(value = "请假类型（01 调休  02 事假 03 病假  04 年假 05婚假 06 产假 07 陪产假 08 丧假）字典")
+    private String qjlx;
+
+    @ApiModelProperty(value = "请假开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "请假结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwSpsCsdwQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwSpsCsdwQuery.java
new file mode 100644
index 0000000..9cb98a1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwSpsCsdwQuery.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 世乒赛参赛队伍查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSpsCsdwQuery 对象", description = "世乒赛参赛队伍查询DTO")
+public class TbQwSpsCsdwQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "参赛队伍名称")
+    private String cddwmc;
+
+    @ApiModelProperty(value = "所属小组")
+    private String ssxz;
+
+    @ApiModelProperty(value = "活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地,多个查询用‘,’拼接")
+    private String dqwzs;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfBxfsqQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfBxfsqQuery.java
new file mode 100644
index 0000000..a386e6f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfBxfsqQuery.java
@@ -0,0 +1,74 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 不巡防申请
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xf_bxfsq")
+@ApiModel(value="TbQwXfBxfsq对象", description="不巡防申请")
+public class TbQwXfBxfsqQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfpbId;
+
+    @ApiModelProperty(value = "申请人姓名")
+    private String sqrXm;
+
+    @ApiModelProperty(value = "申请部门代码")
+    private String sqbmdm;
+
+    @ApiModelProperty(value = "申请部门id")
+    private String sqbmid;
+
+    @ApiModelProperty(value = "不巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date bxfsj;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date jssj;
+
+    @ApiModelProperty(value = "审核部门代码")
+    private String shbmdm;
+
+    @ApiModelProperty(value = "审核部门id")
+    private String shbmid;
+
+    @ApiModelProperty(value = "审核状态（0 未审核 1 审核通过 2 审核失败）")
+    private String shzt;
+
+    @ApiModelProperty(value = "审批时间")
+    private Date spsj;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbJmxzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbJmxzQuery.java
new file mode 100644
index 0000000..0b77f69
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbJmxzQuery.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022-08-08
+ * 街面巡组查询DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfbbJmxzQuery对象", description = "街面巡组查询DTO")
+public class TbQwXfbbJmxzQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "巡逻状态")
+    private String xfzt;
+
+    @ApiModelProperty(value = "报备日期")
+    private String bbrq;
+
+    @ApiModelProperty("负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty("警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "范围（米）")
+    private BigDecimal radius;
+
+    @ApiModelProperty(value = "勤务类型")
+    private String qwlx;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+
+    @ApiModelProperty(value = "着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbQuery.java
new file mode 100644
index 0000000..5149cf0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfbbQuery.java
@@ -0,0 +1,122 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 巡防报备查询表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_xfbb")
+@ApiModel(value = "TbQwXfbb对象", description = "巡防报备表")
+public class TbQwXfbbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "巡防排班ID")
+    private String xfbId;
+
+    @ApiModelProperty(value = "--D_BZ_QWLX(勤务类型) 00-日常巡防 01-动中备勤 02-机关值班 ")
+    private String qwlxs;
+
+    @ApiModelProperty(value = "报备类型 01 正常报备 02特殊勤务报备")
+    private String bblx;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "勤务等级：1.一级勤务 2.二级勤务 3.三级勤务")
+    private String qwdj;
+
+    @ApiModelProperty(value = "巡防部门代码")
+    private String xfbmdm;
+
+    @ApiModelProperty(value = "巡防部门id")
+    private String xfbmid;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "开始巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date ksXfrq;
+
+    @ApiModelProperty(value = "结束巡防日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jsXfrq;
+
+    @ApiModelProperty(value = "巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "巡逻状态（0 巡逻中、1 处警中、2 执行指令中）（字典）")
+    private String xfzt;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "数据来源;1、PC，2、手机端")
+    private String xtSjly;
+
+    @ApiModelProperty(value = "数据状态;0、停用，1、正常")
+    private String xtSjzt;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "范围（米）")
+    private String distance;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbQuery.java
new file mode 100644
index 0000000..5b795f3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbQuery.java
@@ -0,0 +1,64 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 巡防排班查询对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbQuery对象", description = "巡防排班查询对象")
+public class TbQwXfpbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "排班开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "排班结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date pbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "排班人姓名")
+    private String pbr;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "排班名称")
+    private String pbmc;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbSearchMyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbSearchMyQuery.java
new file mode 100644
index 0000000..cd641ae
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwXfpbSearchMyQuery.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 查询我的巡防排班信息
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbSearchMyQuery对象", description = "查询我的巡防排班信息")
+public class TbQwXfpbSearchMyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "排班开始日期")
+    @JsonFormat(pattern = "yyyy-mm-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private Date pbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "排班结束日期")
+    @JsonFormat(pattern = "yyyy-mm-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private Date pbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbQuery.java
new file mode 100644
index 0000000..ac41591
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbQuery.java
@@ -0,0 +1,54 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 值班表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwZb对象", description="值班表")
+public class TbQwZbQuery extends BasePage implements Serializable, Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "值班开始日期")
+    private String startTime;
+
+    @ApiModelProperty(value = "值班结束日期")
+    private String endTime;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbld;
+
+    @ApiModelProperty(value = "值班民警")
+    private String zbmjxm;
+
+    @ApiModelProperty(value = "值班状态（01 未值班、02值班中、03 值班完成）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "是否确认（0 未确认 1 确认）")
+    private String sfqr;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbbbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbbbQuery.java
new file mode 100644
index 0000000..02a0c6b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbbbQuery.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwZbbbQuery 对象", description="值班报备查询对象")
+public class TbQwZbbbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "值班开始日期")
+    private String startTime;
+
+    @ApiModelProperty(value = "值班结束日期")
+    private String endTime;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbQuery.java
new file mode 100644
index 0000000..15cc205
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbQuery.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-03
+ * 值班排班查询对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwZbpbQuery对象", description = "值班排班查询对象")
+public class TbQwZbpbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "值班名称")
+    private String zbmc;
+
+    @ApiModelProperty(value = "值班描述")
+    private String zbms;
+
+    @ApiModelProperty(value = "值班排班开始日期")
+    @JsonFormat(pattern = "yyyy-mm-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private String zbpbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "值班排班结束日期")
+    @JsonFormat(pattern = "yyyy-mm-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private Date zbpbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+
+    @ApiModelProperty(value = "每日班次数")
+    private Integer mrbc;
+
+    @ApiModelProperty(value = "所属值班部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属值班部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbSearchMyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbSearchMyQuery.java
new file mode 100644
index 0000000..798acec
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/qwzx/TbQwZbpbSearchMyQuery.java
@@ -0,0 +1,46 @@
+package com.mosty.base.model.query.qwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-08-04
+ * 我的值班排班查询对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwZbpbSearchMyQuery对象", description = "我的值班排班查询对象")
+public class TbQwZbpbSearchMyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "排班开始日期")
+    @JsonFormat(pattern = "yyyy-mm-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private Date zbpbksrq;
+
+    @ApiModelProperty(value = "结束日期类型（0-无期限，1-固定结束日期）")
+    private String jsrqlx;
+
+    @ApiModelProperty(value = "排班结束日期")
+    @JsonFormat(pattern = "yyyy-mm-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-mm-dd")
+    private Date zbpbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xhzq;
+
+    @ApiModelProperty(value = "0-每天循环，1-工作日循环，2-休息日循环")
+    private String xhlx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskByYwidQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskByYwidQuery.java
new file mode 100644
index 0000000..eceb335
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskByYwidQuery.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务表查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskByYwidQuery 对象", description = "任务查询DTO--内部")
+public class TbRwTaskByYwidQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskInnerQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskInnerQuery.java
new file mode 100644
index 0000000..45eef06
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskInnerQuery.java
@@ -0,0 +1,78 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务表查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskInnerQuery 对象", description = "任务表查询对象--内部")
+public class TbRwTaskInnerQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务详细类型")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 03巡防任务 04.值班任务  05.指令任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成 5.超期未完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+//    @ApiModelProperty(value = "创建人所属市公安局")
+//    private String ssxgajid;
+//
+//    @ApiModelProperty(value = "创建人所属市公安局代码")
+//    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskLogQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskLogQuery.java
new file mode 100644
index 0000000..5dc427a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskLogQuery.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务日志查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskLogQuery 对象", description = "任务日志查询对象")
+public class TbRwTaskLogQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = " 1.任务关闭 2.开始任务 3.完成任务 4.任务转发 5.任务暂停 6.任务重启 " +
+            "7.接收转发任务 8.驳回转发任务 9.发起任务 10.删除任务")
+    private String rzlx;
+
+    @ApiModelProperty(value = "日志内容 例：2022-09-08 12:00:02,XX查看了任务")
+    private String rznr;
+
+    @ApiModelProperty(value = "变更人姓名")
+    private String bgrxm;
+
+    @ApiModelProperty(value = "变更人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "变更人所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyInnerQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyInnerQuery.java
new file mode 100644
index 0000000..bce9810
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyInnerQuery.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 我的任务表查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskMyQuery 对象", description = "我的任务表查询对象")
+public class TbRwTaskMyInnerQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String grrwzt;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务  05.指令任务")
+    private String rwxl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyQuery.java
new file mode 100644
index 0000000..9cbccce
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskMyQuery.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 我的任务表查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskMyQuery 对象", description = "我的任务表查询对象")
+public class TbRwTaskMyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String grrwzt;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskQuery.java
new file mode 100644
index 0000000..e5ea349
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskQuery.java
@@ -0,0 +1,76 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务表查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskQuery 对象", description = "任务表查询对象")
+public class TbRwTaskQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一请求码")
+    private String code;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成 5.超期未完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskUserQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskUserQuery.java
new file mode 100644
index 0000000..a89369d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rwzx/TbRwTaskUserQuery.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.query.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ * 任务接收人查询dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskUserQuery 对象", description = "任务接收人查询dto")
+public class TbRwTaskUserQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String rwzt;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "变更人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "变更人所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzDyjkQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzDyjkQueryDto.java
new file mode 100644
index 0000000..defe4c6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzDyjkQueryDto.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.query.rzzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 接口调用日志分页查询dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzDyjkQueryDto对象", description = "接口调用日志分页查询dto")
+public class TbRzDyjkQueryDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "操作人姓名")
+    private String czrxm;
+
+    @ApiModelProperty(value = "接口系统")
+    private String jkxt;
+
+    @ApiModelProperty(value = "接口调用是否成功")
+    private String sfcg;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzHjQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzHjQueryDto.java
new file mode 100644
index 0000000..0349e37
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzHjQueryDto.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.query.rzzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 呼叫日志分页查询dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzHjQueryDto对象", description = "呼叫日志分页查询dto")
+public class TbRzHjQueryDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "是否成功")
+    private String fjrXm;
+
+    @ApiModelProperty(value = "呼叫号码")
+    private String hjhm;
+
+    @ApiModelProperty(value = "接口调用是否成功")
+    private String sfcg;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzSpbfQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzSpbfQueryDto.java
new file mode 100644
index 0000000..9fe2711
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzSpbfQueryDto.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.query.rzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频播放日志查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzSpbfQueryDto对象", description = "视频播放日志查询DTO")
+public class TbRzSpbfQueryDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "摄像头ID或名称")
+    private String keyword;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzXtfkQueryDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzXtfkQueryDto.java
new file mode 100644
index 0000000..b844a94
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/rzzx/TbRzXtfkQueryDto.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.query.rzzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 系统反馈日志分页查询dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRzXtfkQueryDto对象", description = "系统反馈日志分页查询dto")
+public class TbRzXtfkQueryDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "反馈类型1-系统问题，2-功能改进建议，3-新需求")
+    private String fklx;
+
+    @ApiModelProperty(value = "反馈系统")
+    private String fkxt;
+
+    @ApiModelProperty(value = "反馈开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "反馈结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String fknr;
+
+    @ApiModelProperty(value = "反馈人姓名")
+    private String fkrxm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/SearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/SearchDto.java
new file mode 100644
index 0000000..e3ceb81
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/SearchDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 大屏搜索DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "SearchDto对象", description = "大屏搜索DTO")
+public class SearchDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("查询类型 01.警情  02.预警 03.指令 04.事件  05.地理要素 06.公安机关")
+    private String type;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqCjdbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqCjdbQuery.java
new file mode 100644
index 0000000..fafce6a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqCjdbQuery.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/11/07
+ * 处警单表查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJqCjdbQuery 对象", description = "处警单表查询DTO")
+public class TbJqCjdbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "接警单编号")
+    private String jjdbh;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqListQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqListQuery.java
new file mode 100644
index 0000000..17851ad
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqListQuery.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 警情查询列表Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJqListQuery对象", description = "警情查询列表Dto")
+public class TbJqListQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "报警开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "报警结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "报警内容")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别")
+    private String jqjb;
+
+    @ApiModelProperty(value = "报警类别")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类型")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警细类")
+    private String bjxl;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "方圆（米）")
+    private Integer radius;
+
+    @ApiModelProperty(value = "--D_BZ_CZZT（处置状态）处置状态 0.未处置 1.处置中 2.已完成")
+    private String czzt;
+
+    @ApiModelProperty(value = "--D_BZ_ZDJQTJLX（重大警情添加类型）重大警情添加类型 01.系统推送 02.手动添加 03.一键报警")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "报警类别 多选")
+    private String bjlbs;
+
+    @ApiModelProperty(value = "绵阳类别 1 打击斗殴 2 侵财(两抢一盗)")
+    private String mylb;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqPageListQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqPageListQuery.java
new file mode 100644
index 0000000..439c173
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbJqPageListQuery.java
@@ -0,0 +1,85 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 警情分页查询分页Dto
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJqPageListQuery对象", description = "警情分页查询分页Dto")
+public class TbJqPageListQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "报警内容")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别，多级别用逗号分割")
+    private String jqjb;
+
+    @ApiModelProperty(value = "报警类别 1.刑事，2.行政，3.交通，4.其他")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类型")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警类型")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警细类")
+    private String bjxl;
+
+    @ApiModelProperty(value = "经度")
+    private String jd;
+
+    @ApiModelProperty(value = "纬度")
+    private String wd;
+
+    @ApiModelProperty(value = "方圆（米）")
+    private Integer radius;
+
+    @ApiModelProperty(value = "--D_BZ_CZZT（处置状态）处置状态 0.未处置 1.处置中 2.已完成")
+    private String czzt;
+
+    @ApiModelProperty(value = "--D_BZ_ZDJQTJLX（重大警情添加类型）重大警情添加类型 01.系统推送 02.手动添加 03.一键报警")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "警情类别 多选")
+    private String bjlbs;
+
+    @ApiModelProperty(value = "01 交警 02 本部门")
+    private String type;
+
+    @ApiModelProperty(value = "是否重大警情(0：否，1：是)", name = "sfswybj")
+    private String sfzdjq;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否街面警情", name = "sfjmjq")
+    private String sfjmjq;
+
+    @ApiModelProperty(value = "颜色 1红 2橙 3黄 4蓝", name = "color")
+    private String color;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbSjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbSjQuery.java
new file mode 100644
index 0000000..66d3005
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/TbSjQuery.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 事件查询 dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSjQuery 对象", description = "事件查询 dto")
+public class TbSjQuery extends BasePage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "事件来源:01-感知预警，02-警情，03-一键增援，04-犯罪分析，99-自行发起")
+    private String sjFl;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbQuery.java
new file mode 100644
index 0000000..a9f70e4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XfbbQuery 对象", description = "巡防报备里程和时长DTO")
+public class XfbbQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+    
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbTjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbTjQuery.java
new file mode 100644
index 0000000..a897862
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XfbbTjQuery.java
@@ -0,0 +1,29 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XfbbQuery 对象", description = "巡防报备统计DTO")
+public class XfbbTjQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJqlbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJqlbQuery.java
new file mode 100644
index 0000000..036e9e4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJqlbQuery.java
@@ -0,0 +1,39 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XftjJqlbQuery 对象", description = "要素中新查询DTO")
+public class XftjJqlbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警内容")
+    private String bjnr;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJwzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJwzQuery.java
new file mode 100644
index 0000000..a80045a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjJwzQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XftjJwzQuery 对象", description = "要素中新查询DTO")
+public class XftjJwzQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警务站类型")
+    private String jwzlx;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjQuery.java
new file mode 100644
index 0000000..6cfab62
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjQuery.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.query.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XftjQuery 对象", description = "要素中新查询DTO")
+public class XftjQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjXfllQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjXfllQuery.java
new file mode 100644
index 0000000..616321e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjXfllQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XftjXfllQuery 对象", description = "要素中新查询DTO")
+public class XftjXfllQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjYdzbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjYdzbQuery.java
new file mode 100644
index 0000000..7e2a00a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/XftjYdzbQuery.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.query.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "XftjYdzbQuery 对象", description = "要素中新查询DTO")
+public class XftjYdzbQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "装备类型")
+    private String txzblx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxNyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxNyQuery.java
new file mode 100644
index 0000000..121ceac
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxNyQuery.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.query.sjzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "YszxNyQuery 对象", description = "要素中新查询DTO")
+public class YszxNyQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始年月")
+    private String ksny;
+
+    @ApiModelProperty(value = "结束年月")
+    private String jsny;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxQuery.java
new file mode 100644
index 0000000..6da1342
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/sjzx/YszxQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.sjzx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ * 要素中新查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "YszxQuery 对象", description = "要素中新查询DTO")
+public class YszxQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String ksrq;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jsrq;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/spxl/TbSpxlSpxlfaQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/spxl/TbSpxlSpxlfaQuery.java
new file mode 100644
index 0000000..2dba058
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/spxl/TbSpxlSpxlfaQuery.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.query.spxl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-07-11
+ * 视频巡逻方案分页查询
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbSpxlSpxlfaQuery对象", description = "视频巡逻方案分页查询")
+public class TbSpxlSpxlfaQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "方案名称")
+    private String famc;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+
+    @ApiModelProperty(value = "方案类型 1.基础巡逻  2.定制巡逻")
+    private String falx;
+
+    @ApiModelProperty(value = "分屏数 1,4,6,9")
+    private String fps;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPersonVisitRecordQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPersonVisitRecordQuery.java
new file mode 100644
index 0000000..8511f58
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPersonVisitRecordQuery.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.query.trs;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/26
+ * 拓尔思走访记录分页查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "VwPersonVisitRecordQuery 对象", description = "拓尔思走访记录分页查询DTO")
+public class VwPersonVisitRecordQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "查询开始事件 yyyy-MM-dd")
+    private String kssj;
+
+    @ApiModelProperty(value = "查询结束事件 yyyy-MM-dd")
+    private String jssj;
+
+    @ApiModelProperty(value = "控制类型 0.失控 1.在控 2.待反馈")
+    private String inControlCodes;
+
+    @ApiModelProperty(value = "走访方式代码")
+    private String methodCode;
+
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPsPersonZyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPsPersonZyQuery.java
new file mode 100644
index 0000000..c3bfebd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/trs/VwPsPersonZyQuery.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.query.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/26
+ * 拓尔思走访人员表分页查询DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "VwPsPersonZyQuery 对象", description = "拓尔思走访人员表分页查询DTO")
+public class VwPsPersonZyQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "管控状态   '1', '已列管', '2', '已布控', '3', '已归档'")
+    private String controlStatusCode;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzLswzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzLswzSearchDto.java
new file mode 100644
index 0000000..5888182
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzLswzSearchDto.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.query.wzzx;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbWzLswzSearchDto 对象", description = "历史位置")
+public class TbWzLswzSearchDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "报备业务ID", name = "bbId")
+    private String bbId;
+
+    @ApiModelProperty(value = "开始时间", name = "kssj")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间", name = "jssj")
+    private String jssj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzRywzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzRywzSearchDto.java
new file mode 100644
index 0000000..023ea94
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzRywzSearchDto.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.wzzx;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-11-28
+ * 人员位置查询dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbWzSswzSearchDto 对象", description = "人员位置查询dto")
+public class TbWzRywzSearchDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "查询时间")
+    private String dwrq;
+
+    @ApiModelProperty(value = "查询身份证号")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSbLswzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSbLswzSearchDto.java
new file mode 100644
index 0000000..b596d09
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSbLswzSearchDto.java
@@ -0,0 +1,27 @@
+package com.mosty.base.model.query.wzzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbWzLswzSearchDto 对象", description = "设备历史位置")
+public class TbWzSbLswzSearchDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "设备id", name = "gpsId")
+    private String gpsId;
+
+    @ApiModelProperty(value = "开始时间", name = "kssj")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间", name = "jssj")
+    private String jssj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSswzSearchDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSswzSearchDto.java
new file mode 100644
index 0000000..c550dcf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/wzzx/TbWzSswzSearchDto.java
@@ -0,0 +1,31 @@
+package com.mosty.base.model.query.wzzx;
+
+import com.mosty.base.model.BasePage;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022-11-28
+ * 人员实时位置查询dto
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbWzSswzSearchDto 对象", description = "人员实时位置查询dto")
+public class TbWzSswzSearchDto extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "定位日期")
+    private String dwrq;
+
+    @ApiModelProperty(value = "查询时间身份证号")
+    private String sfzh;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjDyyjxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjDyyjxxQuery.java
new file mode 100644
index 0000000..91fde68
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjDyyjxxQuery.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 订阅预警信息表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dyyjxx")
+@ApiModel(value="TbYjDyyjxxQuery 对象", description="订阅预警信息表")
+public class TbYjDyyjxxQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjkssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjjssj;
+
+    @ApiModelProperty(value = "短信手机号")
+    private String dxjssjh;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxCsbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxCsbQuery.java
new file mode 100644
index 0000000..1e2a0a1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxCsbQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjmxCsbQuery对象", description = "预警模型参数表查询接口--分页")
+public class TbYjmxCsbQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "模型ID")
+    private String mxid;
+
+    @ApiModelProperty(value = "参数代码")
+    private String csdm;
+
+    @ApiModelProperty(value = "参数名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "参数值")
+    private String csz;
+
+    @ApiModelProperty(value = "参数类型 01-时间（分）02-次数 03-人数 04-距离（米）")
+    private String cslx;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxQuery.java
new file mode 100644
index 0000000..df80b69
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjmxQuery.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.base.model.BasePage;
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjmxQuery对象", description = "预警模型查询接口--分页")
+public class TbYjmxQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+    @ApiModelProperty(value = "模型ID；01.街面违法犯罪预警 02.重点巡防区域预警")
+    private String mxlx;
+
+    @ApiModelProperty(value = "所属辖区名称")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属辖区代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属辖区ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "模型状态 01-使用中 02-已停止")
+    private String mxzt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjqkQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjqkQuery.java
new file mode 100644
index 0000000..019e0e4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjqkQuery.java
@@ -0,0 +1,25 @@
+package com.mosty.base.model.query.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjqkQuery 对象", description = "各区县预警情况DTO")
+public class TbYjqkQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "开始时间")
+    private String kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    private String jssj;
+    
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxClQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxClQuery.java
new file mode 100644
index 0000000..ee90060
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxClQuery.java
@@ -0,0 +1,57 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 预警信息-车辆表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_cl")
+@ApiModel(value="TbYjxxCl对象", description="预警信息-车辆表")
+public class TbYjxxClQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）车辆标签1临控2被抢盗3套牌")
+    private String yjClbq;
+
+    @ApiModelProperty(value = "预警开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjsksj;
+
+    @ApiModelProperty(value = "预警结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjjssj;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "车牌号")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDypzQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDypzQuery.java
new file mode 100644
index 0000000..dfd4bc6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDypzQuery.java
@@ -0,0 +1,46 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz")
+@ApiModel(value="TbYjxxDypz对象", description="预警信息-订阅配置表")
+public class TbYjxxDypzQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）订阅预警级别")
+    private String dyYjjb;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）订阅人员标签")
+    private String dyYjrybq;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）订阅车辆标签")
+    private String dyYjclbq;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDyyjxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDyyjxxQuery.java
new file mode 100644
index 0000000..a420a60
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxDyyjxxQuery.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 订阅预警信息表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dyyjxx")
+@ApiModel(value="TbYjxxDyyjxx对象", description="订阅预警信息表")
+public class TbYjxxDyyjxxQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "预警ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjkssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjjssj;
+
+    @ApiModelProperty(value = "短信手机号")
+    private String dxjssjh;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxNoPageQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxNoPageQuery.java
new file mode 100644
index 0000000..774ab4e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxNoPageQuery.java
@@ -0,0 +1,68 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 预警信息查询接口--分页
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxQuery对象", description = "预警信息查询接口--分页")
+public class TbYjxxNoPageQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警类型;1-人员预警，2-车辆预警，3-人员和车辆预警，4-事件预警（拉横幅、打架等），" +
+            "5-警情,逗号分隔多个类型的查询", name = "yjLx")
+    private String yjLx;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "预警级别（10红、20橙、30黄、40蓝）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警人员姓名")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "是否发送指令")
+    private String sfFszl;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "范围经度（米）")
+    private BigDecimal radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxQuery.java
new file mode 100644
index 0000000..38a0c86
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxQuery.java
@@ -0,0 +1,83 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 预警信息查询接口--分页
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxQuery对象", description = "预警信息查询接口--分页")
+public class TbYjxxQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警来源类型 01.感知预警  02.派发预警", name = "yjLylx")
+    private String yjLylx;
+
+    @ApiModelProperty(value = "预警类型;1-人员预警，2-车辆预警，3-车上人员预警，4-车和车上人员预警，" +
+            "5-事件预警（拉横幅、打架等）--D_BZ_YJLX（预警类型）", name = "yjLx")
+    private String yjLx;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "预警级别（10红、20橙、30黄、40蓝）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警人员身份证号")
+    private String yjRysfzh;
+
+    @ApiModelProperty(value = "预警人员姓名")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警车辆车牌号")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "是否发送指令")
+    private String sfFszl;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "范围经度（米）")
+    private BigDecimal radius;
+
+    @ApiModelProperty(value = "预警来源ids 01 视觉 02 融合")
+    private String yjlyids;
+
+    @ApiModelProperty(value = "标签分类 01 在逃 02 侵财")
+    private String bqfl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxRyQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxRyQuery.java
new file mode 100644
index 0000000..67294ad
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxRyQuery.java
@@ -0,0 +1,50 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预警信息-人员表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_ry")
+@ApiModel(value="TbYjxxRy对象", description="预警信息-人员表")
+public class TbYjxxRyQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "乘坐车辆ID")
+    private String yjClid;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_SJLYUAN（事件来源）预警数据来源")
+    private String yjSjly;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxSjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxSjQuery.java
new file mode 100644
index 0000000..0131e01
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxSjQuery.java
@@ -0,0 +1,52 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 预警信息-事件表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_sj")
+@ApiModel(value="TbYjxxSj对象", description="预警信息-事件表")
+public class TbYjxxSjQuery extends BasePage implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "--D_BZ_SJBQ（事件标签）事件分类:01-人员聚集，02-打架，03-拉横幅,04-犯罪分析")
+    private String sjFl;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjsksj;
+
+    @ApiModelProperty(value = "预警结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjjssj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxStatisticsQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxStatisticsQuery.java
new file mode 100644
index 0000000..8824930
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxStatisticsQuery.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/10/31
+ * APP端单人、单车预警统计
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxStatisticsQuery 对象", description = "APP端单人、单车预警统计")
+public class TbYjxxStatisticsQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("预警人员身份证号")
+    private String yjRysfzh;
+
+    @ApiModelProperty("预警车辆车牌号")
+    private String yjClcph;
+
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjgjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjgjQuery.java
new file mode 100644
index 0000000..5c9f102
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjgjQuery.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.base.model.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ * 大屏预警轨迹查询接口--分页
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxYjgjQuery对象", description = "大屏预警轨迹查询接口--分页")
+public class TbYjxxYjgjQuery extends BasePage implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警人员身份证号码（人员预警必填）", name = "yjRysfzh")
+    private String yjRysfzh;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌类型）车牌类型", name = "yjHplx")
+    private String yjHplx;
+
+    @ApiModelProperty(value = "预警车辆车牌号;车辆预警必填", name = "yjClcph")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "所属单位")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjjbStatisticsQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjjbStatisticsQuery.java
new file mode 100644
index 0000000..db2dfb9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbYjxxYjjbStatisticsQuery.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.query.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/11/06
+ * app预警级别统计接口DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxYjjbStatisticsQuery 对象", description = "app预警级别统计接口DTO")
+public class TbYjxxYjjbStatisticsQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("预警人员身份证号")
+    private String yjRysfzh;
+
+    @ApiModelProperty("预警人员姓名")
+    private String yjRyxm;
+
+    @ApiModelProperty("预警感知源ID")
+    private String yjGzyid;
+
+    @ApiModelProperty("预警车辆车牌号")
+    private String yjClcph;
+
+    @ApiModelProperty("查询开始时间")
+    private String kssj;
+
+    @ApiModelProperty("查询结束时间")
+    private String jssj;
+
+    @ApiModelProperty("所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlQuery.java
new file mode 100644
index 0000000..67a44ee
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlQuery.java
@@ -0,0 +1,66 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 指令查询接口--分页
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjxxQuery对象", description = "预警信息查询接口--分页")
+public class TbZlQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令标题", name = "zlbt")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容", name = "zlnr")
+    private String zlnr;
+
+    @ApiModelProperty(value = "当前状态（01-待签收，02-已签收，03-到达现场，04-已处置，50-已转发，60-已指定处置人，90-沟通）", name = "zlczzt")
+    private String zlczzt;
+
+    @ApiModelProperty(value = "指令等级（1-红色,2-橙色,3-黄色,4-蓝色）", name = "zldj")
+    private String zldj;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "是否处理（0 未处理 1已处理）", name = "sfcl")
+    private String sfcl;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "范围经度（米）")
+    private BigDecimal radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxQuery.java
new file mode 100644
index 0000000..143289f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxQuery.java
@@ -0,0 +1,80 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 指令查询接口--分页
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxQuery 对象", description = "预警信息查询接口--分页")
+public class TbZlxxQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令、08-事务指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控，08-事务）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令标题", name = "zlbt")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容", name = "zlnr")
+    private String zlnr;
+
+    @ApiModelProperty(value = "当前状态（01-待签收，02-已签收，03-到达现场，04-已处置，50-已转发，60-已指定处置人，90-沟通）", name = "zlczzt")
+    private String zlczzt;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB", name = "zldj")
+    private String zldj;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "是否处理（0 未处理 1已处理）", name = "sfcl")
+    private String sfcl;
+
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "范围经度（米）")
+    private BigDecimal radius;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String sfzh;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "指令下发类型(1、指令下发 2 短信下发 3 警情指令下发)")
+    private String zlxflx;
+
+    @ApiModelProperty(value = "指令完结状态--D_BZ_ZXZTAI（91-未完成，92-已完成，93-超时完成，" +
+            "94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxZxjlQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxZxjlQuery.java
new file mode 100644
index 0000000..e93be81
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZlxxZxjlQuery.java
@@ -0,0 +1,40 @@
+package com.mosty.base.model.query.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbZlxxZxjlQuery 对象", description="指令-执行记录表")
+public class TbZlxxZxjlQuery implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "指令执行动作（00-接收指令，01-签收，02-到达现场，03-已处置，04-反馈，" +
+            "05-下发，06-转发，07-转发确认，08-转发退回，99-完结）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZxzbQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZxzbQuery.java
new file mode 100644
index 0000000..0e25f85
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZxzbQuery.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.query.yjzl;
+
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 中心坐标
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZxzb对象", description = "中心坐标查询")
+public class TbZxzbQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "坐标类型", name = "zblx")
+    private String zblx;
+
+    @ApiModelProperty(value = "坐标日期", name = "zbrq")
+    private String zbrq;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjNoPageQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjNoPageQuery.java
new file mode 100644
index 0000000..c4e423f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjNoPageQuery.java
@@ -0,0 +1,52 @@
+package com.mosty.base.model.query.yszx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素案件-不分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsAjNoPageQuery对象", description = "要素案件-不分页查询对象")
+public class TbYsAjNoPageQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件分类：0-所有案件，1-刑事案件，2-行政案件",required = true)
+    private String ajfl;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "查询开始时间,yyyy-MM-dd")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间,yyyy-MM-dd")
+    private String endTime;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjQuery.java
new file mode 100644
index 0000000..5f50c8d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsAjQuery.java
@@ -0,0 +1,58 @@
+package com.mosty.base.model.query.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素案件-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsAjQuery对象", description = "要素案件-分页查询对象")
+public class TbYsAjQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件分类：0-所有案件，1-刑事案件，2-行政案件", required = true)
+    private String ajfl;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "查询开始时间,yyyy-MM-dd")
+    private String startTime;
+
+    @ApiModelProperty(value = "查询结束时间,yyyy-MM-dd")
+    private String endTime;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsDlQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsDlQuery.java
new file mode 100644
index 0000000..5f99cc4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsDlQuery.java
@@ -0,0 +1,52 @@
+package com.mosty.base.model.query.yszx;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 地理要素-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsDlQuery对象", description = "地理要素-分页查询对象")
+public class TbYsDlQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "要素大类", name = "ysdl")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类", name = "yszl")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类", name = "ysxl")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称", name = "ysmc")
+    private String ysmc;
+
+    @ApiModelProperty(value = "地球经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtNoPageQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtNoPageQuery.java
new file mode 100644
index 0000000..3ad68b6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtNoPageQuery.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.query.yszx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 摄像头要素-不分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsSxtNoPageQuery对象", description = "摄像头要素-不分页查询对象")
+public class TbYsSxtNoPageQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "--D_BZ_GZSBLX（感知设备类型）感知设备类型代码（1 枪机 2 球机）")
+    private String sblxdm;
+
+    @ApiModelProperty(value = "--D_BZ_SBZT(设备状态)设备状态 （0:离线、 1:在线）")
+    private String sbzt;
+
+    @ApiModelProperty(value = "--D_BZ_SBLX（设备类型）设备类型（01-视频监控  02-交通卡 03-人卡 04-车卡 05-电子围栏 06-WIFI探针 07-IMSI、IMEI）")
+    private String sblx;
+
+    @ApiModelProperty(value = "检索内容")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+
+    @ApiModelProperty(value = "--D_BZ_GZSBLX（感知设备类型）感知设备类型代码（1 枪机 2 球机）")
+    private String sblxdms;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtPageOneQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtPageOneQuery.java
new file mode 100644
index 0000000..988b840
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtPageOneQuery.java
@@ -0,0 +1,33 @@
+package com.mosty.base.model.query.yszx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 感知源查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsSxtPageOneQuery 对象", description = "感知源查询对象")
+public class TbYsSxtPageOneQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtQuery.java
new file mode 100644
index 0000000..cd39726
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yszx/TbYsSxtQuery.java
@@ -0,0 +1,61 @@
+package com.mosty.base.model.query.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 摄像头要素-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsSxtQuery对象", description = "摄像头要素-分页查询对象")
+public class TbYsSxtQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备编号")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "--D_BZ_GZSBLX（感知设备类型）感知设备类型代码（1 枪机 2 球机）")
+    private String sblxdm;
+
+    @ApiModelProperty(value = "--D_BZ_SBZT(设备状态)设备状态 （0:离线、 1:在线）")
+    private String sbzt;
+
+    @ApiModelProperty(value = "--D_BZ_SBLX（设备类型）设备类型（01-视频监控  02-交通卡 03-人卡 04-车卡 05-电子围栏 06-WIFI探针 07-IMSI、IMEI）")
+    private String sblx;
+
+    @ApiModelProperty(value = "检索内容")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/base/DeptInfoVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/base/DeptInfoVo.java
new file mode 100644
index 0000000..a266946
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/base/DeptInfoVo.java
@@ -0,0 +1,56 @@
+package com.mosty.base.model.vo.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 返回的组织机构对象，包含所属部门 所属分县局 所属地市州
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "DeptInfoVo对象", description = "返回的组织机构对象，包含所属部门 所属分县局 所属地市州")
+public class DeptInfoVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("所属部门ID")
+    private String deptid;
+
+    @ApiModelProperty("所属部门代码")
+    private String deptcode;
+
+    @ApiModelProperty("所属部门名称")
+    private String deptname;
+
+    @ApiModelProperty("部门类型")
+    private String orgType;
+
+    @ApiModelProperty("部门等级")
+    private String orgLevel;
+
+    @ApiModelProperty("所属分县局id")
+    private String fxjid;
+
+    @ApiModelProperty("所属分县局代码")
+    private String fxjcode;
+
+    @ApiModelProperty("所属分现局名称")
+    private String fxjname;
+
+    @ApiModelProperty("所属地市州id")
+    private String dszid;
+
+    @ApiModelProperty("所属地市州代码")
+    private String dszcode;
+
+    @ApiModelProperty("所属地市州名称")
+    private String dszname;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkclVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkclVo.java
new file mode 100644
index 0000000..e04ede3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkclVo.java
@@ -0,0 +1,117 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "BkclVo 对象", description = "临控车辆返回的数据信息")
+public class BkclVo implements Serializable, Cloneable {
+
+
+    @ApiModelProperty("主键")
+    private String id;
+
+    @ApiModelProperty("号牌种类")
+    private String hpzl;
+
+    @ApiModelProperty("号牌号码")
+    private String hphm;
+
+    @ApiModelProperty("车辆品牌")
+    private String clpp;
+
+    @ApiModelProperty("车身颜色")
+    private String csys;
+
+    @ApiModelProperty("发动机型号")
+    private String fdjxh;
+
+    @ApiModelProperty("发动机号")
+    private String fdjh;
+
+    @ApiModelProperty("机动车所有人")
+    private String jdcsyr;
+
+    @ApiModelProperty("机动车所有人身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("车辆识别代号（车架号）")
+    private String clsbdh;
+
+    @ApiModelProperty("布控原因")
+    private String bkyy;
+
+    @ApiModelProperty("布控时间")
+    private String bksj;
+
+    @ApiModelProperty("布控标志（0=撤控;1=在控）")
+    private String bkbz;
+
+    @ApiModelProperty("撤控时间")
+    private String cksj;
+
+    @ApiModelProperty("布控单位代码")
+    private String bkdwdm;
+
+    @ApiModelProperty("布控单位名称")
+    private String bkdwmc;
+
+    @ApiModelProperty("处置方式")
+    private String czfs;
+
+    @ApiModelProperty("审批人")
+    private String processspr;
+
+    @ApiModelProperty("审批人代码")
+    private String processsprdm;
+
+    @ApiModelProperty("审批时间")
+    private String processspsj;
+
+    @ApiModelProperty("审批意见")
+    private String processspyj;
+
+    @ApiModelProperty("审批状态")
+    private String processstatus;
+
+    @ApiModelProperty("流程实例ID")
+    private Long processid;
+
+    @ApiModelProperty("布控人姓名")
+    private String bkrxm;
+
+    @ApiModelProperty("布控人手机")
+    private String bkrsj;
+
+    @ApiModelProperty("布控人短信推送")
+    private String bkrdxts;
+
+    @ApiModelProperty("联系人姓名")
+    private String lxrxm;
+
+    @ApiModelProperty("联系人手机")
+    private String lxrsj;
+
+    @ApiModelProperty("联系人短信推送")
+    private String lxrdxts;
+
+    // 号牌种类字典名称
+    private String hpzl_ct;
+
+    private String bksj1;
+
+    private String bksj2;
+
+    @ApiModelProperty("标签名称")
+    private String bqmc;
+
+    @ApiModelProperty("综合信息")
+    private String result_zhxx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkryVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkryVo.java
new file mode 100644
index 0000000..34e9f10
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/BkryVo.java
@@ -0,0 +1,88 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RypcVo 对象", description = "临控人员返回的数据信息")
+public class BkryVo  implements Serializable, Cloneable {
+    
+    @ApiModelProperty("主键")
+    private String id;
+    
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+    
+    @ApiModelProperty("姓名")
+    private String xm;
+    
+    @ApiModelProperty("性别")
+    private String xb;
+    
+    @ApiModelProperty("出生日期")
+    private String csrq;
+    
+    @ApiModelProperty("布控原因")
+    private String bkyy;
+    
+    @ApiModelProperty("布控时间")
+    private String bksj;
+    
+    @ApiModelProperty("布控标志（0=撤控;1=在控）")
+    private String bkbz;
+    
+    @ApiModelProperty("撤控时间")
+    private String cksj;
+    
+    @ApiModelProperty("布控单位代码")
+    private String bkdwdm;
+    
+    @ApiModelProperty("布控单位名称")
+    private String bkdwmc;
+    
+    @ApiModelProperty("处置方式")
+    private String czfs;
+    
+    @ApiModelProperty("审批人")
+    private String processspr;
+    
+    @ApiModelProperty("审批人代码")
+    private String processsprdm;
+    
+    @ApiModelProperty("审批时间")
+    private String processspsj;
+    
+    @ApiModelProperty("审批意见")
+    private String processspyj;
+    
+    @ApiModelProperty("审批状态")
+    private String processstatus;
+    
+    @ApiModelProperty("流程实例ID")
+    private Long processid;
+    
+    @ApiModelProperty("布控人姓名")
+    private String bkrxm;
+    
+    @ApiModelProperty("布控人手机")
+    private String bkrsj;
+    
+    @ApiModelProperty("布控人短信推送")
+    private String bkrdxts;
+    
+    @ApiModelProperty("联系人姓名")
+    private String lxrxm;
+    
+    @ApiModelProperty("联系人手机")
+    private String lxrsj;
+    
+    @ApiModelProperty("联系人短信推送")
+    private String lxrdxts;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/ClpcVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/ClpcVo.java
new file mode 100644
index 0000000..26d6a40
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/ClpcVo.java
@@ -0,0 +1,69 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ClpcVo 对象", description = "盘查车辆返回的数据信息")
+public class ClpcVo implements Serializable, Cloneable {
+
+
+    @ApiModelProperty("机动车状态")
+    private String jdczt;
+
+    @ApiModelProperty("号牌种类")
+    private String hpzl;
+
+    @ApiModelProperty("号牌号码")
+    private String hphm;
+
+    @ApiModelProperty("车辆识别代号（车架号）")
+    private String clsbdh;
+
+    @ApiModelProperty("发动机型号")
+    private String fdjxh;
+
+    @ApiModelProperty("发动机号")
+    private String fdjh;
+
+    @ApiModelProperty("车身颜色")
+    private String csys;
+
+    @ApiModelProperty("车辆品牌1")
+    private String clpp1;
+
+    @ApiModelProperty("核定载重量")
+    private String hdzzl;
+
+    @ApiModelProperty("排量")
+    private String pl;
+
+    @ApiModelProperty("功率")
+    private String gl;
+
+    @ApiModelProperty("载重量")
+    private String zzl;
+
+    @ApiModelProperty("机动车所有人")
+    private String jdcsyr;
+
+    @ApiModelProperty("机动车所有人身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("登记住址详址")
+    private String djzzxz;
+
+    @ApiModelProperty("暂住地址详址")
+    private String zzdzxz;
+
+    @ApiModelProperty("号牌种类字典名称")
+    private String hpzl_ct;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/DqclVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/DqclVo.java
new file mode 100644
index 0000000..50e784c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/DqclVo.java
@@ -0,0 +1,115 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "DqclVo 对象", description = "盗抢车辆返回的数据信息")
+public class DqclVo implements Serializable, Cloneable {
+
+    @ApiModelProperty("案件编号")
+    private String ajbh;
+
+    @ApiModelProperty("案件性质")
+    private String ajxz;
+
+    @ApiModelProperty("车辆类型")
+    private String cllxdm;
+
+    @ApiModelProperty("车辆品牌")
+    private String clpp;
+
+    @ApiModelProperty("车辆型号")
+    private String clxh;
+
+    @ApiModelProperty("号牌种类")
+    private String hpzl;
+
+    @ApiModelProperty("号牌号码")
+    private String hphm;
+
+    @ApiModelProperty("车身颜色")
+    private String csys;
+
+    @ApiModelProperty("机动车所有人")
+    private String jdcsyr;
+
+    @ApiModelProperty("初次登记日期")
+    private String ccdjrq;
+
+    @ApiModelProperty("发动机号")
+    private String fdjh;
+
+    @ApiModelProperty("车辆识别代号")
+    private String clsbdh;
+
+    @ApiModelProperty("车架号")
+    private String cjh;
+
+    @ApiModelProperty("报案人")
+    private String bar;
+
+    @ApiModelProperty("立案单位区划")
+    private String ladwqh;
+
+    @ApiModelProperty("立案单位代码")
+    private String ladwdm;
+
+    @ApiModelProperty("立案单位名称")
+    private String ladwmc;
+
+    @ApiModelProperty("立案时间")
+    private String lasj;
+
+    @ApiModelProperty("立案经办人")
+    private String lajbr;
+
+    @ApiModelProperty("立案单位联系电话")
+    private String ladh;
+
+    @ApiModelProperty("受理单位区划")
+    private String sldwqh;
+
+    @ApiModelProperty("受理单位代码")
+    private String sldwdm;
+
+    @ApiModelProperty("受理单位名称")
+    private String sldwmc;
+
+    @ApiModelProperty("受理时间")
+    private String slsj;
+
+    @ApiModelProperty("受理经办人")
+    private String sljbr;
+
+    @ApiModelProperty("受理单位联系电话")
+    private String sldwlxdh;
+
+    @ApiModelProperty("是否参加被盗抢险")
+    private String sfcjbdqx;
+
+    @ApiModelProperty("是否撤销")
+    private String sfcx;
+
+    @ApiModelProperty("撤销时间")
+    private String cxsj;
+
+    @ApiModelProperty("被盗抢机动车ID")
+    private String bdqclcid;
+
+    @ApiModelProperty("号牌种类字典名称")
+    private String hpzl_ct;
+
+    @ApiModelProperty("立案单位区划")
+    private String ladwqh_ct;
+
+    @ApiModelProperty("受理单位区划")
+    private String sldwqh_ct;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RepositoryVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RepositoryVo.java
new file mode 100644
index 0000000..fcadc3e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RepositoryVo.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "依图人脸返回值")
+@Accessors(chain = true)
+public class RepositoryVo {
+
+    public Integer rtn;
+    public String message;
+    public String retrieval_query_id;
+    public List<results> results;
+    public Integer total;
+
+    @Data
+   public static class results {
+        private String picture_uri;
+        private Integer gender;
+        private Integer offset;
+        private Integer nation;
+        private boolean is_writable;
+        private face_rect face_rect;
+        private Integer born_year;
+        private String face_image_id;
+        private Integer similarity;
+        private String name;
+        private String face_image_uri;
+        private String repository_id;
+        private String person_id;
+        private String timestamp;
+
+        @Data
+        private static class face_rect {
+            private String h;
+            private String w;
+            private String x;
+            private String y;
+        }
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RxSearchVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RxSearchVo.java
new file mode 100644
index 0000000..da8e46e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RxSearchVo.java
@@ -0,0 +1,74 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RxSearchVo 对象", description = "人像查询返回VO")
+public class RxSearchVo implements Serializable, Cloneable {
+
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("")
+    private String bdmbkbh;
+
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    @ApiModelProperty("轨迹")
+    private String gj;
+
+    @ApiModelProperty("公民身份号码")
+    private String gmsfhm;
+
+    @ApiModelProperty("户籍地")
+    private String hjd;
+
+    @ApiModelProperty("来源标识")
+    private String lybs;
+
+    @ApiModelProperty("民族代码")
+    private String mz;
+
+    @ApiModelProperty("派出所代码")
+    private String pcsdm;
+
+    @ApiModelProperty("派出所名称")
+    private String pcsmc;
+
+    @ApiModelProperty("")
+    private String qy;
+
+    @ApiModelProperty("")
+    private String rxid;
+
+    @ApiModelProperty("相似度")
+    private String rxxsd;
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("布控单位代码")
+    private String sjgsdw;
+
+    @ApiModelProperty("性别")
+    private String xbdm;
+
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    @ApiModelProperty("")
+    private String xp;
+
+    @ApiModelProperty("相似度")
+    private String xsd;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RyZpSearchVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RyZpSearchVo.java
new file mode 100644
index 0000000..9ac02a9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RyZpSearchVo.java
@@ -0,0 +1,38 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RyZpSearchVo 对象", description = "通过人像照片查询的结果返回类VO")
+public class RyZpSearchVo implements Serializable, Cloneable{
+
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    @ApiModelProperty("身份证")
+    private String sfzh;
+
+    @ApiModelProperty("性别代码")
+    private String xbdm;
+
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    @ApiModelProperty("相片ID")
+    private String xp;
+
+    @ApiModelProperty("相似度")
+    private String xsd;
+
+    @ApiModelProperty("图片路径")
+    private String url;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RypcVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RypcVo.java
new file mode 100644
index 0000000..522d617
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/RypcVo.java
@@ -0,0 +1,101 @@
+package com.mosty.base.model.vo.hczx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "RypcVo 对象", description = "盘查人员返回的数据信息")
+public class RypcVo implements Serializable, Cloneable{
+
+    @ApiModelProperty("出生日期")
+    private String csrq;
+
+    @ApiModelProperty("文化程度-词条")
+    private String whcd_ct;
+
+    @ApiModelProperty("文化程度")
+    private String whcd;
+
+    @ApiModelProperty("住址省市县(区)")
+    private String zzssxq;
+
+    @ApiModelProperty("")
+    private List<String> xPByte;
+
+    @ApiModelProperty("")
+    private String hkszd;
+
+    @ApiModelProperty("籍贯国家（地区）")
+    private String jggj;
+
+    @ApiModelProperty("身高")
+    private String sg;
+
+    @ApiModelProperty("出生地籍贯")
+    private String csdjg;
+
+    @ApiModelProperty("籍贯省市县词条")
+    private String jgssx_ct;
+
+    @ApiModelProperty("出生地详址")
+    private String csdxz;
+
+    @ApiModelProperty("兵役情况")
+    private String byqk;
+
+    @ApiModelProperty("婚姻状况字典名称")
+    private String hyzk_ct;
+
+    @ApiModelProperty("性别代码")
+    private String xb;
+
+    @ApiModelProperty("民族代码")
+    private String mz;
+
+    @ApiModelProperty("性别")
+    private String xb_ct;
+
+    @ApiModelProperty("服务场所")
+    private String fwcs;
+
+    @ApiModelProperty("")
+    private String zzssxq_ct;
+
+    @ApiModelProperty("婚姻状况")
+    private String hyzk;
+
+    @ApiModelProperty("身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("出生地")
+    private String csd;
+
+    @ApiModelProperty("姓名")
+    private String xm;
+
+    @ApiModelProperty("曾用名")
+    private String cym;
+
+    @ApiModelProperty("")
+    private String xp;
+
+    @ApiModelProperty("民族")
+    private String mz_ct;
+
+    @ApiModelProperty("住址详址")
+    private String zzxz;
+
+    @ApiModelProperty("籍贯省市县")
+    private String jgssx;
+
+    @ApiModelProperty("职业")
+    private String zy;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclVo.java
new file mode 100644
index 0000000..283b9e8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclVo.java
@@ -0,0 +1,221 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.hczx.TbHcTp;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查车辆返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcclVo 对象", description = "被盘查车辆返回对象")
+public class TbHcBpcclVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "号牌种类代码", name = "hpzl")
+    private String hpzl;
+
+    @ApiModelProperty(value = "号牌号码", name = "hphm")
+    private String hphm;
+
+    @ApiModelProperty(value = "车辆识别代号（车架号）", name = "clsbdh")
+    private String clsbdh;
+
+    @ApiModelProperty(value = "机动车所有人身份证号", name = "jdcsyrsfzh")
+    private String jdcsyrsfzh;
+
+    @ApiModelProperty(value = "机动车所有人", name = "jdcsyr")
+    private String jdcsyr;
+
+    @ApiModelProperty(value = "盘查日期", name = "pcrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date pcrq;
+
+    @ApiModelProperty(value = "盘查时间", name = "pcsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date pcsj;
+
+    @ApiModelProperty(value = "盘查输入类型（1=自动识别;2=手工输入号牌;3=手工输入车辆识别号）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "车辆标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签详细数据", name = "bqxxsj")
+    private String bqxxsj;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "盘查民警id", name = "pcmjId")
+    private String pcmjId;
+
+    @ApiModelProperty(value = "盘查民警帐号", name = "pcmjSfzh")
+    private String pcmjSfzh;
+
+    @ApiModelProperty(value = "盘查民警姓名", name = "pcmjXm")
+    private String pcmjXm;
+
+    @ApiModelProperty(value = "盘查民警警号", name = "pcmjJh")
+    private String pcmjJh;
+
+    @ApiModelProperty(value = "卡口id", name = "kkId")
+    private String kkId;
+
+    @ApiModelProperty(value = "卡口所属单位代码", name = "kkSsdwdm")
+    private String kkSsdwdm;
+
+    @ApiModelProperty(value = "卡口所属单位名称", name = "kkSsdwmc")
+    private String kkSsdwmc;
+
+    @ApiModelProperty(value = "卡口所属分市县代码", name = "kkSsfsxdm")
+    private String kkSsfsxdm;
+
+    @ApiModelProperty(value = "卡口所属分市县名称", name = "kkSsfsxmc")
+    private String kkSsfsxmc;
+
+    @ApiModelProperty(value = "卡口所属地市州代码", name = "kkSsdszdm")
+    private String kkSsdszdm;
+
+    @ApiModelProperty(value = "卡口所属地市州名称", name = "kkSsdszmc")
+    private String kkSsdszmc;
+
+    @ApiModelProperty(value = "卡口类型（1=公安检查站;2=自设卡点）", name = "kkLx")
+    private String kkLx;
+
+    @ApiModelProperty(value = "卡口名称", name = "kkMc")
+    private String kkMc;
+
+    @ApiModelProperty(value = "卡口行政区划", name = "kkXzqh")
+    private String kkXzqh;
+
+    @ApiModelProperty(value = "卡口市州名称", name = "kkSzmc")
+    private String kkSzmc;
+
+    @ApiModelProperty(value = "卡口环川，环蓉", name = "kkHchrlx")
+    private String kkHchrlx;
+
+    @ApiModelProperty(value = "卡口是否涉藏", name = "kkSfsz")
+    private String kkSfsz;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "所属单位当月盘查次数", name = "ssdwdycs")
+    private Integer ssdwdycs;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "相似度感知源，眼镜扫描，输入类型为7,8照片", name = "xsd")
+    private String xsd;
+
+    @ApiModelProperty(value = "是否相符（0-否，1-是）", name = "sfxf")
+    private String sfxf;
+
+    @ApiModelProperty(value = "预警指令ID", name = "yjzlid")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-车牌设备自动盘查，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "图片List", name = "tpList")
+    private List<TbHcTpVo> tpList;
+
+    @ApiModelProperty(value = "物品List", name = "wpVoList")
+    private List<TbHcBpcclWpVo> wpVoList;
+
+    @ApiModelProperty(value = "同乘人员List", name = "ryList")
+    private List<TbHcBpcryVo> ryList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclWpVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclWpVo.java
new file mode 100644
index 0000000..f1cd154
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcclWpVo.java
@@ -0,0 +1,44 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ * 被盘查车辆物品返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcclWpVo 对象", description = "被盘查车辆物品返回对象")
+public class TbHcBpcclWpVo  implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "--D_BZ_WPLX（物品类型）物品类型", name = "wplx")
+    private String wplx;
+
+    @ApiModelProperty(value = "物品数量", name = "wpsl")
+    private String wpsl;
+
+    @ApiModelProperty(value = "物品描述", name = "wpms")
+    private String wpms;
+
+    @ApiModelProperty(value = "物品图片ID集合", name = "wpTpIdList")
+    private List<String> wpTpIdList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryVo.java
new file mode 100644
index 0000000..8775476
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryVo.java
@@ -0,0 +1,229 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.entity.hczx.TbHcBpcryTzbq;
+import com.mosty.base.model.entity.hczx.TbHcTp;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查人员返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcryVo 对象", description = "被盘查人员返回对象")
+public class TbHcBpcryVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "姓名", name = "xm")
+    private String xm;
+
+    @ApiModelProperty(value = "性别", name = "xbdm")
+    private String xbdm;
+
+    @ApiModelProperty(value = "出生日期", name = "csrq")
+    private String csrq;
+
+    @ApiModelProperty(value = "民族", name = "mzdm")
+    private String mzdm;
+
+    @ApiModelProperty(value = "文化程度", name = "whcddm")
+    private String whcddm;
+
+    @ApiModelProperty(value = "籍贯", name = "jgdm")
+    private String jgdm;
+
+    @ApiModelProperty(value = "住址详址", name = "zzxz")
+    private String zzxz;
+
+    @ApiModelProperty(value = "现居住地址", name = "xjzdz")
+    private String xjzdz;
+
+    @ApiModelProperty(value = "联系电话", name = "lxdh")
+    private String lxdh;
+
+    @ApiModelProperty(value = "盘查日期", name = "pcrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date pcrq;
+
+    @ApiModelProperty(value = "盘查时间", name = "pcsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date pcsj;
+
+    @ApiModelProperty(value = "盘查输入类型（1=刷身份证;2=手工输入身份证;3=电话号码查询;4=综合查询）", name = "pcsrlx")
+    private String pcsrlx;
+
+    @ApiModelProperty(value = "盘查地经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "盘查地纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "盘查车辆ID", name = "pcclId")
+    private String pcclId;
+
+    @ApiModelProperty(value = "人员标签名称", name = "bqmc")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签详细数据", name = "bqxxsj")
+    private String bqxxsj;
+
+    @ApiModelProperty(value = "盘查处理结果（1 放行 2 移交 9盘查）", name = "pcclJg")
+    private String pcclJg;
+
+    @ApiModelProperty(value = "盘查处理结果名称", name = "pcclJgmc")
+    private String pcclJgmc;
+
+    @ApiModelProperty(value = "盘查处理移交单位代码", name = "pcclYjdwdm")
+    private String pcclYjdwdm;
+
+    @ApiModelProperty(value = "盘查处理移交单位", name = "pcclYjdw")
+    private String pcclYjdw;
+
+    @ApiModelProperty(value = "盘查处理移交原因", name = "pcclYjyy")
+    private String pcclYjyy;
+
+    @ApiModelProperty(value = "盘查民警ID", name = "pcmjId")
+    private String pcmjId;
+
+    @ApiModelProperty(value = "盘查民警帐号", name = "pcmjSfzh")
+    private String pcmjSfzh;
+
+    @ApiModelProperty(value = "盘查民警姓名", name = "pcmjXm")
+    private String pcmjXm;
+
+    @ApiModelProperty(value = "盘查民警警号", name = "pcmjJh")
+    private String pcmjJh;
+
+    @ApiModelProperty(value = "卡口id", name = "kkId")
+    private String kkId;
+
+    @ApiModelProperty(value = "卡口所属单位代码", name = "kkSsdwdm")
+    private String kkSsdwdm;
+
+    @ApiModelProperty(value = "卡口所属单位名称", name = "kkSsdwmc")
+    private String kkSsdwmc;
+
+    @ApiModelProperty(value = "卡口所属分市县代码", name = "kkSsfsxdm")
+    private String kkSsfsxdm;
+
+    @ApiModelProperty(value = "卡口所属分市县名称", name = "kkSsfsxmc")
+    private String kkSsfsxmc;
+
+    @ApiModelProperty(value = "卡口所属地市州代码", name = "kkSsdszdm")
+    private String kkSsdszdm;
+
+    @ApiModelProperty(value = "卡口所属地市州名称", name = "kkSsdszmc")
+    private String kkSsdszmc;
+
+    @ApiModelProperty(value = "卡口类型（1=公安检查站;2=自设卡点）", name = "kkLx")
+    private String kkLx;
+
+    @ApiModelProperty(value = "卡口名称", name = "kkMc")
+    private String kkMc;
+
+    @ApiModelProperty(value = "卡口行政区划", name = "kkXzqh")
+    private String kkXzqh;
+
+    @ApiModelProperty(value = "卡口市州名称", name = "kkSzmc")
+    private String kkSzmc;
+
+    @ApiModelProperty(value = "卡口环川，环蓉", name = "kkHchrlx")
+    private String kkHchrlx;
+
+    @ApiModelProperty(value = "卡口是否涉藏", name = "kkSfsz")
+    private String kkSfsz;
+
+    @ApiModelProperty(value = "数据来源（对应字典D_YDJW_SJLY）", name = "sjly")
+    private String sjly;
+
+    @ApiModelProperty(value = "终端型号", name = "zdxh")
+    private String zdxh;
+
+    @ApiModelProperty(value = "终端串号", name = "zdch")
+    private String zdch;
+
+    @ApiModelProperty(value = "终端SIM号", name = "zdsim")
+    private String zdsim;
+
+    @ApiModelProperty(value = "所属单位当月盘查次数", name = "ssdwdycs")
+    private Integer ssdwdycs;
+
+    @ApiModelProperty(value = "关联系统代码", name = "glxtdm")
+    private String glxtdm;
+
+    @ApiModelProperty(value = "关联系统ID", name = "glxtid")
+    private String glxtid;
+
+    @ApiModelProperty(value = "相似度感知源，眼镜扫描，输入类型为7,8照片", name = "xsd")
+    private String xsd;
+
+    @ApiModelProperty(value = "是否相符（0-否，1-是）", name = "sfxf")
+    private String sfxf;
+
+    @ApiModelProperty(value = "预警指令ID", name = "yjzlid")
+    private String yjzlid;
+
+    @ApiModelProperty(value = "警组ID", name = "jzid")
+    private String jzid;
+
+    @ApiModelProperty(value = "报备ID", name = "bbid")
+    private String bbid;
+
+    @ApiModelProperty(value = "盘查方式：01-人脸设备自动，02-民警手动", name = "pcfs")
+    private String pcfs;
+
+    @ApiModelProperty(value = "所属部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "人员特征集合")
+    private List<TbHcBpcryTzbq> tzList;
+
+    @ApiModelProperty(value = "人员图片集合")
+    private List<TbHcTpVo> tpList;
+
+    @ApiModelProperty(value = "物品返回类vo集合")
+    private List<TbHcBpcryWpVo> wpVoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryWpVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryWpVo.java
new file mode 100644
index 0000000..f0ad8a3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcBpcryWpVo.java
@@ -0,0 +1,45 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/13
+ * 被盘查人员物品返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcBpcryWpVo 对象", description = "被盘查人员物品返回对象")
+public class TbHcBpcryWpVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查业务ID", name = "pcywid")
+    private String pcywid;
+
+    @ApiModelProperty(value = "--D_BZ_WPLX（物品类型）物品类型", name = "wplx")
+    private String wplx;
+
+    @ApiModelProperty(value = "物品数量", name = "wpsl")
+    private String wpsl;
+
+    @ApiModelProperty(value = "物品描述", name = "wpms")
+    private String wpms;
+
+    @ApiModelProperty(value = "物品图片ID集合", name = "wpTpIdList")
+    private List<String> wpTpIdList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcSydjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcSydjVo.java
new file mode 100644
index 0000000..4658a2e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcSydjVo.java
@@ -0,0 +1,58 @@
+package com.mosty.base.model.vo.hczx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbHcSydjVo 对象", description = "涉疫登记返回的数据信息")
+public class TbHcSydjVo implements Serializable, Cloneable  {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "盘查id", name = "pcid")
+    private String pcid;
+
+    @ApiModelProperty(value = "人员姓名", name = "ryxm")
+    private String ryxm;
+
+    @ApiModelProperty(value = "身份证号", name = "sfzh")
+    private String sfzh;
+
+    @ApiModelProperty(value = "天府健康码状态", name = "jkmzt")
+    private String jkmzt;
+
+    @ApiModelProperty(value = "疫苗接种情况", name = "ymjzqk")
+    private String ymjzqk;
+
+    @ApiModelProperty(value = "通讯行程卡是否带*", name = "txxck")
+    private String txxck;
+
+    @ApiModelProperty(value = "14天内到达或途径城市", name = "ddhtjcs")
+    private String ddhtjcs;
+
+    @ApiModelProperty(value = "来自哪里", name = "lz")
+    private String lz;
+
+    @ApiModelProperty(value = "去往哪里", name = "qw")
+    private String qw;
+
+    @ApiModelProperty(value = "图片Id", name = "tpid")
+    private String tpid;
+
+    @ApiModelProperty(value = "添加时间", name = "tjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcTpVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcTpVo.java
new file mode 100644
index 0000000..6759d0c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/TbHcTpVo.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ * 盘查图片对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_hc_tp")
+@ApiModel(value = "TbHcTpVo 对象", description = "盘查图片对象")
+public class TbHcTpVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "来源表名", name = "lybm")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源ID", name = "lyid")
+    private String lyid;
+
+    @ApiModelProperty(value = "附件ID", name = "fjid")
+    private String fjid;
+
+    @ApiModelProperty(value = "排序", name = "orderno")
+    private Integer orderno;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/XlpcRxbdVO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/XlpcRxbdVO.java
new file mode 100644
index 0000000..eb20a51
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/hczx/XlpcRxbdVO.java
@@ -0,0 +1,49 @@
+package com.mosty.base.model.vo.hczx;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@ApiModel(value = "拓尔思在逃人员信息表")
+@Data
+@Accessors(chain = true)
+public class XlpcRxbdVO {
+
+
+
+    public int code;
+    public String  msg;
+    public List<data> data;
+
+    @Data
+    public static class data{
+        private String sfzh;// 公民身份号码
+        private String bdmbkbh;// 比对目标库编号,可为空，库别ID，传送多值以“，”分隔。
+        private String rxid;// 人像标识号
+        private String xsd;// 相似度 1-100
+        private String rxxsd;// 相似度 1-100
+        private String gmsfhm;// 公民身份号码
+        private String sjgsdw;// 数据归属单位
+        private String xm;// 姓名
+        private String xp;// 相片
+        private String xbdm;// 性别代码
+        private String mz;// 民族
+        private String csrq;// 出生日期
+        private String gj;// 国籍
+        private String pcsdm;// 派出所代码
+        private String pcsmc;// 派出所名称
+        private String hjd;// 户籍地
+        private String qy;//
+        private String address;// 地址
+        private String lybs;// 来源标识 1、绵阳接口 2、川大智胜接口
+    }
+
+
+
+
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglBqVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglBqVo.java
new file mode 100644
index 0000000..16b30f2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglBqVo.java
@@ -0,0 +1,81 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量标签返回实体对象")
+public class TbJcglBqVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -4728653996454701336L;
+
+    /**
+     * 巡防力量标签标识ID
+     */
+    @ApiModelProperty(value = "巡防力量标签标识ID", name = "id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+    /**
+     * 标签类型;EXP：经验标签，SKL：技能标签
+     */
+    @ApiModelProperty(value = "标签类型:EXP：经验标签，SKL：技能标签",name = "bqlx")
+    private String bqlx;
+    /**
+     * 标签中文名称
+     */
+    @ApiModelProperty(value = "标签中文名称",name = "bqmc")
+    private String bqmc;
+
+    /**
+     * 标签编号
+     */
+    @ApiModelProperty(value = "标签中文名称",name = "bqbh")
+    private String bqbh;
+
+
+    /**
+     * 标签拼音码;后端自动生成
+     */
+    @ApiModelProperty(value = "标签拼音码",name = "bqpym")
+    private String bqpym;
+    /**
+     * 标签图标url
+     */
+    @ApiModelProperty(value = "标签图标url",name = "bqtb")
+    private String bqtb;
+    /**
+     * 计算模型ID
+     */
+    @ApiModelProperty(value = "计算模型ID",name = "mxId")
+    private String mxId;
+    /**
+     * 巡防标签人员数量
+     */
+    @ApiModelProperty(value = "巡防标签人员数量",name = "xfllSl")
+    private String xfllSl;
+
+    /**
+     * 系统数据状态
+     */
+    @ApiModelProperty(value = "系统数据状态",name = "xtSjzt")
+    private String xtSjzt;
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "巡防标签人员数量",name = "bz")
+    private String bz;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglDsfVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglDsfVo.java
new file mode 100644
index 0000000..cdfc819
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglDsfVo.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "第三方")
+public class TbJcglDsfVo implements Serializable {
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "系统名称")
+    private String xtmc;
+
+    @ApiModelProperty(value = "服务类型 01.任务服务 02.位置服务 03.")
+    private String fwlx;
+
+    @ApiModelProperty(value = "责任人姓名")
+    private String zrrxm;
+
+    @ApiModelProperty(value = "责任人联系电话")
+    private String zrrlxdh;
+
+    @ApiModelProperty(value = "请求的唯一码")
+    private String code;
+
+    @ApiModelProperty(value = "过期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date gqsj;
+
+    @ApiModelProperty(value = "状态 01.审核中 02.使用中 03.审核不通过 04.已停用 05.已过期")
+    private String zt;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzAllVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzAllVo.java
new file mode 100644
index 0000000..81f1587
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzAllVo.java
@@ -0,0 +1,109 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.entity.jcgl.TbJcglJzCl;
+import com.mosty.base.model.entity.jcgl.TbJcglJzJyqx;
+import com.mosty.base.model.entity.jcgl.TbJcglJzRy;
+import com.mosty.base.model.entity.jcgl.TbJcglJzZnzb;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务警组
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "勤务警组")
+public class TbJcglJzAllVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "勤务警组标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "勤务警组标识编号")
+    private String jzBh;
+
+    @ApiModelProperty(value = "勤务警组分类;1.民警小组，2、辅警小组，3、民警+辅警小组")
+    private String jzFl;
+
+    @ApiModelProperty(value = "勤务警组类型;1、车巡，2、步巡")
+    private String jzLx;
+
+    @ApiModelProperty(value = "带队民警ID")
+    private String ddMjid;
+
+    @ApiModelProperty(value = "带队民警身份证号")
+    private String ddMjsfzh;
+
+    @ApiModelProperty(value = "带队民警姓名")
+    private String ddMjxm;
+
+    @ApiModelProperty(value = "带队民警警号")
+    private String ddMjjh;
+
+    @ApiModelProperty(value = "带队民警电话")
+    private String ddDh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "车辆集合")
+    private List<TbJcglJzCl> clList;
+
+    @ApiModelProperty(value = "警用器械集合")
+    private List<TbJcglJzJyqx> jyqxList;
+
+    @ApiModelProperty(value = "警组人员集合")
+    private List<TbJcglJzRy> jzryList;
+
+    @ApiModelProperty(value = "智能装备集合")
+    private List<TbJcglJzZnzb> txzbList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzVo.java
new file mode 100644
index 0000000..7cc045b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglJzVo.java
@@ -0,0 +1,94 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务警组
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "勤务警组")
+public class TbJcglJzVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "勤务警组标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "勤务警组标识编号")
+    private String jzBh;
+
+    @ApiModelProperty(value = "勤务警组分类;1.民警小组，2、辅警小组，3、民警+辅警小组")
+    private String jzFl;
+
+    @ApiModelProperty(value = "勤务警组类型;1、车巡，2、步巡")
+    private String jzLx;
+
+    @ApiModelProperty(value = "带队民警身份证号")
+    private String ddMjsfzh;
+
+    @ApiModelProperty(value = "带队民警姓名")
+    private String ddMjxm;
+
+    @ApiModelProperty(value = "带队民警警号")
+    private String ddMjjh;
+
+    @ApiModelProperty(value = "带队民警电话")
+    private String ddDh;
+
+    @ApiModelProperty(value = "负责巡防区标识ID")
+    private String xfqId;
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhbmVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhbmVo.java
new file mode 100644
index 0000000..2b719cb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhbmVo.java
@@ -0,0 +1,163 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhbmVo  对象", description = "绩效考核部门返回VO")
+public class TbJcglKhbmVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "添加人ID")
+    private String tjrid;
+
+    @ApiModelProperty(value = "添加人身份证号")
+    private String tjrsfzh;
+
+    @ApiModelProperty(value = "添加人姓名")
+    private String tjrxm;
+
+    @ApiModelProperty(value = "添加时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date tjsj;
+
+    @ApiModelProperty(value = "应报备")
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    private int zsbb;
+
+    @ApiModelProperty(value = "报备得分")
+    private double bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    private double bbkf;
+
+
+    @ApiModelProperty(value = "应查人")
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    private int zscr;
+
+    @ApiModelProperty(value = "查人分")
+    private double crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    private double crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    private int zscc;
+
+    @ApiModelProperty(value = "查车分")
+    private double ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    private double cckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    private int zscw;
+
+    @ApiModelProperty(value = "查物品得分")
+    private double cwf;
+
+    @ApiModelProperty(value = "查物品扣分")
+    private double cwkf;
+
+    @ApiModelProperty(value = "应巡逻")
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    private int zsxl;
+
+    @ApiModelProperty(value = "巡逻分")
+    private double xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    private double xlkf;
+
+    @ApiModelProperty(value = "应签收")
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收")
+    private int zsqs;
+
+    @ApiModelProperty(value = "签收分")
+    private double qsf;
+
+    @ApiModelProperty(value = "签收扣分")
+    private double qskf;
+
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "巡逻时长分")
+    private double xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    private double xlsckf;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int yxllc;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int zsxllc;
+
+    @ApiModelProperty(value = "巡逻里程分")
+    private double xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+    private double xllckf;
+
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhmxVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhmxVo.java
new file mode 100644
index 0000000..2fdf8aa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhmxVo.java
@@ -0,0 +1,144 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhbmVo  对象", description = "绩效考核部门返回VO")
+public class TbJcglKhmxVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+
+    @ApiModelProperty(value = "应报备")
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    private int zsbb;
+
+    @ApiModelProperty(value = "报备得分")
+    private double bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    private double bbkf;
+
+
+    @ApiModelProperty(value = "应查人")
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+    private int zscr;
+
+    @ApiModelProperty(value = "查人分")
+    private double crf;
+
+    @ApiModelProperty(value = "查人扣分")
+    private double crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+    private int ycc;
+
+    @ApiModelProperty(value = "最少查车")
+    private int zscc;
+
+    @ApiModelProperty(value = "查车分")
+    private double ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+    private double cckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+    private int ycw;
+
+    @ApiModelProperty(value = "最少查物品")
+    private int zscw;
+
+    @ApiModelProperty(value = "查物品得分")
+    private double cwf;
+
+    @ApiModelProperty(value = "查物品扣分")
+    private double cwkf;
+
+    @ApiModelProperty(value = "应巡逻")
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    private int zsxl;
+
+    @ApiModelProperty(value = "巡逻分")
+    private double xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+    private double xlkf;
+
+    @ApiModelProperty(value = "应签收")
+    private int yqs;
+
+    @ApiModelProperty(value = "最少签收")
+    private int zsqs;
+
+    @ApiModelProperty(value = "签收分")
+    private double qsf;
+
+    @ApiModelProperty(value = "签收扣分")
+    private double qskf;
+
+    @ApiModelProperty(value = "应巡逻时长")
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "巡逻时长分")
+    private double xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+    private double xlsckf;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int yxllc;
+
+    @ApiModelProperty(value = "应巡逻里程")
+    private int zsxllc;
+
+    @ApiModelProperty(value = "巡逻里程分")
+    private double xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+    private double xllckf;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhtjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhtjVo.java
new file mode 100644
index 0000000..db89fb5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglKhtjVo.java
@@ -0,0 +1,280 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BasePage;
+import com.mosty.common.base.entity.log.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglKhtjQuery  对象", description = "绩效考核部门统计查询DTO")
+public class TbJcglKhtjVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门")
+    @Excel(name = "所属部门", sort = 1)
+    private String ssbm;
+
+    @ApiModelProperty(value = "统计日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "统计日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 2)
+    private Date tjrq;
+
+    @ApiModelProperty(value = "部门等级")
+    private String orglevel;
+
+
+    @ApiModelProperty(value = "应报备数")
+    @Excel(name = "应报备数", sort = 3)
+    private int ybb;
+
+    @ApiModelProperty(value = "最少报备")
+    @Excel(name = "最少报备", sort = 4)
+    private int zsbb;
+
+    @ApiModelProperty(value = "实际报备数")
+    @Excel(name = "实际报备数", sort = 4)
+    private int sjbb;
+
+    @ApiModelProperty(value = "未报备数")
+    @Excel(name = "未报备数", sort = 4)
+    private int wbb;
+
+    @ApiModelProperty(value = "报备比例")
+    @Excel(name = "比例", sort = 4)
+    private String wbbl;
+
+
+    @ApiModelProperty(value = "应巡逻数")
+    @Excel(name = "应巡逻数", sort = 4)
+    private int yxl;
+
+    @ApiModelProperty(value = "最少巡逻")
+    @Excel(name = "最少巡逻", sort = 4)
+    private int zsxl;
+
+    @ApiModelProperty(value = "实际巡逻")
+    @Excel(name = "实际巡逻", sort = 4)
+    private int sjxl;
+
+    @ApiModelProperty(value = "未巡逻")
+    @Excel(name = "未巡逻", sort = 4)
+    private int wxl;
+
+    @ApiModelProperty(value = "巡逻比例")
+    @Excel(name = "巡逻比例", sort = 4)
+    private String xlbl;
+
+    @ApiModelProperty(value = "巡逻得分")
+//    @Excel(name = "巡逻得分", sort = 4)
+    private BigDecimal xlf;
+
+    @ApiModelProperty(value = "巡逻扣分")
+//    @Excel(name = "巡逻扣分", sort = 4)
+    private BigDecimal xlkf;
+
+
+    @ApiModelProperty(value = "应签收数")
+//    @Excel(name = "应签收数", sort = 4)
+    private int yqs;
+
+    @ApiModelProperty(value = "实际签收")
+//    @Excel(name = "实际签收", sort = 4)
+    private int sjqs;
+
+    @ApiModelProperty(value = "未签收")
+//    @Excel(name = "未签收", sort = 4)
+    private int wqs;
+
+    @ApiModelProperty(value = "签收比例")
+//    @Excel(name = "签收比例", sort = 4)
+    private String qsbl;
+
+    @ApiModelProperty(value = "签收得分")
+//    @Excel(name = "签收得分", sort = 4)
+    private BigDecimal qsf;
+
+    @ApiModelProperty(value = "签收扣分")
+//    @Excel(name = "签收扣分", sort = 4)
+    private BigDecimal qskf;
+
+
+    @ApiModelProperty(value = "应查人")
+//    @Excel(name = "应查人", sort = 4)
+    private int ycr;
+
+    @ApiModelProperty(value = "最少查人")
+//    @Excel(name = "最少查人", sort = 4)
+    private int zscr;
+
+    @ApiModelProperty(value = "实际查人")
+//    @Excel(name = "实际查人", sort = 4)
+    private int sjcr;
+
+    @ApiModelProperty(value = "未查人")
+//    @Excel(name = "未查人", sort = 4)
+    private int wcr;
+
+    @ApiModelProperty(value = "查人比例")
+//    @Excel(name = "查人比例", sort = 4)
+    private String crbl;
+
+    @ApiModelProperty(value = "查人得分")
+//    @Excel(name = "查人得分", sort = 4)
+    private BigDecimal crf;
+
+    @ApiModelProperty(value = "查人扣分")
+//    @Excel(name = "查人扣分", sort = 4)
+    private BigDecimal crkf;
+
+
+    @ApiModelProperty(value = "应查车")
+//    @Excel(name = "应查车", sort = 4)
+    private int ycc;
+
+    @ApiModelProperty(value = "应查车")
+//    @Excel(name = "最少查车", sort = 4)
+    private int zscc;
+
+    @ApiModelProperty(value = "实际查车")
+//    @Excel(name = "实际查车", sort = 4)
+    private int sjcc;
+
+    @ApiModelProperty(value = "未查车")
+//    @Excel(name = "未查车", sort = 4)
+    private int wcc;
+
+    @ApiModelProperty(value = "查车比例")
+//    @Excel(name = "查车比例", sort = 4)
+    private String ccbl;
+
+    @ApiModelProperty(value = "查车得分")
+//    @Excel(name = "查车得分", sort = 4)
+    private BigDecimal ccf;
+
+    @ApiModelProperty(value = "查车扣分")
+//    @Excel(name = "查车扣分", sort = 4)
+    private BigDecimal cckf;
+
+
+    @ApiModelProperty(value = "应巡逻时长")
+    @Excel(name = "应巡逻时长", sort = 4)
+    private int yxlsc;
+
+    @ApiModelProperty(value = "最少巡逻时长")
+    @Excel(name = "最少巡逻时长", sort = 4)
+    private int zsxlsc;
+
+    @ApiModelProperty(value = "实际巡逻时长")
+    @Excel(name = "实际巡逻时长", sort = 4)
+    private int sjxlsc;
+
+    @ApiModelProperty(value = "未巡逻时长")
+    @Excel(name = "未巡逻时长", sort = 4)
+    private int wxlsc;
+
+    @ApiModelProperty(value = "巡逻时长比例")
+    @Excel(name = "巡逻时长比例", sort = 4)
+    private String xlscbl;
+
+    @ApiModelProperty(value = "巡逻时长得分")
+//    @Excel(name = "巡逻时长得分", sort = 4)
+    private BigDecimal xlscf;
+
+    @ApiModelProperty(value = "巡逻时长扣分")
+//    @Excel(name = "巡逻时长扣分", sort = 4)
+    private BigDecimal xlsckf;
+
+
+    @ApiModelProperty(value = "应巡逻里程")
+    @Excel(name = "应巡逻里程", sort = 4)
+    private int yxllc;
+
+    @ApiModelProperty(value = "最少巡逻里程")
+    @Excel(name = "最少巡逻里程", sort = 4)
+    private int zsxllc;
+
+    @ApiModelProperty(value = "实际巡逻里程")
+    @Excel(name = "实际巡逻里程", sort = 4)
+    private int sjxllc;
+
+    @ApiModelProperty(value = "未巡逻里程")
+    @Excel(name = "未巡逻里程", sort = 4)
+    private int wxllc;
+
+    @ApiModelProperty(value = "巡逻里程比例")
+    @Excel(name = "巡逻里程比例", sort = 4)
+    private String xllcbl;
+
+    @ApiModelProperty(value = "巡逻里程得分")
+//    @Excel(name = "巡逻里程得分", sort = 4)
+    private BigDecimal xllcf;
+
+    @ApiModelProperty(value = "巡逻里程扣分")
+//    @Excel(name = "巡逻里程扣分", sort = 4)
+    private BigDecimal xllckf;
+
+
+    @ApiModelProperty(value = "应查物品")
+//    @Excel(name = "应查物品", sort = 4)
+    private int ycw;
+
+    @ApiModelProperty(value = "实际查物品")
+//    @Excel(name = "实际查物品", sort = 4)
+    private int sjcw;
+
+    @ApiModelProperty(value = "未查物")
+//    @Excel(name = "未查物", sort = 4)
+    private int wcw;
+
+    @ApiModelProperty(value = "查物比例")
+//    @Excel(name = "查物比例", sort = 4)
+    private String cwbl;
+
+    @ApiModelProperty(value = "查物得分")
+//    @Excel(name = "查物得分", sort = 4)
+    private BigDecimal cwf;
+
+    @ApiModelProperty(value = "查物扣分")
+//    @Excel(name = "查物扣分", sort = 4)
+    private BigDecimal cwkf;
+
+
+    @ApiModelProperty(value = "报备得分")
+    @Excel(name = "报备得分")
+    private BigDecimal bbf;
+
+    @ApiModelProperty(value = "报备扣分")
+    @Excel(name = "报备扣分")
+    private BigDecimal bbkf;
+
+    @ApiModelProperty(value = "三项得分")
+    @Excel(name = "三项得分")
+    private double sxdf;
+
+    @ApiModelProperty(value = "三项扣分")
+    @Excel(name = "三项扣分")
+    private double sxkf;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglSbdwVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglSbdwVo.java
new file mode 100644
index 0000000..a5f0591
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglSbdwVo.java
@@ -0,0 +1,69 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglSbdwVo 对象", description = "设备定位")
+public class TbJcglSbdwVo extends BaseEntity implements Serializable, Cloneable {
+
+  private static final long serialVersionUID = 6556387960466677177L;
+
+  @ApiModelProperty(value = "id")
+  private String id;
+
+  @ApiModelProperty(value = "设备编码")
+  private String sbbh;
+
+  @ApiModelProperty(value = "设备名称")
+  private String sbmc;
+
+  @ApiModelProperty(value = "设备分类")
+  private String scode;
+
+  @ApiModelProperty(value = "所属部门id")
+  private String ssbmid;
+
+  @ApiModelProperty(value = "所属部门")
+  private String ssbm;
+
+  @ApiModelProperty(value = "所属部门代码")
+  private String ssbmdm;
+
+  @ApiModelProperty(value = "所属县公安局")
+  private String ssxgaj;
+
+  @ApiModelProperty(value = "所属县公安局id")
+  private String ssxgajid;
+
+  @ApiModelProperty(value = "所属县公安局代码")
+  private String ssxgajdm;
+
+  @ApiModelProperty(value = "所属市公安局id")
+  private String sssgajid;
+
+  @ApiModelProperty(value = "所属市公安局")
+  private String sssgaj;
+
+  @ApiModelProperty(value = "所属市公安局代码")
+  private String sssgajdm;
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllBqVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllBqVo.java
new file mode 100644
index 0000000..89c8a75
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllBqVo.java
@@ -0,0 +1,53 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-09-02
+ * 专业警中返回Vo
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglXfllBqVo 对象", description = "巡防警力标签关联表返回Vo")
+public class TbJcglXfllBqVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -9134462848980897397L;
+
+    @ApiModelProperty(value = "巡防警力标签关联表标识ID", name = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "警力表ID")
+    private String xfllId;
+
+    @ApiModelProperty(value = "标签表ID")
+    private String bqId;
+
+    @ApiModelProperty(value = "有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yxsj;
+
+    @ApiModelProperty(value = "标签表类型")
+    private String bqlx;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllVo.java
new file mode 100644
index 0000000..7bf6591
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXfllVo.java
@@ -0,0 +1,132 @@
+package com.mosty.base.model.vo.jcgl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 巡防力量表返回实体对象
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "巡防力量表返回实体对象")
+public class TbJcglXfllVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -7605499785736652981L;
+
+    @ApiModelProperty(value = "警员管理表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）")
+    private String ryid;
+
+    @ApiModelProperty(value = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(value = "警员类型", notes = "01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警")
+    private String lx;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "警号")
+    private String jh;
+
+    @ApiModelProperty(value = "警衔")
+    private String jx;
+
+    @ApiModelProperty(value = "政治面貌")
+    private String zzmm;
+
+    @ApiModelProperty(value = "婚姻状况", notes = "0、未婚，1、已婚，2、离异")
+    private String hyzk;
+
+    @ApiModelProperty(value = "入职时间")
+    private Date rzsj;
+
+    @ApiModelProperty(value = "出生日期")
+    private Date csrq;
+
+    @ApiModelProperty(value = "民族编码")
+    private String mzdm;
+
+    @ApiModelProperty(value = "文化程度")
+    private String whcddm;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jgdm;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String jtzz;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "电子邮箱")
+    private String dzyx;
+
+    @ApiModelProperty(value = "巡防力量图片", notes = "逗号分隔")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+
+    @ApiModelProperty(value = "数据状态：0、注销，1、正常，-1、封存", name = "xtSjzt")
+    private String xtSjzt;
+
+    @ApiModelProperty(value = "技能标签ID列表")
+    private List<TbJcglXfllVo> sklList;
+
+    @ApiModelProperty(value = "经验标签ID列表")
+    private List<TbJcglXfllVo> expList;
+
+    @ApiModelProperty(value = "训练记录列表")
+    private List<TbJcglXljlVo> xljlList;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXljlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXljlVo.java
new file mode 100644
index 0000000..919a882
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglXljlVo.java
@@ -0,0 +1,43 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "训练记录")
+public class TbJcglXljlVo implements Serializable {
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警力表ID")
+    private String xfllId;
+
+    @ApiModelProperty(value = "训练日期")
+    private String xlrq;
+
+    @ApiModelProperty(value = "训练成绩（D_BZ_XLCJ）")
+    private String xlcj;
+
+    @ApiModelProperty(value = "训练时长")
+    private String xlsc;
+
+    @ApiModelProperty(value = "训练类型（D_BZ_XFXLLX）")
+    private String xllx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZnzbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZnzbVo.java
new file mode 100644
index 0000000..f06b359
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZnzbVo.java
@@ -0,0 +1,147 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-02
+ * 专业警中返回Vo
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglZnzbVo 对象", description = "只能装备返回Vo")
+public class TbJcglZnzbVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "设备编码")
+    private String sbbh;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "设备分类")
+    private String scode;
+
+    @ApiModelProperty(value = "设备类型名称")
+    private String sname;
+
+    @ApiModelProperty(value = "设备IPv4")
+    private String sbIpv4;
+
+    @ApiModelProperty(value = "设备IPv6")
+    private String sbIpv6;
+
+    @ApiModelProperty(value = "设备Mac地址")
+    private String sbMac;
+
+    @ApiModelProperty(value = "设备IMEI码")
+    private String sbImei;
+
+    @ApiModelProperty(value = "生产厂商")
+    private String sccs;
+
+    @ApiModelProperty(value = "采购日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date cgrq;
+
+    @ApiModelProperty(value = "到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dqsj;
+
+    @ApiModelProperty(value = "装备图片地址")
+    private String zbTp;
+
+    @ApiModelProperty(value = "型号")
+    private String xh;
+
+    @ApiModelProperty(value = "字典D_ZDY_SBZT（1 正常  2 临期 3 到期 4故障）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "字典D_BZ_SF（0 否 1是）是否提醒，当用户处理提醒之后，需要将该字段置为null")
+    private String sftx;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(name = "备注")
+    private String bz;
+
+    @ApiModelProperty(name = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(name = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(name = "距离（米）")
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "当前页")
+    @TableField(exist = false)
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页条数")
+    @TableField(exist = false)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "是否支持通讯 0否 1支持")
+    private String sfxt;
+
+    @ApiModelProperty(value = "是否专业装备")
+    private String sfzy;
+
+    @ApiModelProperty(value = "是否融合")
+    private String sfrh;
+
+    @ApiModelProperty(value = "图片id")
+    private String tpid;
+
+
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZyjz.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZyjz.java
new file mode 100644
index 0000000..649ee3e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/jcgl/TbJcglZyjz.java
@@ -0,0 +1,144 @@
+package com.mosty.base.model.vo.jcgl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-09-02
+ * 专业警中返回Vo
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "TbJcglZyjz 对象", description = "专业警中返回Vo")
+public class TbJcglZyjz implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 6556387960466677177L;
+
+    @ApiModelProperty(name = "警员管理表标识ID", hidden = true)
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "人员ID（民警对应sys_user表中的ID，辅警为null）")
+    private String ryid;
+
+    @ApiModelProperty(name = "警员分类", notes = "01、民警，02、辅警")
+    private String fl;
+
+    @ApiModelProperty(name = "警员类型", notes = "01、社区民警，02、治安民警，03、刑侦民警，04、内勤民警，05、巡逻民警")
+    private String lx;
+
+    @ApiModelProperty(name = "姓名")
+    private String xm;
+
+    @ApiModelProperty(name = "性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(name = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(name = "警号")
+    private String jh;
+
+    @ApiModelProperty(name = "警衔")
+    private String jx;
+
+    @ApiModelProperty(name = "政治面貌")
+    private String zzmm;
+
+    @ApiModelProperty(name = "婚姻状况", notes = "0、未婚，1、已婚，2、离异")
+    private String hyzk;
+
+    @ApiModelProperty(name = "入职时间")
+    private Date rzsj;
+
+    @ApiModelProperty(name = "出生日期")
+    private Date csrq;
+
+    @ApiModelProperty(name = "民族编码")
+    private String mzdm;
+
+    @ApiModelProperty(name = "文化程度")
+    private String whcddm;
+
+    @ApiModelProperty(name = "籍贯")
+    private String jgdm;
+
+    @ApiModelProperty(name = "家庭住址")
+    private String jtzz;
+
+    @ApiModelProperty(name = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(name = "电子邮箱")
+    private String dzyx;
+
+    @ApiModelProperty(name = "巡防力量图片")
+    private String tp;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(name = "备注")
+    private String bz;
+
+    @ApiModelProperty(name = "警力报备情况 0.休假   1.在岗")
+    private String jlzt;
+
+    @ApiModelProperty(name = "位置（行政区划名称+地址详址），先取这个  ，取不到这个取下面这个")
+    private String wzXz;
+
+    @ApiModelProperty(name = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(name = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(name = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(name = "距离（米）")
+    private BigDecimal distance;
+
+    @ApiModelProperty("专业技能List")
+    private List<TbJcglXfllBqVo> bqList;
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/lzother/TAlarmYjZlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/lzother/TAlarmYjZlVo.java
new file mode 100644
index 0000000..988a496
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/lzother/TAlarmYjZlVo.java
@@ -0,0 +1,95 @@
+package com.mosty.base.model.vo.lzother;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/12/06
+ * 泸州拓尔思指令返回VO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TAlarmYjZlVo 对象", description = "泸州拓尔思指令返回VO")
+public class TAlarmYjZlVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "布控主键")
+    private String bkzj;
+
+    @ApiModelProperty(value = "指令发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "指令本身状态（0未签收 1正常签收 2超时签收 3已下发 4正常反馈 5超时反馈）已下发暂时没用了")
+    private Integer status;
+
+    @ApiModelProperty(value = "指令级别  红黄蓝")
+    private Integer lev;
+
+    @ApiModelProperty(value = "活动来源表英文名")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "指令编号")
+    private String zlbh;
+
+    @ApiModelProperty(value = "指令类型（10常控20临控）")
+    private Integer zllx;
+
+    @ApiModelProperty(value = "签署时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date lastupdatetime;
+
+    @ApiModelProperty(value = "人员细类（用于展示）")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码（用于判断查看权限）")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "活动来源表中文名")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "布控来源表")
+    private String bklyb;
+
+    @ApiModelProperty(value = "布控来源主键")
+    private String bklyzj;
+
+    @ApiModelProperty(value = "预警类型（1身份证2车辆3虚拟身份）")
+    private Integer yjlx;
+
+    @ApiModelProperty(value = "产生该条预警指令的预警轨迹id")
+    private String yjgjid;
+
+    @ApiModelProperty(value = "预警轨迹信息")
+    private TAlarmYjgj gj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/Gzqk.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/Gzqk.java
new file mode 100644
index 0000000..d3b052c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/Gzqk.java
@@ -0,0 +1,22 @@
+package com.mosty.base.model.vo.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "工作情况")
+public class Gzqk {
+    @ApiModelProperty(value = "在岗民警数量")
+    private Integer zgmjsl;
+
+    @ApiModelProperty(value = "在岗辅警数量")
+    private Integer zgfjsl;
+
+    @ApiModelProperty(value = "计划数量")
+    private Integer jhsl;
+
+    @ApiModelProperty(value = "实际数量")
+    private Integer sjsl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbCountVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbCountVo.java
new file mode 100644
index 0000000..ca36bbe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbCountVo.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.mosty.base.model.dto.qwzx.TbQwBmjlbbCountDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @title: TbQwBmjlbbCountVo
+ * @projectName mosty-dyga-cloud
+ * @date 2022/7/9 10:27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwBmjlbbCountVo对象", description="部门每日警力报备统计对象")
+public class TbQwBmjlbbCountVo {
+
+    @ApiModelProperty(value = "在岗民警数")
+    private int zgmjs;
+
+    @ApiModelProperty(value = "不在岗民警数")
+    private int bzgmjs;
+
+    @ApiModelProperty(value = "在岗辅警数")
+    private int zgfjs;
+
+    @ApiModelProperty(value = "不在岗辅警数")
+    private int bzgfjs;
+
+    @ApiModelProperty(value = "街面民警")
+    private int jmmj;
+
+    @ApiModelProperty(value = "街面辅警")
+    private int jmfj;
+
+    @ApiModelProperty(value = "性别统计（性别字典）")
+    private List<TbQwBmjlbbCountDto> xbtj;
+
+    @ApiModelProperty(value = "人员类型统计（类型字典）")
+    private List<TbQwBmjlbbCountDto> rylxtj;
+
+    @ApiModelProperty(value = "年龄分布统计（1：30及以下、2：31-40、3：41-50 4：51及以上）")
+    private List<TbQwBmjlbbCountDto> nlfbtj;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbVo.java
new file mode 100644
index 0000000..6f94909
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwBmjlbbVo.java
@@ -0,0 +1,133 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.dto.qwzx.TbQwBmjlbbJlmxDto;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 部门每日警力报备表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_bmjlbb")
+@ApiModel(value="TbQwBmjlbb对象", description="部门每日警力报备表")
+public class TbQwBmjlbbVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "是否节假日")
+    private String sfjjr;
+
+    @ApiModelProperty(value = "节假日名称")
+    private String jjrmc;
+
+    @ApiModelProperty(value = "勤务等级ID")
+    private String qwdjId;
+
+    @ApiModelProperty(value = "勤务等级代码")
+    private String qwdjdm;
+
+    @ApiModelProperty(value = "勤务等级")
+    private String qwdj;
+
+    @ApiModelProperty(value = "报备日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date bbrq;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "在岗民警数量（冗余存储方便统计）")
+    private Integer zgmjsl;
+
+    @ApiModelProperty(value = "在岗民警（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zgmj;
+
+    @ApiModelProperty(value = "在岗辅警数量（冗余存储方便统计）")
+    private Integer zgfjsl;
+
+    @ApiModelProperty(value = "在岗辅警（此处存辅警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zgfj;
+
+    @ApiModelProperty(value = "值班警力数量（冗余存储方便统计）")
+    private Integer zbjlsl;
+
+    @ApiModelProperty(value = "值班警力（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String zbjl;
+
+    @ApiModelProperty(value = "不在岗民警数量（冗余存储方便统计）")
+    private Integer bzmjlsl;
+
+    @ApiModelProperty(value = "不在岗民警（此处存民警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String bzgmj;
+
+    @ApiModelProperty(value = "不在岗辅警数量（冗余存储方便统计）")
+    private Integer bzgfjsl;
+
+    @ApiModelProperty(value = "不在岗辅警（此处存辅警id、姓名json数据，详细数据从关联表获取tb_qw_jlbb_bbxq）")
+    private String bzgfj;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "值班警力集合")
+    List<TbQwBmjlbbJlmxDto> zbjlList;
+
+    @ApiModelProperty(value = "在岗警力集合")
+    List<TbQwBmjlbbJlmxDto> zgjlList;
+
+    @ApiModelProperty(value = "不在岗警力集合")
+    List<TbQwBmjlbbJlmxDto> bzgjlList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwVo.java
new file mode 100644
index 0000000..d8ba479
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwVo.java
@@ -0,0 +1,69 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 世乒赛参赛队伍返回Vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSpsCsdwVo 对象", description = "世乒赛参赛队伍返回Vo")
+public class TbQwSpsCsdwVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "参赛队伍名称")
+    private String cddwmc;
+
+    @ApiModelProperty(value = "所属小组")
+    private String ssxz;
+
+    @ApiModelProperty(value = "活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地")
+    private String dqwz;
+
+    @ApiModelProperty(value = "当前位置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date dqwzsj;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "单位的最后一条轨迹信息")
+    private TbQwSpsCsdwhdgjVo gjVo;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwhdgjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwhdgjVo.java
new file mode 100644
index 0000000..f0103d4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwSpsCsdwhdgjVo.java
@@ -0,0 +1,77 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ * 世乒赛参赛队伍活动轨迹返回对象Vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwSpsCsdwhdgjVo 对象", description = "世乒赛参赛队伍活动轨迹返回对象Vo")
+public class TbQwSpsCsdwhdgjVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "参赛队伍id")
+    private String cddwid;
+
+    @ApiModelProperty(value = "参赛队伍名称")
+    private String cddwmc;
+
+    @ApiModelProperty(value = "所属小组")
+    private String ssxz;
+
+    @ApiModelProperty(value = "活动类型：1-离开住地，2-到达场馆，3-离开场馆，4-到达住地")
+    private String hdlx;
+
+    @ApiModelProperty(value = "活动时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date hdsj;
+
+    @ApiModelProperty(value = "活动日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date hdrq;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBmtjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBmtjVo.java
new file mode 100644
index 0000000..5e1a2cd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBmtjVo.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.vo.qwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防值班部门统计
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="巡防值班部门统计VO", description="巡防值班部门统计")
+public class TbQwXfbbBmtjVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private String date;
+
+    @ApiModelProperty(value = "值班数量")
+    private Integer zbsl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBrtjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBrtjVo.java
new file mode 100644
index 0000000..60f16f4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfbbBrtjVo.java
@@ -0,0 +1,56 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防值班本人统计
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="巡防值班本人统计VO", description="巡防值班本人统计")
+public class TbQwXfbbBrtjVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "总巡防时长")
+    private Integer zxfsc;
+
+    @ApiModelProperty(value = "年度时长")
+    private Integer ndsc;
+
+    @ApiModelProperty(value = "本月时长")
+    private Integer bysc;
+
+    @ApiModelProperty(value = "本周时长")
+    private Integer bzsc;
+
+    @ApiModelProperty(value = "总巡防里程")
+    private Integer zxflc;
+
+    @ApiModelProperty(value = "年度里程")
+    private Integer ndlc;
+
+    @ApiModelProperty(value = "本月里程")
+    private Integer bylc;
+
+    @ApiModelProperty(value = "本周里程")
+    private Integer bzlc;
+
+    @ApiModelProperty(value = "报备集合")
+    private List<TbQwXfbb> bbList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqMyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqMyVo.java
new file mode 100644
index 0000000..26e7c55
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqMyVo.java
@@ -0,0 +1,169 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.qwzx.TbQwCl;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.qwzx.TbQwJyqx;
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/08
+ * 查询我今天的巡防排版返回的周期信息
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbZqMyVo 对象", description = "查询我今天的巡防排版返回的周期信息")
+public class TbQwXfpbZqMyVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班id")
+    private String pbId;
+
+    @ApiModelProperty(value = "巡防周期 存1.2.3")
+    private Integer xfzq;
+
+    @ApiModelProperty(value = "班次数 存1.2.3")
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "--D_BZ_WZLX（武装类型）武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "--D_BZ_ZZLX（着装类型）着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "--D_BZ_XLFS（巡逻方式）巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围ID（对应巡防区或快反点的ID）")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "每日警力表ID（用于前端的报备成功后的任务完成）")
+    private String mrjlid;
+
+    @ApiModelProperty(value = "民辅警列表")
+    private List<TbQwJl> jlList;
+
+    @ApiModelProperty(value = "警车列表")
+    private List<TbQwCl> clList;
+
+    @ApiModelProperty(value = "通讯装备列表")
+    private List<TbQwZnzb> znzbList;
+
+    @ApiModelProperty(value = "警用器械列表")
+    private List<TbQwJyqx> jyqxList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqVo.java
new file mode 100644
index 0000000..e5683b1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwXfpbZqVo.java
@@ -0,0 +1,153 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 巡防排班周期表Vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwXfpbZqVo对象", description = "巡防排班周期表")
+public class TbQwXfpbZqVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "排班id")
+    private String pbId;
+
+    @ApiModelProperty(value = "巡防周期 存1.2.3")
+    private Integer xfzq;
+
+    @ApiModelProperty(value = "班次数 存1.2.3")
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcId;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "负责人姓名")
+    private String fzrXm;
+
+    @ApiModelProperty(value = "负责人身份证号")
+    private String fzrSfzh;
+
+    @ApiModelProperty(value = "负责人ID")
+    private String fzrId;
+
+    @ApiModelProperty(value = "负责人联系电话")
+    private String fzrLxdh;
+
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "执勤时长（分钟）")
+    private Integer zqsc;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "排班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbmj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "排班辅警（此处存辅警id、姓名、警号、呼号json数据，详细数据从关联表获取tb_qw_jl）")
+    private String pbfj;
+
+    @ApiModelProperty(value = "警车数量（冗余存储方便统计）")
+    private Integer jcsl;
+
+    @ApiModelProperty(value = "排班车辆（此处存车辆id、车牌号json数据，详细数据从关联表获取tb_qw_cl）")
+    private String pbcl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "智能通讯装备 （此处存装备id、呼号、设备名json数据，详细数据从关联表获取tb_qw_txzb）")
+    private String txzb;
+
+    @ApiModelProperty(value = "警用器械数量（冗余存储方便统计）")
+    private Integer jyqxsl;
+
+    @ApiModelProperty(value = "警用器械（此处存器械类型、器械数量json数据，详细数据从关联表获取tb_qw_jyqx）")
+    private String jyqx;
+
+    @ApiModelProperty(value = "--D_BZ_WZLX（武装类型）武装类型：0-武装 1-非武装（字典）")
+    private String wzlx;
+
+    @ApiModelProperty(value = "--D_BZ_ZZLX（着装类型）着装类型（0.制服 1.便衣）（字典）")
+    private String zzlx;
+
+    @ApiModelProperty(value = "--D_BZ_XLFS（巡逻方式）巡逻方式（0.车巡 1.步巡）（字典）")
+    private String xlfs;
+
+    @ApiModelProperty(value = "--D_ZDY_XFFWLX 巡防范围类型（1 巡防区  2 快反点 3 检查站）")
+    private String xffwlx;
+
+    @ApiModelProperty(value = "巡防范围ID（对应巡防区或快反点的ID）")
+    private String xffwid;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "巡防日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date xfrq;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbCheckVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbCheckVo.java
new file mode 100644
index 0000000..756af0c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbCheckVo.java
@@ -0,0 +1,35 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwZbCheckVo对象", description="排版检查VO")
+public class TbQwZbCheckVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbVo.java
new file mode 100644
index 0000000..c021fea
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbVo.java
@@ -0,0 +1,152 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 值班表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_qw_zbbb")
+@ApiModel(value="TbQwZb对象", description="值班表")
+public class TbQwZbVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班开始日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date zbksrq;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "值班结束日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date zbjsrq;
+
+    @ApiModelProperty(value = "循环周期")
+    private Integer xfzq;
+
+    @ApiModelProperty(value = "查询值班开始时间")
+    @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "查询值班结束时间")
+    @JsonFormat(pattern = "HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbld;
+
+    @ApiModelProperty(value = "值班电话")
+    private String zbdh;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "通讯装备数量（冗余存储方便统计）")
+    private Integer txzbsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "组呼号")
+    private String zhh;
+
+    @ApiModelProperty(value = "值班状态（01 未值班、02值班中、03 值班完成）")
+    private String zbzt;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "值班民警姓名", hidden = true)
+    private String zbmjxm;
+
+    @ApiModelProperty(value = "备注", hidden = true)
+    private String bz;
+
+    @ApiModelProperty(value = "警力集合")
+    List<TbQwJl> jlList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbbbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbbbVo.java
new file mode 100644
index 0000000..4f6b048
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbbbVo.java
@@ -0,0 +1,171 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbQwZbbbVo 对象", description="值班报备返回对象VO")
+public class TbQwZbbbVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "报备类型（01 正常报备  02 特殊报备）")
+    private String bblx;
+
+    @ApiModelProperty(value = "值班排班ID")
+    private String zbpbId;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zbrq;
+
+    @ApiModelProperty(value = "查询值班开始时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date kssj;
+
+    @ApiModelProperty(value = "查询值班结束时间")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班领导姓名")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "值班领导电话")
+    private String zbldDh;
+
+    @ApiModelProperty(value = "值班领导身份证号")
+    private String zbldSfzh;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长身份证号")
+    private String zbzhzSfzh;
+
+    @ApiModelProperty(value = "值班指挥长电话")
+    private String zbzhzDh;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长身份证号")
+    private String zzzhzSfzh;
+
+    @ApiModelProperty(value = "专职指挥长电话")
+    private String zzzhzDh;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班身份证号")
+    private String fzzbSfzh;
+
+    @ApiModelProperty(value = "法制值班电话")
+    private String fzzbDh;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbkssj;
+
+    @ApiModelProperty(value = "报备开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bbjssj;
+
+    @ApiModelProperty(value = "--D_ZDY_BBZT（报备状态）报备状态（0 报备中、1 结束报备）（字典）")
+    private String bbzt;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+
+    @ApiModelProperty(value = "警力集合")
+    List<TbQwJl> jlList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbpbZqMyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbpbZqMyVo.java
new file mode 100644
index 0000000..a4e293c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/qwzx/TbQwZbpbZqMyVo.java
@@ -0,0 +1,151 @@
+package com.mosty.base.model.vo.qwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/09
+ * 查询我今天的值班排版返回的周期信息
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbQwZbpbZqMyVo 对象", description = "查询我今天的值班排版返回的周期信息")
+public class TbQwZbpbZqMyVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "值班排班ID")
+    private String pbId;
+
+    @ApiModelProperty(value = "值班周期，存1，2，3")
+    private Integer zbzq;
+
+    @ApiModelProperty(value = "班次数，存1，2，3", required = false)
+    private Integer bcs;
+
+    @ApiModelProperty(value = "勤务班次ID")
+    private String qwbcid;
+
+    @ApiModelProperty(value = "值班开始时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date kssj;
+
+    @ApiModelProperty(value = "值班结束时间")
+    @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm:ss")
+    private Date jssj;
+
+    @ApiModelProperty(value = "值班时长（分钟）")
+    private Integer zbsc;
+
+    @ApiModelProperty(value = "值班领导ID")
+    private String zbldId;
+
+    @ApiModelProperty(value = "值班领导身份证号")
+    private String zbldSfzh;
+
+    @ApiModelProperty(value = "值班领导")
+    private String zbldXm;
+
+    @ApiModelProperty(value = "值班电话")
+    private String zbldDh;
+
+    @ApiModelProperty(value = "值班指挥长ID")
+    private String zbzhzId;
+
+    @ApiModelProperty(value = "值班指挥长身份证号")
+    private String zbzhzSfzh;
+
+    @ApiModelProperty(value = "值班指挥长姓名")
+    private String zbzhzXm;
+
+    @ApiModelProperty(value = "值班指挥长电话")
+    private String zbzhzDh;
+
+    @ApiModelProperty(value = "专职指挥长ID")
+    private String zzzhzId;
+
+    @ApiModelProperty(value = "专职指挥长身份证号")
+    private String zzzhzSfzh;
+
+    @ApiModelProperty(value = "专职指挥长姓名")
+    private String zzzhzXm;
+
+    @ApiModelProperty(value = "专职指挥长电话")
+    private String zzzhzDh;
+
+    @ApiModelProperty(value = "法制值班ID")
+    private String fzzbId;
+
+    @ApiModelProperty(value = "法制值班身份证号")
+    private String fzzbSfzh;
+
+    @ApiModelProperty(value = "法制值班姓名")
+    private String fzzbXm;
+
+    @ApiModelProperty(value = "法制值班电话")
+    private String fzzbDh;
+
+    @ApiModelProperty(value = "值班民警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbmj;
+
+    @ApiModelProperty(value = "值班辅警（此处存民警id、姓名、警号、呼号json数据，详细数据从关联表获取）")
+    private String zbfj;
+
+    @ApiModelProperty(value = "民警数量（冗余存储方便统计）")
+    private Integer mjsl;
+
+    @ApiModelProperty(value = "辅警数量（冗余存储方便统计）")
+    private Integer fjsl;
+
+    @ApiModelProperty(value = "呼号")
+    private String hh;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "每日警力表ID（用于前端的报备成功后的任务完成）")
+    private String mrjlid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLXStatisticsVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLXStatisticsVo.java
new file mode 100644
index 0000000..604e138
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLXStatisticsVo.java
@@ -0,0 +1,42 @@
+package com.mosty.base.model.vo.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskLXStatisticsVo 对象", description = "任务类型统计返回对象vo")
+public class TbRwTaskLXStatisticsVo implements Serializable, Cloneable  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "字典词条")
+    private String ct;
+
+    @ApiModelProperty(value = "字典代码")
+    private String dm;
+
+    @ApiModelProperty(value = "任务总数")
+    private Integer all;
+
+    @ApiModelProperty(value = "进行中")
+    private Integer jxz;
+
+    @ApiModelProperty(value = "超期进行中")
+    private Integer cqjxz;
+
+    @ApiModelProperty(value = "已完成")
+    private Integer ywc;
+
+    @ApiModelProperty(value = "超期完成")
+    private Integer cqwc;
+
+    @ApiModelProperty(value = "超期未完成")
+    private Integer cqwwc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLogVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLogVo.java
new file mode 100644
index 0000000..fa76d93
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskLogVo.java
@@ -0,0 +1,106 @@
+package com.mosty.base.model.vo.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务日志返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskLogVo 对象", description = "任务日志返回对象")
+public class TbRwTaskLogVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = " 1.任务关闭 2.开始任务 3.完成任务 4.任务转发 5.任务暂停 6.任务重启 " +
+            "7.接收转发任务 8.驳回转发任务 9.发起任务 10.删除任务")
+    private String rzlx;
+
+    @ApiModelProperty(value = "日志内容 例：2022-09-08 12:00:02,XX查看了任务")
+    private String rznr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标哈希值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "变更时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date bgsj;
+
+    @ApiModelProperty(value = "变更人")
+    private String bgrid;
+
+    @ApiModelProperty(value = "变更人姓名")
+    private String bgrxm;
+
+    @ApiModelProperty(value = "变更人身份证号")
+    private String bgrsfzh;
+
+    @ApiModelProperty(value = "变更人电话号码")
+    private String bgrdhhm;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskMyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskMyVo.java
new file mode 100644
index 0000000..3ebbb1a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskMyVo.java
@@ -0,0 +1,140 @@
+package com.mosty.base.model.vo.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务返回对象vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskMyVo 对象", description = "任务返回对象vo")
+public class TbRwTaskMyVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "接收部门代码 （仅接受对象为部门的时候，有此值）")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收巡组ID（巡防报备ID）")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwfqsj;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwwcsj;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务执行人员数量")
+    private Integer rwzxrysl;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成 5.超期未完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人联系电话")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "任务接收人员")
+    private TbRwTaskUserVo userVo;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskRankingVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskRankingVo.java
new file mode 100644
index 0000000..f1a83fe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskRankingVo.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.vo.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskRankingVo 对象", description = "任务排行统计返回对象vo")
+public class TbRwTaskRankingVo implements Serializable, Cloneable  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "完成数")
+    private String YS;
+
+    @ApiModelProperty(value = "未完成数")
+    private String NS;
+
+    @ApiModelProperty(value = "完成度")
+    private String rate;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskStatisticsVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskStatisticsVo.java
new file mode 100644
index 0000000..abde62e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskStatisticsVo.java
@@ -0,0 +1,36 @@
+package com.mosty.base.model.vo.rwzx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskStatisticsVo 对象", description = "任务返回对象vo")
+public class TbRwTaskStatisticsVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务总数")
+    private Integer all;
+
+    @ApiModelProperty(value = "进行中")
+    private Integer jxz;
+
+    @ApiModelProperty(value = "超期进行中")
+    private Integer cqjxz;
+
+    @ApiModelProperty(value = "已完成")
+    private Integer ywc;
+
+    @ApiModelProperty(value = "超期完成")
+    private Integer cqwc;
+
+    @ApiModelProperty(value = "超期未完成")
+    private Integer cqwwc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskUserVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskUserVo.java
new file mode 100644
index 0000000..d60809b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskUserVo.java
@@ -0,0 +1,96 @@
+package com.mosty.base.model.vo.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务接收人员返回类vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbRwTaskUserVo 对象", description = "任务接收人员返回类vo")
+public class TbRwTaskUserVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "任务ID")
+    private String rwid;
+
+    @ApiModelProperty(value = "任务转发类型 1.常规任务 2.转发任务 3.驳回任务")
+    private String rwzflx;
+
+    @ApiModelProperty(value = "接收人id")
+    private String jsrid;
+
+    @ApiModelProperty(value = "接收人名称")
+    private String jsrmc;
+
+    @ApiModelProperty(value = "接收人身份证号")
+    private String jsrsfzh;
+
+    @ApiModelProperty(value = "接收部门名称")
+    private String jsbmmc;
+
+    @ApiModelProperty(value = "接收巡组名称")
+    private String jsxzmc;
+
+    @ApiModelProperty(value = "接收人电话")
+    private String jsrlxdh;
+
+    @ApiModelProperty(value = "接收部门code")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收巡组ID")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "个人状态  0.待查看 1.进行中 2.已完成 3.已转发 4.已驳回")
+    private String rwzt;
+
+    @ApiModelProperty(value = "移交时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String yjsj;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "变更人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "变更人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "变更人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "变更人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "变更人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "变更人所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskVo.java
new file mode 100644
index 0000000..a58dd06
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/rwzx/TbRwTaskVo.java
@@ -0,0 +1,151 @@
+package com.mosty.base.model.vo.rwzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.dto.rwzx.TbRwTaskUserDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/20
+ * 任务返回对象vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_rw_task")
+@ApiModel(value = "TbRwTaskVo 对象", description = "任务返回对象vo")
+public class TbRwTaskVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywid;
+
+    @ApiModelProperty(value = "任务名称")
+    private String rwmc;
+
+    @ApiModelProperty(value = "任务内容")
+    private String rwnr;
+
+    @ApiModelProperty(value = "任务接收对象 01.人员 02.部门 03.巡组")
+    private String rwjsdx;
+
+    @ApiModelProperty(value = "接收部门代码 （仅接受对象为部门的时候，有此值）")
+    private String jsbmdm;
+
+    @ApiModelProperty(value = "接收巡组ID（巡防报备ID）")
+    private String jsxzid;
+
+    @ApiModelProperty(value = "是否必须按期完成 0.否 1.是")
+    private String sfaqwc;
+
+    @ApiModelProperty(value = "任务类型 1.通知任务  2.处置任务")
+    private String rwlx;
+
+    @ApiModelProperty(value = "任务细类 01.一标三实 02.预警核查 03巡防任务 04.值班任务 05.指令任务")
+    private String rwxl;
+
+    @ApiModelProperty(value = "任务详细类型（自定义字段，一些业务需要，如指令 " +
+            "01-指令签收，02-到达现场，03-指令处置完成，04-指令完结）")
+    private String rwxxlx;
+
+    @ApiModelProperty(value = "任务紧急程度 1.特急 2.紧急 3.常规")
+    private String rwjjcd;
+
+    @ApiModelProperty(value = "任务发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwfqsj;
+
+    @ApiModelProperty(value = "任务完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwwcsj;
+
+    @ApiModelProperty(value = "任务要求完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date rwyqwcsj;
+
+    @ApiModelProperty(value = "任务模式 1.单人模式 2.多人模式")
+    private String rwms;
+
+    @ApiModelProperty(value = "任务执行人员数量")
+    private Integer rwzxrysl;
+
+    @ApiModelProperty(value = "任务进行状态 1.进行中 2.超期进行中 3.已完成 4.超期完成")
+    private String rwjxzt;
+
+    @ApiModelProperty(value = "任务状态 0.正常 1.任务关闭 2.任务暂停")
+    private String rwzt;
+
+    @ApiModelProperty(value = "任务链接 ")
+    private String rwlj;
+
+    @ApiModelProperty(value = "附件ID  多附件用逗号分隔")
+    private String fjid;
+
+    @ApiModelProperty(value = "应用ID")
+    private String yyid;
+
+    @ApiModelProperty(value = "应用名称")
+    private String yyxt;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String cjrid;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String cjrxm;
+
+    @ApiModelProperty(value = "创建人身份证号")
+    private String cjrsfzh;
+
+    @ApiModelProperty(value = "创建人联系电话")
+    private String cjrlxdh;
+
+    @ApiModelProperty(value = "创建人所属id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "创建人所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "创建人所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "创建人所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "创建人所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "创建人所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "创建人所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "任务接收人员List")
+    private List<TbRwTaskUserVo> userDtoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/GeohashQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/GeohashQuery.java
new file mode 100644
index 0000000..3b9142b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/GeohashQuery.java
@@ -0,0 +1,65 @@
+package com.mosty.base.model.vo.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_jq")
+@ApiModel(value = "GeohashQuery对象", description = "警情表")
+public class GeohashQuery implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * type(1 总警情  2 街面警情 3 违法犯罪警情)
+     */
+    @ApiModelProperty(value = "类型(1 总警情  2 街面警情 3 违法犯罪警情)", name = "type")
+    private String type;
+
+    /**
+     * dateType(1 日  2 周 3 月)
+     */
+    @ApiModelProperty(value = "日期类型(1 日  2 周 3 月)", name = "dateType")
+    private String dateType;
+
+    /**
+     * 开始日期
+     */
+    @ApiModelProperty(value = "开始日期", name = "ksrq")
+    private String ksrq;
+
+    /**
+     * 结束日期
+     */
+    @ApiModelProperty(value = "结束日期", name = "jsrq")
+    private String jsrq;
+
+    /**
+     * 开始年月
+     */
+    @ApiModelProperty(value = "开始年月", name = "ksny")
+    private String ksny;
+
+    /**
+     * 结束年月
+     */
+    @ApiModelProperty(value = "结束年月", name = "jsny")
+    private String jsny;
+
+    /**
+     * 所属分县局代码
+     */
+    @ApiModelProperty(value = "所属分县局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/TbJqVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/TbJqVo.java
new file mode 100644
index 0000000..ca7bb0d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/sjzx/TbJqVo.java
@@ -0,0 +1,269 @@
+package com.mosty.base.model.vo.sjzx;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.sjzx.TbJqZxr;
+import com.mosty.base.model.entity.sjzx.TbSj;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * @Author aklcoming
+ * @Date 2022-07-11 19:24:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbJqVo 对象", description = "警情VO")
+public class TbJqVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情表ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "警情ID（为110系统的警情表的ID）", name = "jq110Id")
+    private String jq110Id;
+
+    @ApiModelProperty(value = "接警单编号", name = "jjdbh")
+    private String jjdbh;
+
+    @ApiModelProperty(value = "接警单位编号", name = "jjdwbh")
+    private String jjdwbh;
+
+    @ApiModelProperty(value = "接警单位名称", name = "jjdwmc")
+    private String jjdwmc;
+
+    @ApiModelProperty(value = "关联接警单编号", name = "gljjdbh")
+    private String gljjdbh;
+
+    @ApiModelProperty(value = "接警员编号", name = "jjybh")
+    private String jjybh;
+
+    @ApiModelProperty(value = "接警员姓名", name = "jjyxm")
+    private String jjyxm;
+
+    @ApiModelProperty(value = "接警台编号", name = "jjtbh")
+    private String jjtbh;
+
+    @ApiModelProperty(value = "接警台IP", name = "jjtip")
+    private String jjtip;
+
+    @ApiModelProperty(value = "呼入时间", name = "hrsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date hrsj;
+
+    @ApiModelProperty(value = "来话类型编号", name = "lhlxbh")
+    private String lhlxbh;
+
+    @ApiModelProperty(value = "报警方式编号", name = "bjfsbh")
+    private String bjfsbh;
+
+    @ApiModelProperty(value = "报警日期", name = "bjrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bjrq;
+
+    @ApiModelProperty(value = "报警时间", name = "bjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bjsj;
+
+    @ApiModelProperty(value = "接警时间", name = "jjsj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jjsj;
+
+    @ApiModelProperty(value = "警情发生开始日期年份", name = "jqfsksnf")
+    private Integer jqfsksnf;
+
+    @ApiModelProperty(value = "警情发生开始日期月份", name = "jqfsksyf")
+    private Integer jqfsksyf;
+
+    @ApiModelProperty(value = "警情发生开始日期年月", name = "jqfsksny")
+    private Integer jqfsksny;
+
+    @ApiModelProperty(value = "警情发生开始日期周数", name = "jqfskszs")
+    private Integer jqfskszs;
+
+    @ApiModelProperty(value = "警情发生开始日期", name = "jqfsksrq")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date jqfsksrq;
+
+    @ApiModelProperty(value = "警情发生开始时间", name = "jqfskssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfskssj;
+
+    @ApiModelProperty(value = "警情发生开始小时数（存24小时制的数字）", name = "jqfsksxs")
+    private Integer jqfsksxs;
+
+    @ApiModelProperty(value = "警情发生结束时间", name = "jqfsjssj")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date jqfsjssj;
+
+    @ApiModelProperty(value = "呼入时长", name = "hrsc")
+    private Integer hrsc;
+
+    @ApiModelProperty(value = "接警时长", name = "jjsc")
+    private Integer jjsc;
+
+    @ApiModelProperty(value = "接警录音号", name = "jjlyh")
+    private String jjlyh;
+
+    @ApiModelProperty(value = "报警电话", name = "bjdh")
+    private String bjdh;
+
+    @ApiModelProperty(value = "报警电话用户姓名", name = "bjdhYhxm")
+    private String bjdhYhxm;
+
+    @ApiModelProperty(value = "报警电话用户地址", name = "bjdhYhdz")
+    private String bjdhYhdz;
+
+    @ApiModelProperty(value = "报警人身份证号", name = "bjrSfzh")
+    private String bjrSfzh;
+
+    @ApiModelProperty(value = "报警人姓名", name = "bjrXm")
+    private String bjrXm;
+
+    @ApiModelProperty(value = "报警人性别", name = "bjrXb")
+    private String bjrXb;
+
+    @ApiModelProperty(value = "报警人联系电话", name = "bjrLxdh")
+    private String bjrLxdh;
+
+    @ApiModelProperty(value = "报警人住址单位", name = "bjrZzdw")
+    private String bjrZzdw;
+
+    @ApiModelProperty(value = "事发地址行政区划", name = "sfdzxzqh")
+    private String sfdzxzqh;
+
+    @ApiModelProperty(value = "事发地址", name = "sfdz")
+    private String sfdz;
+
+    @ApiModelProperty(value = "路灯杆编号", name = "ldgbh")
+    private String ldgbh;
+
+    @ApiModelProperty(value = "报警内容", name = "bjnr")
+    private String bjnr;
+
+    @ApiModelProperty(value = "警情级别", name = "jqjb")
+    private String jqjb;
+
+    @ApiModelProperty(value = "案由", name = "ay")
+    private String ay;
+
+    @ApiModelProperty(value = "报警类别", name = "bjlb")
+    private String bjlb;
+
+    @ApiModelProperty(value = "报警类型", name = "bjlx")
+    private String bjlx;
+
+    @ApiModelProperty(value = "报警细类", name = "bjxl")
+    private String bjxl;
+
+    @ApiModelProperty(value = "报警类别名称", name = "bjlbmc")
+    private String bjlbmc;
+
+    @ApiModelProperty(value = "报警类型名称", name = "bjlxmc")
+    private String bjlxmc;
+
+    @ApiModelProperty(value = "报警细类名称", name = "bjxlmc")
+    private String bjxlmc;
+
+    @ApiModelProperty(value = "被困人数", name = "bkrs")
+    private Integer bkrs;
+
+    @ApiModelProperty(value = "受伤人数", name = "ssrs")
+    private Integer ssrs;
+
+    @ApiModelProperty(value = "死亡人数", name = "swrs")
+    private Integer swrs;
+
+    @ApiModelProperty(value = "有无危险物质(0：无，1：有，默认为无)", name = "ywwxwz")
+    private String ywwxwz;
+
+    @ApiModelProperty(value = "有无爆炸/泄漏(0：无，1：有，默认为无)", name = "ywbzxl")
+    private String ywbzxl;
+
+    @ApiModelProperty(value = " 有无被困人员(0：无，1：有，默认为无)", name = "ywbkry")
+    private String ywbkry;
+
+    @ApiModelProperty(value = "是否涉外(0：无，1：有，默认为无)", name = "sfsw")
+    private String sfsw;
+
+    @ApiModelProperty(value = "是否是外语报警(0：无，1：有，默认为无)", name = "sfswybj")
+    private String sfswybj;
+
+    @ApiModelProperty(value = "经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "处置状态 0.未处置 1.处置中 2.已完成", name = "czzt")
+    private String czzt;
+
+    @ApiModelProperty(value = "重大警情添加类型 01.系统推送 02.手动添加 03.一键报警", name = "zdjqtjlx")
+    private String zdjqtjlx;
+
+    @ApiModelProperty(value = "管辖部门", name = "ssbm")
+    private String ssbm;
+
+    @ApiModelProperty(value = "管辖部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "管辖县公安局", name = "ssxgaj")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "管辖县公安局代码", name = "ssxgajdm")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "管辖市公安局", name = "sssgaj")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "管辖市公安局代码", name = "sssgajdm")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "备注", name = "bz")
+    private String bz;
+
+    @ApiModelProperty("距离")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty("处警单列表")
+    @TableField(exist = false)
+    private List<TbJqCjdb> cjdbList;
+
+    @ApiModelProperty("对应的事件对象")
+    @TableField(exist = false)
+    private TbSj sj;
+
+    @ApiModelProperty(value = "是否重大警情(0：否，1：是)", name = "sfswybj")
+    private String sfzdjq;
+
+    @ApiModelProperty(value = "--D_BZ_SF（是否）是否街面警情", name = "sfjmjq")
+    private String sfjmjq;
+
+    @ApiModelProperty(value = "颜色 1红 2橙 3黄 4蓝", name = "color")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/TrsToken.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/TrsToken.java
new file mode 100644
index 0000000..cded58c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/TrsToken.java
@@ -0,0 +1,24 @@
+package com.mosty.base.model.vo.trs;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TrsToken 对象", description = "拓尔思新平台接口")
+public class TrsToken {
+    @JsonProperty("access_token")
+    private String accessToken;
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+    @JsonProperty("scope")
+    private String scope;
+    @JsonProperty("token_type")
+    private String tokenType;
+    @JsonProperty("expires_in")
+    private Integer expiresIn;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwAlermYjzlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwAlermYjzlVo.java
new file mode 100644
index 0000000..8c5b736
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwAlermYjzlVo.java
@@ -0,0 +1,101 @@
+package com.mosty.base.model.vo.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.entity.trs.VwAlermYjgl;
+import com.mosty.base.model.entity.trs.VwAlermYjzlUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 拓尔思预警指令返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "VwAlermYjzlVo 对象", description = "拓尔思预警指令返回对象")
+public class VwAlermYjzlVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "")
+    private String bkzj;
+
+    @ApiModelProperty(value = "发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fbsj;
+
+    @ApiModelProperty(value = "状态'0','未签收','1','正常签收','2','超时签收','3','已下发','4','正常反馈'," +
+            "'6','超时反馈'")
+    private String status;
+
+    @ApiModelProperty(value = "指令等级")
+    private String lev;
+
+    @ApiModelProperty(value = "")
+    private String hdlyben;
+
+    @ApiModelProperty(value = "指令编号")
+    private String zlbh;
+
+    @ApiModelProperty(value = "指令类型")
+    private String zllx;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "处置时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date czsj;
+
+    @ApiModelProperty(value = "最后修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date lastupdatetime;
+
+    @ApiModelProperty(value = "人员细类")
+    private String ryxl;
+
+    @ApiModelProperty(value = "人员细类代码")
+    private String ryxlDm;
+
+    @ApiModelProperty(value = "")
+    private String hdlybcn;
+
+    @ApiModelProperty(value = "布控来源表")
+    private String bklyb;
+
+    @ApiModelProperty(value = "")
+    private String bklyzj;
+
+    @ApiModelProperty(value = "预警细类")
+    private String yjlx;
+
+    @ApiModelProperty(value = "")
+    private String yjgjid;
+
+    @ApiModelProperty(value = "指令关联")
+    private VwAlermYjgl vwAlermYjgl;
+
+    @ApiModelProperty(value = "指令接收人员")
+    private List<VwAlermYjzlUser> userList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwPersonVisitRecordVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwPersonVisitRecordVo.java
new file mode 100644
index 0000000..60a1499
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/trs/VwPersonVisitRecordVo.java
@@ -0,0 +1,74 @@
+package com.mosty.base.model.vo.trs;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.entity.trs.VwPsPersonZy;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/26
+ * 拓尔思走访记录返回对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "VwPersonVisitRecordVo 对象", description = "拓尔思走访记录返回对象")
+public class VwPersonVisitRecordVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "走访时间")
+    private Date time;
+
+    @ApiModelProperty(value = "走访方式代码")
+    private String methodCode;
+
+    @ApiModelProperty(value = "走访方式名称")
+    private String methodName;
+
+    @ApiModelProperty(value = "控制类型")
+    private String inControl;
+
+    @ApiModelProperty(value = "控制类型 0.失控 1.在控 2.待反馈")
+    private String inControlCode;
+
+    @ApiModelProperty(value = "脱离控制事件")
+    private Date outOfControlTime;
+
+    @ApiModelProperty(value = "目的的")
+    private String destination;
+
+    @ApiModelProperty(value = "说明")
+    private String info;
+
+    @ApiModelProperty(value = "走访人员")
+    private String visitBy;
+
+    @ApiModelProperty(value = "经度")
+    private String lng;
+
+    @ApiModelProperty(value = "维度")
+    private String lat;
+
+    @ApiModelProperty(value = "图片")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "人员信息")
+    private VwPsPersonZy vwPsPersonZy;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/wzzx/TbWzSblswzVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/wzzx/TbWzSblswzVo.java
new file mode 100644
index 0000000..e65c8b5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/wzzx/TbWzSblswzVo.java
@@ -0,0 +1,149 @@
+package com.mosty.base.model.vo.wzzx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 位置-历史位置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbWzSblswzVo对象", description = "位置-历史位置表")
+public class TbWzSblswzVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY(位置数据来源)数据来源（01 udp推送 02 移动设备）")
+    private String sjlydm;
+
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @ApiModelProperty(value = "设备ID")
+    private String sbid;
+
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+//    @ApiModelProperty(value = "坐标")
+//    @TableField(exist = false)
+//    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ(位置提供者)位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/xinzhi/GxAlarmAllVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/xinzhi/GxAlarmAllVo.java
new file mode 100644
index 0000000..9451614
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/xinzhi/GxAlarmAllVo.java
@@ -0,0 +1,242 @@
+package com.mosty.base.model.vo.xinzhi;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/10/28
+ * 新稚警情表
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "GxAlarmAllVo 对象", description = "新稚警情表")
+public class GxAlarmAllVo implements Serializable, Cloneable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "事件编号")
+    private String incidentCode;
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String adminCode;
+
+    @ApiModelProperty(value = "第一次呼入时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date firstCallinTime;
+
+    @ApiModelProperty(value = "第一次接入时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date firstFinishReceiveTime;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiptCode;
+
+    @ApiModelProperty(value = "市局代码")
+    private String firstReceiveOrgId;
+
+    @ApiModelProperty(value = "市局名称")
+    private String firstReceiveOrgName;
+
+    @ApiModelProperty(value = "")
+    private String firstReceivePersonId;
+
+    @ApiModelProperty(value = "接入人姓名")
+    private String firstReceivePersonName;
+
+    @ApiModelProperty(value = "呼入类型")
+    private String callinType;
+
+    @ApiModelProperty(value = "报警方式编号")
+    private String alarmMode;
+
+    @ApiModelProperty(value = "报警人姓名")
+    private String alarmPersonName;
+
+    @ApiModelProperty(value = "性别")
+    private String alarmPersonSex;
+
+    @ApiModelProperty(value = "报警电话")
+    private String contactTelNo;
+
+    @ApiModelProperty(value = "报警地址")
+    private String contactAddress;
+
+    @ApiModelProperty(value = "报警内容")
+    private String alarmContent;
+
+    @ApiModelProperty(value = "分局代码")
+    private String subBureauId;
+
+    @ApiModelProperty(value = "分局名称")
+    private String subBureauName;
+
+    @ApiModelProperty(value = "单位代码")
+    private String mainOrgId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String mainOrgName;
+
+    @ApiModelProperty(value = "报警类型")
+    private String alarmCategory;
+
+    @ApiModelProperty(value = "报警级别")
+    private String alarmLevel;
+
+    @ApiModelProperty(value = "报警等级")
+    private String important;
+
+    @ApiModelProperty(value = "报警类型")
+    private String caseType;
+
+    @ApiModelProperty(value = "警情类别")
+    private String alarmMajorType;
+
+    @ApiModelProperty(value = "警情类型")
+    private String alarmSubType;
+
+    @ApiModelProperty(value = "警情细类")
+    private String alarmMinorType;
+
+    @ApiModelProperty(value = "报警地址")
+    private String alarmAddress;
+
+    @ApiModelProperty(value = "")
+    private String alarmLocation;
+
+    @ApiModelProperty(value = "")
+    private String locationTarget;
+
+    @ApiModelProperty(value = "")
+    private String alarmAddressType;
+
+    @ApiModelProperty(value = "")
+    private String incidentStatus;
+
+    @ApiModelProperty(value = "")
+    private String resultsType;
+
+    @ApiModelProperty(value = "")
+    private String handleSituation;
+
+    @ApiModelProperty(value = "")
+    private String relatedIncidentCode;
+
+    @ApiModelProperty(value = "")
+    private String anonymous;
+
+    @ApiModelProperty(value = "")
+    private String maybeHarass;
+
+    @ApiModelProperty(value = "")
+    private String dispatchedUnits;
+
+    @ApiModelProperty(value = "")
+    private String lockedBy;
+
+    @ApiModelProperty(value = "")
+    private String feedbackConfirmed;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "")
+    private String updateTime;
+
+    @ApiModelProperty(value = "")
+    private String firstStartReceiveTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmStartTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmEndTime;
+
+    @ApiModelProperty(value = "")
+    private String alarmCommunity;
+
+    @ApiModelProperty(value = "")
+    private String focused;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiveSeatNo;
+
+    @ApiModelProperty(value = "")
+    private String firstReceiveSeatIp;
+
+    @ApiModelProperty(value = "")
+    private String firstReceivePersonPoliceNo;
+
+    @ApiModelProperty(value = "")
+    private String labelPredict;
+
+    @ApiModelProperty(value = "")
+    private String receiveSatisfaction;
+
+    @ApiModelProperty(value = "")
+    private String policeSatisfaction;
+
+    @ApiModelProperty(value = "")
+    private String returnVisitRecordCode;
+
+    @ApiModelProperty(value = "")
+    private String firstCallinCode;
+
+    @ApiModelProperty(value = "")
+    private String firstRecordingNo;
+
+    @ApiModelProperty(value = "")
+    private String idNumber;
+
+    @ApiModelProperty(value = "")
+    private String alarmSource;
+
+    @ApiModelProperty(value = "")
+    private String holdWeapons;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+
+    @ApiModelProperty(value = "维度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "")
+    private String isFlag;
+
+    @ApiModelProperty(value = "")
+    private String policeName;
+
+    @ApiModelProperty(value = "")
+    private String policeNo;
+
+    @ApiModelProperty(value = "")
+    private String isOtherUnit;
+
+    @ApiModelProperty(value = "警情类别名称")
+    private String lbmc;
+
+    @ApiModelProperty(value = "警情类型名称")
+    private String lxmc;
+
+    @ApiModelProperty(value = "警情细类名称")
+    private String xlmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastInterfaceVO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastInterfaceVO.java
new file mode 100644
index 0000000..63c484f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastInterfaceVO.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "预测方格接口传输对象", description = "预测方格接口传输对象")
+public class ForecastInterfaceVO implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "状态代码")
+	private int code;
+	
+	@ApiModelProperty(value = "返回总数")
+	private int total;
+
+	@ApiModelProperty(value = "返回信息")
+	private String message;
+
+	@ApiModelProperty(value = "预测方格接口结果列表")
+	private List<ForecastResultsVO> results;
+
+	
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastResultsVO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastResultsVO.java
new file mode 100644
index 0000000..7e5f1ff
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/ForecastResultsVO.java
@@ -0,0 +1,84 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "预测方格接口结果传输对象", description = "预测方格接口结果传输对象")
+public class ForecastResultsVO implements Serializable, Cloneable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "日期")
+    private String realDate;
+
+	@ApiModelProperty(value = "预测定义")
+    private BigDecimal defId;
+
+	@ApiModelProperty(value = "预测类型")
+    private String category;
+
+	@ApiModelProperty(value = "单位类型")
+    private String policeType;
+
+	@ApiModelProperty(value = "单位ID")
+    private String policeId;
+
+	@ApiModelProperty(value = "单位ORGCODE")
+    private String orgcode;
+
+	@ApiModelProperty(value = "预测时段")
+    private String timeRange;
+
+	@ApiModelProperty(value = "网格大小")
+    private String gridType;
+
+	@ApiModelProperty(value = "网格ID")
+    private String gridNum;
+
+	@ApiModelProperty(value = "网格坐标X1")
+    private BigDecimal x1;
+
+	@ApiModelProperty(value = "网格坐标Y1")
+    private BigDecimal y1;
+
+	@ApiModelProperty(value = "网格坐标X2")
+    private BigDecimal x2;
+
+	@ApiModelProperty(value = "网格坐标Y2")
+    private BigDecimal y2;
+
+	@ApiModelProperty(value = "案发概率")
+    private BigDecimal prob;
+
+	@ApiModelProperty(value = "巡区 ID")
+    private BigDecimal subId;
+
+	/**
+	 * 没啥用 那边没返回数据 就写在这里
+	 */
+	@ApiModelProperty(value = "案发背景信息")
+    private List<ForecastResultsRefInfosVO> refInfos;
+
+	@Data
+	private class ForecastResultsRefInfosVO implements Serializable, Cloneable {
+		@ApiModelProperty(value = "类型ID")
+		private String typeId;
+
+		@ApiModelProperty(value = "类型名称")
+		private String typeName;
+
+		@ApiModelProperty(value = "类型数量")
+		private BigDecimal total;
+	}
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzJlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzJlVo.java
new file mode 100644
index 0000000..e8ad2b5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzJlVo.java
@@ -0,0 +1,60 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzJlVo对象", description = "犯罪预测单位配置表")
+public class TbFzJlVo implements Serializable, Cloneable {
+
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "报备id")
+    private String bbid;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "巡组名称")
+    private String xzmc;
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycPzVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycPzVo.java
new file mode 100644
index 0000000..7ce71b4
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycPzVo.java
@@ -0,0 +1,51 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycPzVo对象", description = "犯罪预测单位配置表")
+public class TbFzycPzVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "预测部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "预测部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycVo.java
new file mode 100644
index 0000000..d6b2050
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycVo.java
@@ -0,0 +1,97 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbFzycVo对象", description = "犯罪预测表")
+public class TbFzycVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "日期")
+    private String realDate;
+
+    @ApiModelProperty(value = "预测定义")
+    private BigDecimal defId;
+
+    @ApiModelProperty(value = "预测类型")
+    private String category;
+
+    @ApiModelProperty(value = "预测时段")
+    private String timeRange;
+
+    @ApiModelProperty(value = "网格大小")
+    private String gridType;
+
+    @ApiModelProperty(value = "网格ID")
+    private String gridNum;
+
+    @ApiModelProperty(value = "网格坐标X1")
+    private BigDecimal x1;
+
+    @ApiModelProperty(value = "网格坐标Y1")
+    private BigDecimal y1;
+
+    @ApiModelProperty(value = "网格坐标X2")
+    private BigDecimal x2;
+
+    @ApiModelProperty(value = "网格坐标Y2")
+    private BigDecimal y2;
+
+    @ApiModelProperty(value = "案发概率")
+    private BigDecimal prob;
+
+    @ApiModelProperty(value = "巡区 ID")
+    private BigDecimal subId;
+
+    @ApiModelProperty(value = "案发背景信息")
+    private String refInfos;
+
+    @ApiModelProperty(value = "智慧街面巡防指令ID")
+    private String zhjmxfZlid;
+
+    @ApiModelProperty(value = "是否已巡逻")
+    private String sfxl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycXljlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycXljlVo.java
new file mode 100644
index 0000000..8da1f6c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbFzycXljlVo.java
@@ -0,0 +1,96 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.LineString;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbFzycXljlVo对象", description = "犯罪预测巡逻记录表")
+public class TbFzycXljlVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "预警表标识ID", name = "id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "巡组名称")
+    private String xzmc;
+
+    @ApiModelProperty(value = "巡逻报备ID")
+    private String xlbbId;
+
+    @ApiModelProperty(value = "犯罪预警预测指令ID")
+    private String fzyjyczlId;
+
+    @ApiModelProperty(value = "巡逻开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xlkssj;
+
+    @ApiModelProperty(value = "巡逻结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date xljssj;
+
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal dqjd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal dqwd;
+
+    @ApiModelProperty(value = "距离中心点距离（米）")
+    private BigDecimal zxJl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "报备部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "报备部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "巡防时长")
+    private Long xfsc;
+
+    @ApiModelProperty(value = "巡防里程")
+    private Long xflc;
+
+    @ApiModelProperty(value = "坐标")
+    private LineString zb;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxAllVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxAllVo.java
new file mode 100644
index 0000000..58727e1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxAllVo.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYjmxAllVo 对象", description = "预警模型、参数返回对象")
+public class TbYjmxAllVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "预警表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+    @ApiModelProperty(value = "模型ID；01.街面违法犯罪预警 02.重点巡防区域预警")
+    private String mxlx;
+
+    @ApiModelProperty(value = "模型说明")
+    private String mxsm;
+
+    @ApiModelProperty(value = "运行周期")
+    private Integer yxzq;
+
+    @ApiModelProperty(value = "运行次数")
+    private Integer yxcs;
+
+    @ApiModelProperty(value = "预警次数")
+    private Integer yjcs;
+
+    @ApiModelProperty(value = "所属辖区名称")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属辖区代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属辖区ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "模型状态 01-使用中 02-已停止")
+    private String mxzt;
+
+    @ApiModelProperty(value = "参数列表")
+    private List<TbYjmxCsbVo> csList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxCsbVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxCsbVo.java
new file mode 100644
index 0000000..46a407c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxCsbVo.java
@@ -0,0 +1,37 @@
+package com.mosty.base.model.vo.yjzl;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjmxVo 对象", description="预警模型参数表")
+public class TbYjmxCsbVo implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "模型ID")
+    private String mxid;
+
+    @ApiModelProperty(value = "参数代码")
+    private String csdm;
+
+    @ApiModelProperty(value = "参数名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "参数值")
+    private String csz;
+
+    @ApiModelProperty(value = "参数类型 01-时间（分）02-次数 03-人数 04-距离（米）")
+    private String cslx;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxVo.java
new file mode 100644
index 0000000..b54a6a1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjmxVo.java
@@ -0,0 +1,60 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjmxVo 对象", description="预警模型")
+public class TbYjmxVo implements Serializable,Cloneable{
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "预警表标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "模型名称")
+    private String mxmc;
+
+    @ApiModelProperty(value = "模型ID；01.街面违法犯罪预警 02.重点巡防区域预警")
+    private String mxlx;
+
+    @ApiModelProperty(value = "模型说明")
+    private String mxsm;
+
+    @ApiModelProperty(value = "运行周期")
+    private Integer yxzq;
+
+    @ApiModelProperty(value = "运行次数")
+    private Integer yxcs;
+
+    @ApiModelProperty(value = "预警次数")
+    private Integer yjcs;
+
+    @ApiModelProperty(value = "所属辖区名称")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属辖区代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属辖区ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "模型状态 01-使用中 02-已停止")
+    private String mxzt;
+
+    @ApiModelProperty(value = "参數名称")
+    private String csmc;
+
+    @ApiModelProperty(value = "参数类型 01-时间（分）02-次数 03-人数 04-距离（米）")
+    private String cslx;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxClVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxClVo.java
new file mode 100644
index 0000000..bfe0919
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxClVo.java
@@ -0,0 +1,151 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.yjzl.TbYjxxClBq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-车辆表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_cl")
+@ApiModel(value="TbYjxxCl对象", description="预警信息-车辆表")
+public class TbYjxxClVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警车辆表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）车辆标签1临控2被抢盗3套牌")
+    private String yjClbq;
+
+    @ApiModelProperty(value = "发生时间")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "--D_BZ_HPZL（号牌类型）车牌类型")
+    private String yjCphlx;
+
+    @ApiModelProperty(value = "车牌号")
+    private String yjClcph;
+
+    @ApiModelProperty(value = "机动车所有人号码（身份证号或组织机构代码）")
+    private String yjCljdcsyrhm;
+
+    @ApiModelProperty(value = "机动车所有人")
+    private String yjCljdcsyr;
+
+    @ApiModelProperty(value = "--D_BZ_CPHYS（车牌号颜色）车牌号颜色")
+    private String yjCphys;
+
+    @ApiModelProperty(value = "--D_BZ_CLYS（车辆颜色）车身颜色")
+    private String yjClys;
+
+    @ApiModelProperty(value = "--D_BZ_CLPP（车辆品牌）车辆品牌")
+    private String yjClpp;
+
+    @ApiModelProperty(value = "--D_BZ_CLLX（车辆类型）车辆类型，如：轿车、客车、牵引车、摩托车")
+    private String yjCllx;
+
+    @ApiModelProperty(value = "车辆年款")
+    private String yjClnk;
+
+    @ApiModelProperty(value = "行驶方向")
+    private String yjXsfx;
+
+    @ApiModelProperty(value = "行驶速度")
+    private BigDecimal yjXssd;
+
+    @ApiModelProperty(value = "车内人数")
+    private Integer yjClrs;
+
+    @ApiModelProperty(value = "出现时间")
+    private Date clCxsj;
+
+    @ApiModelProperty(value = "消失时间")
+    private Date clXssj;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Integer zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警地点-行政区划代码")
+    private String yjDzXzqh;
+
+    @ApiModelProperty(value = "预警地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "车辆标签集合")
+    private List<TbYjxxClBq> clbqList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxDypzVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxDypzVo.java
new file mode 100644
index 0000000..5415d60
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxDypzVo.java
@@ -0,0 +1,93 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.yjzl.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_dypz")
+@ApiModel(value="TbYjxxDypz对象", description="预警信息-订阅配置表")
+public class TbYjxxDypzVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "订阅人员ID")
+    private String dyryId;
+
+    @ApiModelProperty(value = "订阅人身份证号")
+    private String dyrySfzh;
+
+    @ApiModelProperty(value = "订阅人员姓名")
+    private String dyryXm;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）订阅预警级别")
+    private String dyYjjb;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）订阅人员标签")
+    private String dyYjrybq;
+
+    @ApiModelProperty(value = "--D_BZ_CLBQ（车辆标签）订阅车辆标签")
+    private String dyYjclbq;
+
+    @ApiModelProperty(value = "订阅感知源数量")
+    private Integer dyGzysl;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "车辆标签集合")
+    private List<TbYjxxDypzClbq> clbqList;
+
+    @ApiModelProperty(value = "感知源集合")
+    private List<TbYjxxDypzGzy> gzyList;
+
+    @ApiModelProperty(value = "人员标签集合")
+    private List<TbYjxxDypzRybq> rybqList;
+
+    @ApiModelProperty(value = "事件标签集合")
+    private List<TbYjxxDypzSjbq> sjbqList;
+
+    @ApiModelProperty(value = "预警级别集合")
+    private List<TbYjxxDypzYjjb> yjjbList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxRyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxRyVo.java
new file mode 100644
index 0000000..069e1f8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxRyVo.java
@@ -0,0 +1,179 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.yjzl.TbYjxxRyBq;
+import com.mosty.base.model.entity.yjzl.TbYjxxRySjaj;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_ry")
+@ApiModel(value="TbYjxxRy对象", description="预警信息-人员表")
+public class TbYjxxRyVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警人员标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "乘坐车辆ID")
+    private String yjClid;
+
+    @ApiModelProperty(value = "事件ID")
+    private String sjId;
+
+    @ApiModelProperty(value = "--D_BZ_SJLYUAN（事件来源）预警数据来源")
+    private String yjSjly;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "发生时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "预警标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "预警内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）预警人员标签")
+    private String yjRybq;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）预警证件类型")
+    private String yjZjlx;
+
+    @ApiModelProperty(value = "预警证件号码")
+    private String yjZjhm;
+
+    @ApiModelProperty(value = "预警人员姓名")
+    private String yjRyxm;
+
+    @ApiModelProperty(value = "预警人员性别")
+    private String yjRyxb;
+
+    @ApiModelProperty(value = "预警人员年龄")
+    private Integer yjRynl;
+
+    @ApiModelProperty(value = "预警人员民族")
+    private String yjRymz;
+
+    @ApiModelProperty(value = "预警人员籍贯")
+    private String yjRyjg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警人员户籍地行政区划")
+    private String yjRyhjdXzqh;
+
+    @ApiModelProperty(value = "预警人员户籍地")
+    private String yjRyhjd;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警人员居住址行政区划代码")
+    private String yjRyjzdXzqh;
+
+    @ApiModelProperty(value = "预警人员居住址")
+    private String yjRyjzd;
+
+    @ApiModelProperty(value = "预警人员工作单位id(关联实有单位)")
+    private String yjRygzdwid;
+
+    @ApiModelProperty(value = "预警人员工作单位")
+    private String yjRygzdw;
+
+    @ApiModelProperty(value = "预警人员联系电话")
+    private String yjRylxdh;
+
+    @ApiModelProperty(value = "预警人员相似度")
+    private BigDecimal yjXsd;
+
+    @ApiModelProperty(value = "人员行为描述")
+    private String yjXwms;
+
+    @ApiModelProperty(value = "左上角 X 坐标")
+    private BigDecimal ltx;
+
+    @ApiModelProperty(value = "左上角 Y 坐标")
+    private BigDecimal lty;
+
+    @ApiModelProperty(value = "右下角 X 坐标")
+    private BigDecimal rbx;
+
+    @ApiModelProperty(value = "右下角Y坐标")
+    private BigDecimal rby;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）预警地点行政区划代码")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "预警地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "预警图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "车辆标签集合")
+    private List<TbYjxxRyBq> rybqList;
+
+    @ApiModelProperty(value = "涉及案件集合")
+    private List<TbYjxxRySjaj> sjajList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxSjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxSjVo.java
new file mode 100644
index 0000000..5d44905
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjxxSjVo.java
@@ -0,0 +1,106 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.yjzl.TbYjxxSjGlrycl;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-事件表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_yjxx_sj")
+@ApiModel(value="TbYjxxSj对象", description="预警信息-事件表")
+public class TbYjxxSjVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "预警事件标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "--D_BZ_SJBQ（事件标签）事件分类:01-人员聚集，02-打架，03-拉横幅,04-犯罪分析")
+    private String sjFl;
+
+    @ApiModelProperty(value = "--D_BZ_TYJB（通用级别）预警级别")
+    private String yjJb;
+
+    @ApiModelProperty(value = "发生时间")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    private Date yjSj;
+
+    @ApiModelProperty(value = "事件标题")
+    private String yjBt;
+
+    @ApiModelProperty(value = "事件内容")
+    private String yjNr;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Integer zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）事件地址行政区划代码")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "事件地址")
+    private String yjDz;
+
+    @ApiModelProperty(value = "图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "事件关联人员集合")
+    private List<TbYjxxSjGlrycl> glryclList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzlZqtjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzlZqtjVo.java
new file mode 100644
index 0000000..d1f53d7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzlZqtjVo.java
@@ -0,0 +1,20 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjzlZqtjVo对象", description="预警指令周期-统计信息Vo")
+public class TbYjzlZqtjVo {
+    @ApiModelProperty(value = "数量")
+    private String total;
+    @ApiModelProperty(value = "指令来源")
+    private String zlly;
+    @ApiModelProperty(value = "指令发起日期")
+    private String zlfqrq;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjphVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjphVo.java
new file mode 100644
index 0000000..cd3e095
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjphVo.java
@@ -0,0 +1,30 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjzltjpxVo对象", description="预警指令-排行信息Vo")
+public class TbYjzltjphVo {
+
+    @ApiModelProperty(value = "所属部门")
+    private String name;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "未完成数")
+    private String NTotal;
+
+    @ApiModelProperty(value = "完成数")
+    private String YTotal;
+
+    @ApiModelProperty(value = "完成率")
+    private String wcl;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjxxVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjxxVo.java
new file mode 100644
index 0000000..604efed
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYjzltjxxVo.java
@@ -0,0 +1,21 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYjzltjxxVo对象", description="预警指令-统计信息Vo")
+public class TbYjzltjxxVo {
+    @ApiModelProperty(value = "指令完结状态")
+    private String zlwjzt;
+    @ApiModelProperty(value = "数量")
+    private String total;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYzzlDjtjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYzzlDjtjVo.java
new file mode 100644
index 0000000..a9c45e9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbYzzlDjtjVo.java
@@ -0,0 +1,18 @@
+package com.mosty.base.model.vo.yjzl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbYzzlDjtjVo对象", description="预警指令等级-统计信息Vo")
+public class TbYzzlDjtjVo {
+    @ApiModelProperty(value = "数量")
+    private String total;
+    @ApiModelProperty(value = "指令等级")
+    private String zldj;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlYjRyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlYjRyVo.java
new file mode 100644
index 0000000..287919d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlYjRyVo.java
@@ -0,0 +1,255 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlYjRy", description = "指令-人员预警指令表")
+public class TbZlYjRyVo extends BaseEntity implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令-预警人员标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "指令id")
+    private String zlId;
+
+    @ApiModelProperty(value = "预警表ID")
+    private String yjId;
+
+    @ApiModelProperty(value = "人员预警表id")
+    private String ryyjId;
+
+    @ApiModelProperty(value = "发生时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjFssj;
+
+    @ApiModelProperty(value = "预警时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjSj;
+
+    @ApiModelProperty(value = " 预警级别--D_BZ_TYJB（通用级别）")
+    private String yjJb;
+
+    @ApiModelProperty(value = "指令等级（10-红色,20-橙色,30-黄色,40-蓝色）--D_BZ_TYJB")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令发送日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date zlfsrq;
+
+    @ApiModelProperty(value = "指令发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlfssj;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlBt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlNr;
+
+    @ApiModelProperty(value = "指令人员标签--D_BZ_RYBQ（人员标签）")
+    private String zlRybq;
+
+    @ApiModelProperty(value = "指令人员标签详情")
+    private String zlRybqmc;
+
+    @ApiModelProperty(value = "指令人员证件类型--D_BZ_ZJLX（证件类型）")
+    private String zlZjlx;
+
+    @ApiModelProperty(value = "指令人员证件号码")
+    private String zlZjhm;
+
+    @ApiModelProperty(value = "指令人员姓名")
+    private String zlRyxm;
+
+    @ApiModelProperty(value = "指令人员性别")
+    private String zlRyxb;
+
+    @ApiModelProperty(value = "指令人员年龄")
+    private Integer zlRynl;
+
+    @ApiModelProperty(value = "指令人员民族")
+    private String zlRymz;
+
+    @ApiModelProperty(value = "指令人员籍贯")
+    private String zlRyjg;
+
+    @ApiModelProperty(value = "指令人员户籍地行政区划--D_BZ_XZQHDM（行政区划代码）")
+    private String zlRyhjdXzqh;
+
+    @ApiModelProperty(value = "指令人员户籍地")
+    private String zlRyhjd;
+
+    @ApiModelProperty(value = "指令人员居住址行政区划代码")
+    private String zlRyjzdXzqh;
+
+    @ApiModelProperty(value = "指令人员居住址")
+    private String zlRyjzd;
+
+    @ApiModelProperty(value = "指令人员工作单位id(关联实有单位)")
+    private String zlRygzdwid;
+
+    @ApiModelProperty(value = "指令人员工作单位")
+    private String zlRygzdw;
+
+    @ApiModelProperty(value = "指令人员联系电话")
+    private String zlRylxdh;
+
+    @ApiModelProperty(value = "指令人员相似度")
+    private BigDecimal zlXsd;
+
+    @ApiModelProperty(value = "人员行为描述")
+    private String zlXwms;
+
+    @ApiModelProperty(value = "左上角 X 坐标")
+    private BigDecimal ltx;
+
+    @ApiModelProperty(value = "左上角 Y 坐标")
+    private BigDecimal lty;
+
+    @ApiModelProperty(value = "右下角 X 坐标")
+    private BigDecimal rbx;
+
+    @ApiModelProperty(value = "右下角Y坐标")
+    private BigDecimal rby;
+
+    @ApiModelProperty(value = "感知源id")
+    private String yjGzyid;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令地点行政区划代码--D_BZ_XZQHDM（行政区划代码）")
+    private String yjDzxzqh;
+
+    @ApiModelProperty(value = "指令地点")
+    private String yjDz;
+
+    @ApiModelProperty(value = "指令图片ID")
+    private String tpId;
+
+    @ApiModelProperty(value = "指令封面图片")
+    private String coverImage;
+
+    @ApiModelProperty(value = "指令来源标签名称")
+    private String yjlyBqmc;
+
+    @ApiModelProperty(value = "签收状态（01-待签收，02-正常签收，03-超时签收）")
+    private String qszt;
+
+    @ApiModelProperty(value = "签收时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qssj;
+
+    @ApiModelProperty(value = "到达现场状态（21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "签收有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "完结有效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结状态（91-未完成，92-已完成，93-超时完成，94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；" +
+            "25-超时到达现场 ，26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "核查状态（1-核查到指定对象，2-未核查到指定对象）")
+    private String hczt;
+
+    @ApiModelProperty(value = "盘查人员ID")
+    private String hcid;
+
+    @ApiModelProperty(value = " 所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxInfoVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxInfoVo.java
new file mode 100644
index 0000000..e8d853e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxInfoVo.java
@@ -0,0 +1,198 @@
+package com.mosty.base.model.vo.yjzl;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author dw
+ * @Date 2022-10-13
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZlxxVo 对象", description = "指令信息返回Vo")
+public class TbZlxxInfoVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令签收有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "签收状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收，04-已转发）")
+    private String qszt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "到达现场状态--D_BZ_ZXZTAI（21-待到达现场，22-自动确认到达现场，" +
+            "23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "指令完结有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令完结状态--D_BZ_ZXZTAI（91-未完成，92-已完成，93-超时完成，" +
+            "94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "范围")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "返回设备编号")
+    @TableField(exist = false)
+    private String sbbh;
+
+    @ApiModelProperty("当前查询的执行人的对象")
+    @TableField(exist = false)
+    private TbZlxxZxrVo zxrVo;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxVo.java
new file mode 100644
index 0000000..e5dd548
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxVo.java
@@ -0,0 +1,206 @@
+package com.mosty.base.model.vo.yjzl;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author dw
+ * @Date 2022-10-13
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "TbZlxxVo 对象", description = "指令信息返回Vo")
+public class TbZlxxVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "指令表标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "业务ID")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令签收有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qsyxsj;
+
+    @ApiModelProperty(value = "签收时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qssj;
+
+    @ApiModelProperty(value = "签收状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收，04-已转发）")
+    private String qszt;
+
+    @ApiModelProperty(value = "到达现场有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcyxsj;
+
+    @ApiModelProperty(value = "到达现场时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date ddxcsj;
+
+    @ApiModelProperty(value = "到达现场状态--D_BZ_ZXZTAI（21-待到达现场，22-自动确认到达现场，" +
+            "23-手动确认到达现场，24-手动确认到达现场）采用指令执行状态字典")
+    private String ddxczt;
+
+    @ApiModelProperty(value = "指令完结有效时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjyxsj;
+
+    @ApiModelProperty(value = "指令完结时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlwjsj;
+
+    @ApiModelProperty(value = "指令完结说明")
+    private String zlwjsm;
+
+    @ApiModelProperty(value = "指令完结状态--D_BZ_ZXZTAI（91-未完成，92-已完成，93-超时完成，" +
+            "94-已结束未完成）采用指令执行状态字典")
+    private String zlwjzt;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "范围")
+    @TableField(exist = false)
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "返回设备编号")
+    @TableField(exist = false)
+    private String sbbh;
+
+    @ApiModelProperty("执行人列表")
+    @TableField(exist = false)
+    private List<TbZlxxZxrVo> zxrVoList;
+
+    @ApiModelProperty("执行记录列表")
+    @TableField(exist = false)
+    private List<TbZlxxZxjlVo> zxjlVoList;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxjlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxjlVo.java
new file mode 100644
index 0000000..98fa9d5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxjlVo.java
@@ -0,0 +1,123 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022-10-15
+ * 指令-执行记录表返回表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TbZlxxZxjlVo 对象", description="指令-执行记录表返回表")
+public class TbZlxxZxjlVo extends BaseEntity implements Serializable,Cloneable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "执行时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date zxsj;
+
+    @ApiModelProperty(value = "指令执行动作（00-接收指令，01-签收，02-到达现场，03-已处置，04-反馈，" +
+            "05-下发，06-转发，07-转发确认，08-转发退回，99-完结）")
+    private String zlzxzt;
+
+    @ApiModelProperty(value = "执行内容")
+    private String zxnr;
+
+    @ApiModelProperty(value = "语音时长")
+    private Integer yysc;
+
+    @ApiModelProperty(value = "视频首帧图片")
+    private String sptpid;
+
+    @ApiModelProperty(value = "执行附件（图片）")
+    private String zxfj;
+
+    @ApiModelProperty(value = "指令执行地点行政区划代码--D_BZ_XZQHDM")
+    private String zlzxddXzqhdm;
+
+    @ApiModelProperty(value = "指令执行地点")
+    private String zlzxdd;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zlzxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zlzxrId;
+
+    @ApiModelProperty(value = "指令执行人名称")
+    private String zlzxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zlzxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zlzxrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxrVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxrVo.java
new file mode 100644
index 0000000..70c9598
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZlxxZxrVo.java
@@ -0,0 +1,169 @@
+package com.mosty.base.model.vo.yjzl;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022-10-15
+ * 指令-执行人或部门或巡组表VO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbZlxxZxrVo 对象", description = "指令-执行人或部门或巡组表VO")
+public class TbZlxxZxrVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "指令ID")
+    private String zlId;
+
+    @ApiModelProperty(value = "业务id")
+    private String ywId;
+
+    @ApiModelProperty(value = "指令类型--D_BZ_ZLLX(01-巡防指令、02-人员预警核查指令、03-车辆预警核查指令、" +
+            "04-事件预警处置指令、05-警情处置指令、06-人工指令、07-人员管控指令")
+    private String zllx;
+
+    @ApiModelProperty(value = "指令来源--D_BZ_ZLLY（01-巡逻方案，02-人员预警，03-车辆预警，04-事件预警，" +
+            "05-警情，06-人工，07-人员管控）")
+    private String zlly;
+
+    @ApiModelProperty(value = "指令执行类型--D_BZ_ZLZXLX（1-单人执行，2-多人执行）")
+    private String zlzxlx;
+
+    @ApiModelProperty(value = "指令标题")
+    private String zlbt;
+
+    @ApiModelProperty(value = "指令内容")
+    private String zlnr;
+
+    @ApiModelProperty(value = "指令执行情况")
+    private String zlzxqk;
+
+    @ApiModelProperty(value = "指令发起日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date zlfqrq;
+
+    @ApiModelProperty(value = "指令发起时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zlfqsj;
+
+    @ApiModelProperty(value = "指令等级--D_BZ_TYJB（10-红色,20-橙色,30-黄色,40-蓝色）")
+    private String zldj;
+
+    @ApiModelProperty(value = "指令接收对象--D_BZ_ZLJSDX，如：01：人员，02：部门，03-巡组")
+    private String zljsdx;
+
+    @ApiModelProperty(value = "指令发生地址行政区划代码--D_BZ_XZQHDM")
+    private String zlfsddxzqh;
+
+    @ApiModelProperty(value = "指令发生地址")
+    private String zlfsdd;
+
+    @ApiModelProperty(value = "指令发起人ID")
+    private String zlfqrId;
+
+    @ApiModelProperty(value = "指令发起人姓名")
+    private String zlfqr;
+
+    @ApiModelProperty(value = "指令发起人身份证")
+    private String zlfqrSfzh;
+
+    @ApiModelProperty(value = "指令发起人电话")
+    private String zlfqrDh;
+
+    @ApiModelProperty(value = "附件ID")
+    private String fjId;
+
+    @ApiModelProperty(value = "指令接收人数")
+    private Integer zljsrs;
+
+    @ApiModelProperty(value = "指令图片")
+    private String zltp;
+
+    @ApiModelProperty(value = "指令接收对象类型，如：01：人员，02：部门，03-巡组--D_BZ_ZLJSDX")
+    private String zxrLx;
+
+    @ApiModelProperty(value = "指令执行巡组id-存报备id")
+    private String zxrXzid;
+
+    @ApiModelProperty(value = "指令执行人ID")
+    private String zxrId;
+
+    @ApiModelProperty(value = "指令执行人警力类型 01 民警  02 辅警")
+    private String zxrJllx;
+
+    @ApiModelProperty(value = "指令执行人姓名")
+    private String zxrXm;
+
+    @ApiModelProperty(value = "指令执行人身份证")
+    private String zxrSfz;
+
+    @ApiModelProperty(value = "指令执行人电话")
+    private String zxrDh;
+
+    @ApiModelProperty(value = "指令执行状态--D_BZ_ZXZTAI（01-待签收，02-正常签收，03-超时签收；04-已转发；11-巡逻中，" +
+            "21-待到达现场，22-自动确认到达现场，23-手动确认到达现场，24-手动确认到达现场(实际未到达)；25-超时到达现场 ，" +
+            "26-已研判，27-已反馈，31-待处置，32-处置完成；91-未完成，92-已完成，93-超时完成，94-已结束未完成）")
+    private String dqzt;
+
+    @ApiModelProperty(value = "当前状态时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dqztSj;
+
+    @ApiModelProperty(value = "当前状态说明（如：此指令为单人执行指令，因XXXX签收指令结束）")
+    private String dqztsm;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属县公安局ID")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "最新执行记录")
+    private String zxzxjl;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsAjVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsAjVo.java
new file mode 100644
index 0000000..eafe6b1
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsAjVo.java
@@ -0,0 +1,110 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 要素案件-刑事案件和行政案件返回vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsAjVo对象", description = "要素案件-刑事案件和行政案件返回vo")
+public class TbYsAjVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件分类：1-刑事案件，2-行政案件")
+    private String ajfl;
+
+    @ApiModelProperty(value = "数据来源ID")
+    private String sjlyid;
+
+    @ApiModelProperty(value = "案件编号")
+    private String ajbh;
+
+    @ApiModelProperty(value = "案件名称")
+    private String ajmc;
+
+    @ApiModelProperty(value = "案件内容")
+    private String ajnr;
+
+    @ApiModelProperty(value = "发案日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date farq;
+
+    @ApiModelProperty(value = "发案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fasj;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）案件类别")
+    private String ajlb;
+
+    @ApiModelProperty(value = "案件类别名称")
+    private String aymc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球纬度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）发案地行政区划代码")
+    private String xzqhdm;
+
+    @ApiModelProperty(value = "发案地")
+    private String dzmc;
+
+    @ApiModelProperty(value = "检索内容（案件编号+案件名称+案件内容+地址）")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlDto.java
new file mode 100644
index 0000000..cc70ccf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlDto.java
@@ -0,0 +1,88 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.common.base.domain.page.PageDomain;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 地理要素DTO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsDlDto对象", description = "地理要素DTO")
+public class TbYsDlDto extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String ysmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String ysjc;
+
+    @ApiModelProperty(value = "要素位置行政区划代码")
+    private String yswzXzqh;
+
+    @ApiModelProperty(value = "要素位置（行政区划名称+地址详址）")
+    private String yswzXz;
+
+    @ApiModelProperty(value = "要素位置别称")
+    private String yswzBc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "地图面，如：公安局、派出所、巡防区、快反点的面")
+    private List<BigDecimal> qy;
+
+    @ApiModelProperty(value = "智能设备标识")
+    private String znsbbs;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID")
+    private String ssbmid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlQuery.java
new file mode 100644
index 0000000..bcdf1ff
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlQuery.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ * 地理要素-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsDlQuery对象", description = "地理要素-分页查询对象")
+public class TbYsDlQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "要素大类", name = "ysdl")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类", name = "yszl")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类", name = "ysxl")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称", name = "ysmc")
+    private String ysmc;
+
+    @ApiModelProperty(value = "检索内容", name = "jsnr")
+    private String jsnr;
+
+    @ApiModelProperty(value = "地球经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属部门代码", name = "ssbmdm")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属部门ID", name = "ssbmid")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private Integer radius;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlVo.java
new file mode 100644
index 0000000..cbbc3fe
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsDlVo.java
@@ -0,0 +1,110 @@
+package com.mosty.base.model.vo.yszx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 要素-地理要素返回vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsDlVo对象", description = "要素-地理要素返回vo")
+public class TbYsDlVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID", name = "id")
+    private String id;
+
+    @ApiModelProperty(value = "要素大类", name = "ysdl")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类", name = "yszl")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类", name = "ysxl")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称", name = "ysmc")
+    private String ysmc;
+
+    @ApiModelProperty(value = "要素简称", name = "ysjc")
+    private String ysjc;
+
+    @ApiModelProperty(value = "要素位置行政区划代码", name = "yswzXzqh")
+    private String yswzXzqh;
+
+    @ApiModelProperty(value = "要素位置（行政区划名称+地址详址）", name = "yswzXz")
+    private String yswzXz;
+
+    @ApiModelProperty(value = "要素位置别称", name = "yswzBc")
+    private String yswzBc;
+
+    @ApiModelProperty(value = "地球经度", name = "jd")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度", name = "wd")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标", name = "zb")
+    private BigDecimal[] zb;
+
+    @ApiModelProperty(value = "坐标hash值", name = "zbhash")
+    private String zbhash;
+
+    @ApiModelProperty(value = "地图面，如：公安局、派出所、巡防区、快反点的面", name = "dtm", dataType = "java.util.List")
+    private List<BigDecimal[]> dtm;
+
+    @ApiModelProperty(value = "智能设备标识", name = "znsbbs")
+    private String znsbbs;
+
+    @ApiModelProperty(value = "来源表名", name = "lybm")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id", name = "lyid")
+    private String lyid;
+
+    @ApiModelProperty(value = "检索内容（存要素名称、简称、位置、别称）", name = "jsnr")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgGlbmVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgGlbmVo.java
new file mode 100644
index 0000000..bc27ef6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgGlbmVo.java
@@ -0,0 +1,71 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 要素案件-公安机关返回vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgGlbmVo 对象", description = "要素案件-公安机关返回vo")
+public class TbYsGajgGlbmVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String gajgjc;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）要素位置行政区划代码")
+    private String wzXzqh;
+
+    @ApiModelProperty(value = "位置（行政区划名称+地址详址）")
+    private String wzXz;
+
+    @ApiModelProperty(value = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "关联部门所属部门代码List")
+    private List<String> glbmSsbmdmList;
+
+    @ApiModelProperty(value = "备注 （现主要用于巡防区 判断特警）")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgQuery.java
new file mode 100644
index 0000000..c10fc07
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgQuery.java
@@ -0,0 +1,59 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.mosty.common.base.domain.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author dw
+ * @since 2022/7/22
+ * 公安机关要素-分页查询对象
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgQuery对象", description = "公安机关要素-分页查询对象")
+public class TbYsGajgQuery extends PageDomain implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "检索内容")
+    private String jsnr;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "查询方圆范围（米）")
+    private BigDecimal radius;
+
+
+    @ApiModelProperty(value = "备注")
+    private String bz;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgVo.java
new file mode 100644
index 0000000..beee8a5
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsGajgVo.java
@@ -0,0 +1,129 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 要素案件-公安机关返回vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsGajgVo对象", description = "要素案件-公安机关返回vo")
+public class TbYsGajgVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "要素大类")
+    private String ysdl;
+
+    @ApiModelProperty(value = "要素中类")
+    private String yszl;
+
+    @ApiModelProperty(value = "要素小类")
+    private String ysxl;
+
+    @ApiModelProperty(value = "要素名称")
+    private String gajgmc;
+
+    @ApiModelProperty(value = "要素简称")
+    private String gajgjc;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）要素位置行政区划代码")
+    private String wzXzqh;
+
+    @ApiModelProperty(value = "位置（行政区划名称+地址详址）")
+    private String wzXz;
+
+    @ApiModelProperty(value = "位置别称")
+    private String wzBc;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    private BigDecimal[] zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "管辖区域，如：公安局、派出所、巡防区、快反点的面", dataType = "java.util.List")
+    private List<BigDecimal[]> dtm;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示2圈层", dataType = "java.util.List")
+    private List<BigDecimal[]> dtm1;
+
+    @ApiModelProperty(value = "如果是快反点 这里表示3圈层", dataType = "java.util.List")
+    private List<BigDecimal[]> dtm2;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "检索内容（设备名称+地址）")
+    private String jsnr;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "距离")
+    private BigDecimal distance;
+
+    @ApiModelProperty(value = "所属层级 1.地市州 2.分县局 3.派出所")
+    private String level;
+
+    @ApiModelProperty(value = "关联部门List")
+    private List<TbYsGajgGlbm> glbmDtoList;
+
+    @ApiModelProperty(value = "备注 （现主要用于巡防区 判断特警）")
+    private String bz;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqUpdateDto.java
new file mode 100644
index 0000000..8c4731c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqUpdateDto.java
@@ -0,0 +1,34 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/12/01
+ * 要素-人员标签要素修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRyBqUpdateDto 对象", description = "要素-人员标签要素修改DTO")
+public class TbYsRyBqUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "标签代码")
+    private String bqdm;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqVo.java
new file mode 100644
index 0000000..70a1f45
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyBqVo.java
@@ -0,0 +1,55 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员标签要素VO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRyBq 对象", description = "要素-人员标签要素VO")
+public class TbYsRyBqVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "人员id")
+    private String ryid;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "--D_BZ_RYBQ（人员标签）标签代码")
+    private String bqdm;
+
+    @ApiModelProperty(value = "标签名称")
+    private String bqmc;
+
+    @ApiModelProperty(value = "标签日期")
+    private String bqrq;
+
+    @ApiModelProperty(value = "--D_BB_AJLB（案件类别）标签案件类别")
+    private String bqajlx;
+
+    @ApiModelProperty(value = "标签来源说明")
+    private String bqlysm;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhUpdateDto.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhUpdateDto.java
new file mode 100644
index 0000000..80a2eff
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhUpdateDto.java
@@ -0,0 +1,32 @@
+package com.mosty.base.model.vo.yszx;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/12/01
+ * 要素-人员电话要素修改DTO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRyDhUpdateDto 对象", description = "要素-人员电话要素修改DTO")
+public class TbYsRyDhUpdateDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "身份证号")
+    private String sfzh;
+
+    @ApiModelProperty("电话和imsi集合")
+    private List<Map<String, String>> list;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhVo.java
new file mode 100644
index 0000000..f1467ee
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyDhVo.java
@@ -0,0 +1,52 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员电话要素VO
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRyDh 对象", description = "要素-人员电话要素VO")
+public class TbYsRyDhVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "人员id")
+    private String ryid;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "联系电话")
+    private String lxdh;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyVo.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyVo.java
new file mode 100644
index 0000000..37f3cbd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yszx/TbYsRyVo.java
@@ -0,0 +1,109 @@
+package com.mosty.base.model.vo.yszx;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mosty.base.model.BaseEntity;
+import com.mosty.base.model.entity.yszx.TbYsRyBq;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素-人员要素返回Vo
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "TbYsRy 对象", description = "要素-人员要素表")
+public class TbYsRyVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "--D_BZ_ZJLX（证件类型）证件种类代码")
+    private String zjzl;
+
+    @ApiModelProperty(value = "证件号码")
+    private String zjhm;
+
+    @ApiModelProperty(value = "姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "出生日期")
+    private String csrq;
+
+    @ApiModelProperty(value = "--D_BZ_MZ（民族）民族")
+    private String mz;
+
+    @ApiModelProperty(value = "籍贯")
+    private String jg;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）户籍地行政区划")
+    private String hjdXzqh;
+
+    @ApiModelProperty(value = "户籍地址")
+    private String hjdXz;
+
+    @ApiModelProperty(value = "--D_BZ_XZQHDM（行政区划代码）居住地行政区划")
+    private String jzdXzqh;
+
+    @ApiModelProperty(value = "居住地址")
+    private String jzdXz;
+
+    @ApiModelProperty(value = "工作单位ID(实有单位id)")
+    private String gzdwid;
+
+    @ApiModelProperty(value = "工作单位")
+    private String gzdw;
+
+    @ApiModelProperty(value = "来源表名")
+    private String lybm;
+
+    @ApiModelProperty(value = "来源id")
+    private String lyid;
+
+    @ApiModelProperty(value = "所属派出所")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属派出所id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属派出所代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+    @ApiModelProperty(value = "人员标签")
+    private List<TbYsRyBqVo> bqList;
+
+    @ApiModelProperty(value = "人员电话")
+    private List<TbYsRyDhVo> dhList;
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BeanConvertUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BeanConvertUtils.java
new file mode 100644
index 0000000..0b6cafd
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BeanConvertUtils.java
@@ -0,0 +1,30 @@
+package com.mosty.base.utils;
+ 
+ 
+import org.springframework.beans.BeanUtils;
+ 
+/**
+ * 通用类型转化转换工具类
+ * @author Administrator
+ *
+ */
+public class BeanConvertUtils{
+	
+	/*
+	 * 类型转化
+	 */
+	public static final <Target>Target copyProperties(Object source,Class<Target> targetClass){
+		try {
+			if(source==null || targetClass==null){
+				return null;
+			}
+			Target doInstance = targetClass.newInstance();
+			BeanUtils.copyProperties(source, doInstance);
+			return doInstance;
+		} catch (InstantiationException | IllegalAccessException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BoundingBox.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BoundingBox.java
new file mode 100644
index 0000000..3b6110d
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/BoundingBox.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2010, Silvio Heuberger @ IFS www.ifs.hsr.ch
+ *
+ * This code is release under the Apache License 2.0.
+ * You should have received a copy of the license
+ * in the LICENSE file. If you have not, see
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.mosty.base.utils;
+
+import java.io.Serializable;
+
+public class BoundingBox implements Serializable {
+	private static final long serialVersionUID = -7145192134410261076L;
+	private double southLatitude;
+	private double northLatitude;
+	private double westLongitude;
+	private double eastLongitude;
+	private boolean intersects180Meridian;
+
+	/**
+	 * create a bounding box defined by two coordinates
+	 */
+	public BoundingBox(WGS84Point southWestCorner, WGS84Point northEastCorner) {
+		this(southWestCorner.getLatitude(), northEastCorner.getLatitude(), southWestCorner.getLongitude(), northEastCorner.getLongitude());
+	}
+
+	/**
+	 * Create a bounding box with the specified latitudes and longitudes. This constructor takes the order of the points into account.
+	 *
+	 * @param northLatitude
+	 * @param southLatitude
+	 * @param westLongitude
+	 * @param eastLongitude
+	 *
+	 * @throws IllegalArgumentException
+	 *             When the defined BoundingBox would go over one of the poles. This kind of box is not supported.
+	 */
+	public BoundingBox(double southLatitude, double northLatitude, double westLongitude, double eastLongitude) {
+		if (southLatitude > northLatitude)
+			throw new IllegalArgumentException("The southLatitude must not be greater than the northLatitude");
+
+		if (Math.abs(southLatitude) > 90 || Math.abs(northLatitude) > 90 || Math.abs(westLongitude) > 180 || Math.abs(eastLongitude) > 180) {
+			throw new IllegalArgumentException("The supplied coordinates are out of range.");
+		}
+
+		this.northLatitude = northLatitude;
+		this.westLongitude = westLongitude;
+
+		this.southLatitude = southLatitude;
+		this.eastLongitude = eastLongitude;
+
+		intersects180Meridian = eastLongitude < westLongitude;
+	}
+
+	/**
+	 * Clone constructor
+	 *
+	 * @param that
+	 */
+	public BoundingBox(BoundingBox that) {
+		this(that.southLatitude, that.northLatitude, that.westLongitude, that.eastLongitude);
+	}
+
+	/**
+	 * Returns the NorthWestCorner of this BoundingBox as a new Point.
+	 *
+	 * @return
+	 */
+	public WGS84Point getNorthWestCorner() {
+		return new WGS84Point(northLatitude, westLongitude);
+	}
+
+	/**
+	 * Returns the NorthEastCorner of this BoundingBox as a new Point.
+	 *
+	 * @return
+	 */
+	public WGS84Point getNorthEastCorner() {
+		return new WGS84Point(northLatitude, eastLongitude);
+	}
+
+	/**
+	 * Returns the SouthEastCorner of this BoundingBox as a new Point.
+	 *
+	 * @return
+	 */
+	public WGS84Point getSouthEastCorner() {
+		return new WGS84Point(southLatitude, eastLongitude);
+	}
+
+	/**
+	 * Returns the SouthWestCorner of this BoundingBox as a new Point.
+	 *
+	 * @return
+	 */
+	public WGS84Point getSouthWestCorner() {
+		return new WGS84Point(southLatitude, westLongitude);
+	}
+
+	/**
+	 * Returns the size of the bounding box in degrees of latitude. The value returned will always be positive.
+	 *
+	 * @return
+	 */
+	public double getLatitudeSize() {
+		return northLatitude - southLatitude;
+	}
+
+	/**
+	 * Returns the size of the bounding box in degrees of longitude. The value returned will always be positive.
+	 *
+	 * @return
+	 */
+	public double getLongitudeSize() {
+		if (eastLongitude == 180.0 && westLongitude == -180.0)
+			return 360.0;
+		double size = (eastLongitude - westLongitude) % 360;
+
+		// Remainder fix for earlier java versions
+		if (size < 0)
+			size += 360.0;
+		return size;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj instanceof BoundingBox) {
+			BoundingBox that = (BoundingBox) obj;
+			return southLatitude == that.southLatitude && westLongitude == that.westLongitude && northLatitude == that.northLatitude && eastLongitude == that.eastLongitude;
+		} else {
+			return false;
+		}
+	}
+
+	@Override
+	public int hashCode() {
+		int result = 17;
+		result = 37 * result + hashCode(southLatitude);
+		result = 37 * result + hashCode(northLatitude);
+		result = 37 * result + hashCode(westLongitude);
+		result = 37 * result + hashCode(eastLongitude);
+		return result;
+	}
+
+	private static int hashCode(double x) {
+		long f = Double.doubleToLongBits(x);
+		return (int) (f ^ (f >>> 32));
+	}
+
+	public boolean contains(WGS84Point point) {
+		return containsLatitude(point.getLatitude()) && containsLongitude(point.getLongitude());
+	}
+
+	public boolean intersects(BoundingBox other) {
+		// Check latitude first cause it's the same for all cases
+		if (other.southLatitude > northLatitude || other.northLatitude < southLatitude) {
+			return false;
+		} else {
+			if (!intersects180Meridian && !other.intersects180Meridian) {
+				return !(other.eastLongitude < westLongitude || other.westLongitude > eastLongitude);
+			} else if (intersects180Meridian && !other.intersects180Meridian) {
+				return !(eastLongitude < other.westLongitude && westLongitude > other.eastLongitude);
+			} else if (!intersects180Meridian && other.intersects180Meridian) {
+				return !(westLongitude > other.eastLongitude && eastLongitude < other.westLongitude);
+			} else
+				return true;
+		}
+	}
+
+	@Override
+	public String toString() {
+		return getNorthWestCorner() + " -> " + getSouthEastCorner();
+	}
+
+	public WGS84Point getCenter() {
+		double centerLatitude = (southLatitude + northLatitude) / 2;
+		double centerLongitude = (westLongitude + eastLongitude) / 2;
+
+		// This can happen if the bBox crosses the 180-Meridian
+		if (centerLongitude > 180)
+			centerLongitude -= 360;
+
+		return new WGS84Point(centerLatitude, centerLongitude);
+	}
+	
+	/**
+	 * Expands this bounding box to include the provided point. The expansion is done in the direction with the minimal distance. If both distances are the same it'll expand
+	 * in east direction. It will not cross poles, but it will cross the 180-Meridian, if thats the shortest distance.<br>
+	 *
+	 * @param point The point to include
+	 */
+	public void expandToInclude(WGS84Point point) {
+		
+		// Expand Latitude
+		if(point.getLatitude() < southLatitude)
+			southLatitude = point.getLatitude();
+		else if(point.getLatitude() > northLatitude)
+			northLatitude = point.getLatitude();
+		
+		// Already done in this case
+		if(containsLongitude(point.getLongitude()))
+			return;
+		
+		// If this is not the case compute the distance between the endpoints in east direction
+		double distanceEastToPoint = DoubleUtil.remainderWithFix(point.getLongitude() - eastLongitude, 360);
+		double distancePointToWest = DoubleUtil.remainderWithFix(westLongitude - point.getLongitude(), 360);
+
+		// The minimal distance needs to be extended
+		if(distanceEastToPoint <= distancePointToWest)
+			eastLongitude = point.getLongitude();
+		else
+			westLongitude = point.getLongitude();
+		
+		intersects180Meridian = eastLongitude < westLongitude;
+	}
+
+	/**
+	 * Expands this bounding box to include the provided bounding box. The expansion is done in the direction with the minimal distance. If both distances are the same it'll expand
+	 * in east direction. It will not cross poles, but it will cross the 180-Meridian, if thats the shortest distance.<br>
+	 * If a precise specification of the northEast and southWest points is needed, please create a new bounding box where you can specify the points separately.
+	 *
+	 * @param other
+	 */
+	public void expandToInclude(BoundingBox other) {
+
+		// Expand Latitude
+		if (other.southLatitude < southLatitude) {
+			southLatitude = other.southLatitude;
+		}
+		if (other.northLatitude > northLatitude) {
+			northLatitude = other.northLatitude;
+		}
+
+		// Expand Longitude
+		// At first check whether the two boxes contain each other or not
+		boolean thisContainsOther = containsLongitude(other.eastLongitude) && containsLongitude(other.westLongitude);
+		boolean otherContainsThis = other.containsLongitude(eastLongitude) && other.containsLongitude(westLongitude);
+
+		// The new box needs to span the whole globe
+		if (thisContainsOther && otherContainsThis) {
+			eastLongitude = 180.0;
+			westLongitude = -180.0;
+			intersects180Meridian = false;
+			return;
+		}
+		// Already done in this case
+		if (thisContainsOther)
+			return;
+		// Expand to match the bigger box
+		if (otherContainsThis) {
+			eastLongitude = other.eastLongitude;
+			westLongitude = other.westLongitude;
+			intersects180Meridian = eastLongitude < westLongitude;
+			return;
+		}
+
+		// If this is not the case compute the distance between the endpoints in east direction
+		double distanceEastToOtherEast = DoubleUtil.remainderWithFix(other.eastLongitude - eastLongitude, 360);
+		double distanceOtherWestToWest = DoubleUtil.remainderWithFix(westLongitude - other.westLongitude, 360);
+
+		// The minimal distance needs to be extended
+		if (distanceEastToOtherEast <= distanceOtherWestToWest) {
+			eastLongitude = other.eastLongitude;
+		} else {
+			westLongitude = other.westLongitude;
+		}
+
+		intersects180Meridian = eastLongitude < westLongitude;
+	}
+
+	private boolean containsLatitude(double latitude) {
+		return latitude >= southLatitude && latitude <= northLatitude;
+	}
+
+	private boolean containsLongitude(double longitude) {
+		if (intersects180Meridian) {
+			return longitude <= eastLongitude || longitude >= westLongitude;
+		} else {
+			return longitude >= westLongitude && longitude <= eastLongitude;
+		}
+	}
+
+	public double getEastLongitude() {
+		return eastLongitude;
+	}
+
+	public double getWestLongitude() {
+		return westLongitude;
+	}
+
+	public double getNorthLatitude() {
+		return northLatitude;
+	}
+
+	public double getSouthLatitude() {
+		return southLatitude;
+	}
+
+	public boolean intersects180Meridian() {
+		return intersects180Meridian;
+	}
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CameraPreviewUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CameraPreviewUtil.java
new file mode 100644
index 0000000..2c1aa4e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CameraPreviewUtil.java
@@ -0,0 +1,53 @@
+package com.mosty.base.utils;
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CameraPreviewUtil {
+
+	public static String getCameraPreviewURL(String url, JSONObject jsonBody) {
+		/**
+		 * STEP1：设置平台参数，根据实际情况,设置host appkey appsecret 三个参数.
+		 */
+//		ArtemisConfig.host = "80.149.27.26:443"; // 平台的ip端口
+//		ArtemisConfig.appKey = "21247884";  // 密钥appkey
+//		ArtemisConfig.appSecret = "7H5ISjWWHuhHfZ03SQEG";// 密钥appSecret
+		//海康环境
+//		ArtemisConfig.host = "51.140.38.2:443";
+//		ArtemisConfig.appKey = "24245087";
+//		ArtemisConfig.appSecret = "KSGeqKJiIcVw0Gg9dKwC";
+
+		ArtemisConfig.host = "80.187.1.30:443";// 代理API网关nginx服务器ip端口
+		ArtemisConfig.appKey = "29494762";// 秘钥appkey
+		ArtemisConfig.appSecret = "8VxmuHUSxhJQw55LkPea";// 秘钥appSecret
+		/**
+		 * STEP2：设置OpenAPI接口的上下文
+		 */
+		final String ARTEMIS_PATH = "/artemis";
+		/**
+		 * STEP3：设置接口的URI地址
+		 */
+		final String previewURLsApi = ARTEMIS_PATH + url;
+		Map<String, String> path = new HashMap<String, String>(2) {
+			{
+				put("https://", previewURLsApi);//根据现场环境部署确认是http还是https
+			}
+		};
+		/**
+		 * STEP4：设置参数提交方式
+		 */
+		String contentType = "application/json";
+		String body = jsonBody.toJSONString();
+		/**
+		 * STEP6：调用接口
+		 */
+		String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post请求application/json类型参数
+		return result;
+	}
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java
new file mode 100644
index 0000000..a3a2336
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Constant.java
@@ -0,0 +1,109 @@
+package com.mosty.base.utils;
+
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author zengbo
+ * @title: Constent
+ * @projectName mosty-dyga-cloud
+ * @date 2022/7/5 18:16
+ */
+public class Constant {
+
+    //警力类型-民警
+    public static String JLLX_MJ = "01";
+
+    //警力类型-民警
+    public static String JLLX_FJ = "02";
+
+    //部门等级-省厅
+    public static String BMDJ_ST = "10";
+
+    //部门等级-省厅部门
+    public static String BMDJ_STBM = "11";
+
+    //部门等级-市州局
+    public static String BMDJ_SZJ = "20";
+
+    //部门等级-市州局部门
+    public static String BMDJ_SZJBM = "21";
+
+    //部门等级-区市县局
+    public static String BMDJ_QSXJ = "30";
+
+    //部门等级-区市县部门
+    public static String BMDJ_QSXBM = "31";
+
+    //部门等级-科所队
+    public static String BMDJ_KSD = "40";
+
+    // 经度
+    public static BigDecimal JD = new BigDecimal("104.41234588623047");
+
+    // 纬度
+    public static BigDecimal WD = new BigDecimal("31.127893924713135");
+
+    // 巡逻盘查接口地址
+    public static String XLPC_URL = "";
+
+    //人员位置redis-key
+    public static final String WZ_RYWZ = "rywz:";
+
+    //巡防位置redis-key
+    public static final String WZ_XFWZ = "xfwz:";
+
+    // 设备位置redis-key
+    public static final String WZ_SBWZ = "sbwz:";
+
+    // 海康接口地址
+    public static String HK_URL = " ";
+
+    // 新稚警情接口
+    public static String XZ_URL = "";
+
+    //泸州预警扒窃人员当天数据
+    public static final String LZYJ_DATA_PQRY = "lzyj_data_pqry";
+
+    //泸州预警涉稳人员当天数据
+    public static final String LZYJ_DATA_SWRY = "lzyj_data_swry";
+
+    //泸州预警旅店、网吧、依图人脸（人像）感知的前科，
+    // 涉赌人员（人员细类代码为03,04,05开头的）
+    public static final String LZYJ_DATA_QKSD = "lzyj_data_qksd";
+
+    // 部门警力报备展示数据
+    public static final String BMJLBB = "bmjlbb:";
+
+
+    public static final String SSDSZ = "5107";
+
+    // 警情-key
+    public static final String JQ = "jq_jjdbh:";
+
+
+    public static final Map<String, SseEmitter> HcSse = new ConcurrentHashMap<>();
+
+    /**
+     * 视觉计算 设备编码开头13位 id
+     */
+    public static final String SJJS_SB_ID = "5107000000502";
+
+    /**
+     * 视觉计算APPID
+     */
+    public static final String SJJS_APPID = "1549333825150831001";
+
+    //犯罪预测List
+    public static final String FZYC_LIST = "FZYC_LIST";
+
+    //犯罪预测当前班次
+    public static final String FZYC_BC = "FZYC_BC";
+
+    //设备
+    public static final String PGIS_SB = "PGIS_SB:";
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CoordinateTransform.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CoordinateTransform.java
new file mode 100644
index 0000000..3458359
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/CoordinateTransform.java
@@ -0,0 +1,182 @@
+package com.mosty.base.utils;
+
+/**
+ * @ClassName: CoordinateTransform
+ * @Description: (各种坐标系转换)
+ * @author 晏大兵
+ * @date 2022年4月23日 下午4:54:57
+ */
+public class CoordinateTransform {
+
+	private static final double x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+	private static final double PI = 3.1415926535897932384626;
+	private static final double a = 6378245.0;
+	private static final double ee = 0.00669342162296594323;
+
+	/**
+	 * 百度坐标（BD09）转 GCJ02
+	 *
+	 * @param lng 百度经度
+	 * @param lat 百度纬度
+	 * @return GCJ02 坐标：[经度，纬度]
+	 */
+	public static double[] transformBD09ToGCJ02(double lng, double lat) {
+		double x = lng - 0.0065;
+		double y = lat - 0.006;
+		double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_PI);
+		double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_PI);
+		double gcj_lng = z * Math.cos(theta);
+		double gcj_lat = z * Math.sin(theta);
+		return new double[] { gcj_lng, gcj_lat };
+	}
+
+	/**
+	 * GCJ02 转百度坐标
+	 *
+	 * @param lng GCJ02 经度
+	 * @param lat GCJ02 纬度
+	 * @return 百度坐标：[经度，纬度]
+	 */
+	public static double[] transformGCJ02ToBD09(double lng, double lat) {
+		double z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+		double theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+		double bd_lng = z * Math.cos(theta) + 0.0065;
+		double bd_lat = z * Math.sin(theta) + 0.006;
+		return new double[] { bd_lng, bd_lat };
+	}
+
+	/**
+	 * GCJ02 转 WGS84
+	 *
+	 * @param lng 经度
+	 * @param lat 纬度
+	 * @return WGS84坐标：[经度，纬度]
+	 */
+	public static double[] transformGCJ02ToWGS84(double lng, double lat) {
+		if (outOfChina(lng, lat)) {
+			return new double[] { lng, lat };
+		} else {
+			double dLat = transformLat(lng - 105.0, lat - 35.0);
+			double dLng = transformLng(lng - 105.0, lat - 35.0);
+			double radLat = lat / 180.0 * PI;
+			double magic = Math.sin(radLat);
+			magic = 1 - ee * magic * magic;
+			double sqrtMagic = Math.sqrt(magic);
+			dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * PI);
+			dLng = (dLng * 180.0) / (a / sqrtMagic * Math.cos(radLat) * PI);
+			double mgLat = lat + dLat;
+			double mgLng = lng + dLng;
+			return new double[] { lng * 2 - mgLng, lat * 2 - mgLat };
+		}
+	}
+
+	/**
+	 * WGS84 坐标 转 GCJ02
+	 *
+	 * @param lng 经度
+	 * @param lat 纬度
+	 * @return GCJ02 坐标：[经度，纬度]
+	 */
+	public static double[] transformWGS84ToGCJ02(double lng, double lat) {
+		if (outOfChina(lng, lat)) {
+			return new double[] { lng, lat };
+		} else {
+			double dLat = transformLat(lng - 105.0, lat - 35.0);
+			double dLng = transformLng(lng - 105.0, lat - 35.0);
+			double redLat = lat / 180.0 * PI;
+			double magic = Math.sin(redLat);
+			magic = 1 - ee * magic * magic;
+			double sqrtMagic = Math.sqrt(magic);
+			dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * PI);
+			dLng = (dLng * 180.0) / (a / sqrtMagic * Math.cos(redLat) * PI);
+			double mgLat = lat + dLat;
+			double mgLng = lng + dLng;
+			return new double[] { mgLng, mgLat };
+		}
+	}
+
+	/**
+	 * 百度坐标BD09 转 WGS84
+	 *
+	 * @param lng 经度
+	 * @param lat 纬度
+	 * @return WGS84 坐标：[经度，纬度]
+	 */
+	public static double[] transformBD09ToWGS84(double lng, double lat) {
+		double[] lngLat = transformBD09ToGCJ02(lng, lat);
+
+		return transformGCJ02ToWGS84(lngLat[0], lngLat[1]);
+	}
+
+	/**
+	 * WGS84 转 百度坐标BD09
+	 *
+	 * @param lng 经度
+	 * @param lat 纬度
+	 * @return BD09 坐标：[经度，纬度]
+	 */
+	public static double[] transformWGS84ToBD09(double lng, double lat) {
+		double[] lngLat = transformWGS84ToGCJ02(lng, lat);
+
+		return transformGCJ02ToBD09(lngLat[0], lngLat[1]);
+	}
+
+	private static double transformLat(double lng, double lat) {
+		double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat
+				+ 0.2 * Math.sqrt(Math.abs(lng));
+		ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+		ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	;
+
+	private static double transformLng(double lng, double lat) {
+		double ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+		ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+		ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	;
+
+	/**
+	 * 判断坐标是否不在国内
+	 *
+	 * @param lng 经度
+	 * @param lat 纬度
+	 * @return 坐标是否在国内
+	 */
+	public static boolean outOfChina(double lng, double lat) {
+		return (lng < 72.004 || lng > 137.8347) || (lat < 0.8293 || lat > 55.8271);
+	}
+
+	public static void main(String[] args) {
+		// 百度地图 BD09 坐标 转 WGS84
+		double[] lngLat_wgs84 = CoordinateTransform.transformBD09ToWGS84(120.644049, 31.285887);
+		System.out.println("lng :" + lngLat_wgs84[0] + ",lat :" + lngLat_wgs84[1]);
+
+		// WGS84 坐标 转 百度地图 BD09
+		double[] lngLat_bd09 = CoordinateTransform.transformWGS84ToBD09(lngLat_wgs84[0], lngLat_wgs84[1]);
+		System.out.println("lng :" + lngLat_bd09[0] + ",lat :" + lngLat_bd09[1]);
+
+		// 火星坐标（GCJ02） 坐标 转 WGS84
+		lngLat_wgs84 = CoordinateTransform.transformGCJ02ToWGS84(120.644049, 31.285887);
+		System.out.println("lng :" + lngLat_wgs84[0] + ",lat :" + lngLat_wgs84[1]);
+
+		// WGS84 转 火星坐标（GCJ02）
+		double[] lngLat_gcj02 = CoordinateTransform.transformWGS84ToGCJ02(lngLat_wgs84[0], lngLat_wgs84[1]);
+		System.out.println("lng :" + lngLat_gcj02[0] + ",lat :" + lngLat_gcj02[1]);
+
+		// 百度地图 BD09 坐标 转 火星坐标（GCJ02）
+		lngLat_gcj02 = CoordinateTransform.transformBD09ToGCJ02(120.644049, 31.285887);
+		System.out.println("lng :" + lngLat_gcj02[0] + ",lat :" + lngLat_gcj02[1]);
+
+		// 火星坐标（GCJ02） 坐标 转 百度地图 BD09
+		lngLat_bd09 = CoordinateTransform.transformGCJ02ToBD09(lngLat_gcj02[0], lngLat_gcj02[1]);
+		System.out.println("lng :" + lngLat_bd09[0] + ",lat :" + lngLat_bd09[1]);
+	}
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DateUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DateUtils.java
new file mode 100644
index 0000000..df27ec6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DateUtils.java
@@ -0,0 +1,884 @@
+package com.mosty.base.utils;
+
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.logging.Logger;
+
+
+/**
+ * 日期转换处理类
+ *
+ * @author martin_wp
+ */
+@Slf4j
+public class DateUtils implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private static SimpleDateFormat defaultYearFormatter = new SimpleDateFormat(
+            "yyyy");
+
+    private static SimpleDateFormat defaultDateFormatter = new SimpleDateFormat(
+            "yyyy-MM-dd");
+
+    private static SimpleDateFormat defaultDateTimeFormatter = new SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss");
+
+    private static SimpleDateFormat defaultDateTimeCompactFormatter = new SimpleDateFormat(
+            "yyyyMMddHHmmss");
+
+    private static SimpleDateFormat defaultDateTimeMillionCompactFormatter = new SimpleDateFormat(
+            "yyyyMMddHHmmssSSS");
+
+    public static final SimpleDateFormat defaultTimeFormatter = new SimpleDateFormat(
+            "HH:mm");
+
+    public static final SimpleDateFormat defaultTimeFormatter1 = new SimpleDateFormat(
+            "HH:mm:ss");
+
+    private static SimpleDateFormat defaultTimeFormatter2 = new SimpleDateFormat(
+            "yyyy-MM-dd HH");
+    /**
+     * 日期转换格式
+     */
+    private static SimpleDateFormat dateFormatter01 = new SimpleDateFormat(
+            "yyyy-MM-dd");
+    private static SimpleDateFormat dateFormatter02 = new SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss");
+    private static SimpleDateFormat dateFormatter03 = new SimpleDateFormat(
+            "yyyyMMdd");
+    private static SimpleDateFormat dateFormatter04 = new SimpleDateFormat(
+            "yyyyMMddHHmmss");
+    private static SimpleDateFormat dateFormatter05 = new SimpleDateFormat(
+            "yyyy-MM-dd HH");
+    private static SimpleDateFormat dateFormatter06 = new SimpleDateFormat(
+            "yyyy-MM-dd HH:mm");
+    private static SimpleDateFormat dateFormatter07 = new SimpleDateFormat(
+            "yyyyMMddHH");
+    private static SimpleDateFormat dateFormatter08 = new SimpleDateFormat(
+            "yyyyMMddHHmm");
+    private static SimpleDateFormat dateFormatter09 = new SimpleDateFormat(
+            "HH:mm");
+    private static SimpleDateFormat dateFormatter10 = new SimpleDateFormat(
+            "HH:mm:ss");
+    private static SimpleDateFormat dateFormatter11 = new SimpleDateFormat(
+            "yyyy-MM");
+    private static SimpleDateFormat dateFormatter12 = new SimpleDateFormat(
+            "dd");
+    private static SimpleDateFormat dateFormatter13 = new SimpleDateFormat(
+            "yyyy");
+    private static SimpleDateFormat dateFormatter14 = new SimpleDateFormat(
+            "MM");
+    private static SimpleDateFormat dateFormatter15 = new SimpleDateFormat(
+            "yyyyMM");
+    private static SimpleDateFormat dateFormatter16 = new SimpleDateFormat(
+            "HH");
+    private static SimpleDateFormat dateFormatter17 = new SimpleDateFormat(
+            "MMdd");
+    private static SimpleDateFormat dateFormatter18 = new SimpleDateFormat(
+            "MM-dd");
+
+    /**
+     * 取得系统当前的年份,格式如: (2008-05-12 14:00:00)<br>
+     *
+     * @return String
+     */
+    public static String getHDateString() {
+        return defaultTimeFormatter2.format(new Date())+":00:00";
+    }
+
+    /**
+     * 取得系统当前的日期字符表达式,格式如: (2008-05-12)<br>
+     *
+     * @return String
+     */
+    public static String getSystemDateString() {
+        return defaultDateFormatter.format(new Date());
+    }
+
+
+    public static String getSystemYearString() {
+        return defaultYearFormatter.format(new Date());
+    }
+
+
+
+    /**
+     * 取得系统当前的日期时间字符表达式,格式如: (2008-05-12 14:28:36)<br>
+     *
+     * @return String
+     */
+    public static String getSystemDateTimeString() {
+        return defaultDateTimeFormatter.format(new Date());
+    }
+
+    /**
+     * 取得系统当前的日期时间字符表达式,格式如: (20080512142836)<br>
+     *
+     * @return String
+     */
+    public static String getSystemDateTimeCompactString() {
+        return defaultDateTimeCompactFormatter.format(new Date());
+    }
+
+    /**
+     * 取得系统当前的日期时间字符表达式(带毫秒数),格式如: (20080512142836326)<br>
+     *
+     * @return String
+     */
+    public static String getSystemDateTimeMillionCompactString() {
+        return defaultDateTimeMillionCompactFormatter
+                .format(new Date());
+    }
+
+
+
+    /**
+     * 取得一个日期的字符表达式,格式如: (2008-05-12)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getShortString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            returnValue = formatter.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期时间的字符表达式,格式如: (2008-05-12 14:28:36)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getFullString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat(
+                    "yyyy-MM-dd HH:mm:ss");
+            returnValue = formatter.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 计算两个日期之间相差的天数
+     *
+     * @param smdate 较小的时间
+     * @param bdate  较大的时间
+     * @return 相差天数
+     * @throws ParseException
+     */
+    public static int daysBetween(Date smdate, Date bdate) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        smdate = sdf.parse(sdf.format(smdate));
+        bdate = sdf.parse(sdf.format(bdate));
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(smdate);
+        long time1 = cal.getTimeInMillis();
+        cal.setTime(bdate);
+        long time2 = cal.getTimeInMillis();
+        long between_days = (time2 - time1) / (1000 * 3600 * 24);
+        return Integer.parseInt(String.valueOf(between_days));
+    }
+
+    /**
+     * 取得一个日期的紧凑字符表达式,格式如: (20080512)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getShortCompactString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            returnValue = formatter.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期时间的紧凑字符表达式,格式如: (20080512142836)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getFullCompactString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+            returnValue = formatter.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期的中文字符表达式,格式如: (2008年5月12日)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getChineseShortString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG);
+            returnValue = dateFormat.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 获取当前日期
+     *
+     * @return
+     */
+    public static String getNowDate() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date();
+        String time = sdf.format(date);
+        return time;
+    }
+
+    /**
+     * 取得一个日期时间的中文字符表达式,格式如: (2008年05月12日14时)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getChineseMidString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+            String temp = formatter.format(convertDate);
+            returnValue = temp.substring(0, 4) + "年" + temp.substring(4, 6)
+                    + "月" + temp.substring(6, 8) + "日" + temp.substring(8, 10)
+                    + "时";
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期时间的中文字符表达式,格式如: (2008年05月12日14时28分)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getChineseMiddleString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+            String temp = formatter.format(convertDate);
+            returnValue = temp.substring(0, 4) + "年" + temp.substring(4, 6)
+                    + "月" + temp.substring(6, 8) + "日" + temp.substring(8, 10)
+                    + "时" + temp.substring(10, 12) + "分";
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期的中文字符表达式,包括星期,格式如: (2008年5月12日 星期一)<br>
+     *
+     * @param convertDate 需要转换的日期
+     * @return String
+     */
+    public static String getChineseFullString(Date convertDate) {
+        String returnValue = "";
+        if (convertDate != null) {
+            DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.FULL);
+            returnValue = dateFormat.format(convertDate);
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期的纯中文字符表达式,格式如: (2008-05-12 转换后得到 二00八年五月十二日)<br>
+     *
+     * @param dateString 需要转换的日期字符串
+     * @return String
+     */
+    public static String getPureChineseString(String dateString)
+            throws Exception {
+        String returnValue = "";
+        if (dateString != null && !"".equals(dateString)) {
+            String[] chinaNumber = new String[10];
+            chinaNumber[0] = "0";
+            chinaNumber[1] = "一";
+            chinaNumber[2] = "二";
+            chinaNumber[3] = "三";
+            chinaNumber[4] = "四";
+            chinaNumber[5] = "五";
+            chinaNumber[6] = "六";
+            chinaNumber[7] = "七";
+            chinaNumber[8] = "八";
+            chinaNumber[9] = "九";
+            String tempString = "";
+            try {
+                tempString = dateString.substring(0, 4);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    returnValue += chinaNumber[cn];
+                }
+                returnValue += "年";
+                tempString = dateString.substring(5, 7);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    if (i == 0) {
+                        if (cn == 1) {
+                            returnValue += "十";
+                        }
+                    } else {
+                        if (cn > 0)
+                            returnValue += chinaNumber[cn];
+                    }
+                }
+                returnValue += "月";
+                tempString = dateString.substring(8);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    if (i == 0) {
+                        switch (cn) {
+                            case 0:
+                                break;
+                            case 1:
+                                returnValue += "十";
+                                break;
+                            default:
+                                returnValue += chinaNumber[cn] + "十";
+                                break;
+                        }
+                    } else {
+                        if (cn > 0)
+                            returnValue += chinaNumber[cn];
+                    }
+
+                }
+                returnValue += "日";
+            } catch (Exception ex) {
+                returnValue = "";
+                log.error("日期转换错误: 转换字符串: " + dateString + "，"
+                        + ex.getMessage(), ex);
+                throw new Exception("日期转换错误: 转换字符串: " + dateString + "，"
+                        + ex.getMessage());
+            }
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得一个日期的纯中文字符表达式,格式如: (2008-05-12 转换后得到 二○○八年五月十二日)<br>
+     *
+     * @param dateString 需要转换的日期字符串
+     * @return String
+     */
+    public static String getPureChineseString2(String dateString)
+            throws Exception {
+        String returnValue = "";
+        if (dateString != null && !"".equals(dateString)) {
+            String[] chinaNumber = new String[10];
+            chinaNumber[0] = "○";
+            chinaNumber[1] = "一";
+            chinaNumber[2] = "二";
+            chinaNumber[3] = "三";
+            chinaNumber[4] = "四";
+            chinaNumber[5] = "五";
+            chinaNumber[6] = "六";
+            chinaNumber[7] = "七";
+            chinaNumber[8] = "八";
+            chinaNumber[9] = "九";
+            String tempString = "";
+            try {
+                tempString = dateString.substring(0, 4);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    returnValue += chinaNumber[cn];
+                }
+                returnValue += "年";
+                tempString = dateString.substring(5, 7);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    if (i == 0) {
+                        if (cn == 1) {
+                            returnValue += "十";
+                        }
+                    } else {
+                        if (cn > 0)
+                            returnValue += chinaNumber[cn];
+                    }
+                }
+                returnValue += "月";
+                tempString = dateString.substring(8);
+                for (int i = 0; i < tempString.length(); i++) {
+                    int cn = Integer.parseInt(tempString.substring(i, i + 1));
+                    if (i == 0) {
+                        switch (cn) {
+                            case 0:
+                                break;
+                            case 1:
+                                returnValue += "十";
+                                break;
+                            default:
+                                returnValue += chinaNumber[cn] + "十";
+                                break;
+                        }
+                    } else {
+                        if (cn > 0)
+                            returnValue += chinaNumber[cn];
+                    }
+
+                }
+                returnValue += "日";
+            } catch (Exception ex) {
+                returnValue = "";
+                log.error("日期转换错误: 转换字符串: " + dateString + ","
+                        + ex.getMessage(), ex);
+                throw new Exception("日期转换错误: 转换字符串: " + dateString + ","
+                        + ex.getMessage());
+            }
+        }
+        return returnValue;
+    }
+
+    /**
+     * 字符串转换成日期 (注意: dateString 与 formatString 要匹配)<br>
+     *
+     * @param dateString   需要转换的日期字符串
+     * @param formatString 转换格式 yyyy-MM-dd HH:mm:ss 或 yyyy-MM-dd
+     * @return java.util.Date
+     */
+    public static Date stringToDate(String dateString,
+                                    String formatString) throws Exception {
+        Date returnValue = null;
+        try {
+            if (dateString != null && !"".equals(dateString)) {
+                SimpleDateFormat formatter = new SimpleDateFormat(formatString);
+                formatter.setLenient(false); // 设置时间分析为严格的
+                returnValue = formatter.parse(dateString);
+            }
+        } catch (Exception ex) {
+            log.error("日期转换错误: " + dateString + " 指定格式 [" + formatString
+                    + "]，" + ex.getMessage(), ex);
+            throw new Exception("日期转换错误: " + dateString + " 指定格式 ["
+                    + formatString + "]，" + ex.getMessage());
+        }
+        return returnValue;
+    }
+
+    /**
+     * 取得指定的下一个日期<br>
+     * <p>
+     * 注意：按月运算时，如果运算后当月没有该日，则为当月的最后一天
+     * </p>
+     *
+     * @param startDate 开始日期
+     * @param nextType  运算类型（Y=年数；M=月数；D=天数；H=小时数；m=分钟数；S=秒数）
+     * @param nextStep  运算长度（为负数指取以前的日期）
+     * @return java.util.Date
+     */
+    public static Date getNextDate(Date startDate, String nextType,
+                                   int nextStep) {
+        Date endDate = startDate;
+        if (startDate != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startDate);
+            if ("Y".equals(nextType)) {
+                calendar.add(Calendar.YEAR, nextStep);
+            } else if ("M".equals(nextType)) {
+                calendar.add(Calendar.MONTH, nextStep);
+            } else if ("D".equals(nextType)) {
+                calendar.add(Calendar.DATE, nextStep);
+            } else if ("H".equals(nextType)) {
+                calendar.add(Calendar.HOUR, nextStep);
+            } else if ("m".equals(nextType)) {
+                calendar.add(Calendar.MINUTE, nextStep);
+            } else if ("S".equals(nextType)) {
+                calendar.add(Calendar.SECOND, nextStep);
+            }
+            endDate = calendar.getTime();
+        }
+        return endDate;
+    }
+
+    /**
+     * 字符串转时间
+     *
+     * @param dateType 时间格式
+     * @param date     字符串时间
+     * @return Date
+     */
+    public static Date strToDate(String date, String dateType) {
+        Date returnValue = null;
+        try {
+            if ("01".equals(dateType)) {
+                returnValue = dateFormatter01.parse(date);
+            } else if ("02".equals(dateType)) {
+                returnValue = dateFormatter02.parse(date);
+            } else if ("03".equals(dateType)) {
+                returnValue = dateFormatter03.parse(date);
+            } else if ("04".equals(dateType)) {
+                returnValue = dateFormatter04.parse(date);
+            } else if ("05".equals(dateType)) {
+                returnValue = dateFormatter05.parse(date);
+            } else if ("06".equals(dateType)) {
+                returnValue = dateFormatter06.parse(date);
+            } else if ("07".equals(dateType)) {
+                returnValue = dateFormatter07.parse(date);
+            } else if ("08".equals(dateType)) {
+                returnValue = dateFormatter08.parse(date);
+            } else if ("09".equals(dateType)) {
+                returnValue = dateFormatter09.parse(date);
+            } else if ("10".equals(dateType)) {
+                returnValue = dateFormatter10.parse(date);
+            } else if ("11".equals(dateType)) {
+                returnValue = dateFormatter11.parse(date);
+            } else if ("12".equals(dateType)) {
+                returnValue = dateFormatter12.parse(date);
+            } else if ("13".equals(dateType)) {
+                returnValue = dateFormatter13.parse(date);
+            } else if ("14".equals(dateType)) {
+                returnValue = dateFormatter14.parse(date);
+            } else if ("15".equals(dateType)) {
+                returnValue = dateFormatter15.parse(date);
+            } else if ("16".equals(dateType)) {
+                returnValue = dateFormatter16.parse(date);
+            } else if ("17".equals(dateType)) {
+                returnValue = dateFormatter17.parse(date);
+            } else if ("18".equals(dateType)) {
+                returnValue = dateFormatter18.parse(date);
+            } else {
+                returnValue = dateFormatter02.parse(date);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("日期转换异常");
+        }
+        return returnValue;
+    }
+
+    /**
+     * 组合查询列表日期字段做格式转换（已在数据库中作转换，暂时不用）<br>
+     *
+     * @param date
+     * @param dateType
+     * @return String
+     */
+    public static String getQueryDateString(Date date, String dateType) {
+        String returnValue = "";
+        if (date != null) {
+            if ("01".equals(dateType)) {
+                returnValue = dateFormatter01.format(date);
+            } else if ("02".equals(dateType)) {
+                returnValue = dateFormatter02.format(date);
+            } else if ("03".equals(dateType)) {
+                returnValue = dateFormatter03.format(date);
+            } else if ("04".equals(dateType)) {
+                returnValue = dateFormatter04.format(date);
+            } else if ("05".equals(dateType)) {
+                returnValue = dateFormatter05.format(date);
+            } else if ("06".equals(dateType)) {
+                returnValue = dateFormatter06.format(date);
+            } else if ("07".equals(dateType)) {
+                returnValue = dateFormatter07.format(date);
+            } else if ("08".equals(dateType)) {
+                returnValue = dateFormatter08.format(date);
+            } else if ("09".equals(dateType)) {
+                returnValue = dateFormatter09.format(date);
+            } else if ("10".equals(dateType)) {
+                returnValue = dateFormatter10.format(date);
+            } else if ("11".equals(dateType)) {
+                returnValue = dateFormatter11.format(date);
+            } else if ("12".equals(dateType)) {
+                returnValue = dateFormatter12.format(date);
+            } else if ("13".equals(dateType)) {
+                returnValue = dateFormatter13.format(date);
+            } else if ("14".equals(dateType)) {
+                returnValue = dateFormatter14.format(date);
+            } else if ("15".equals(dateType)) {
+                returnValue = dateFormatter15.format(date);
+            } else if ("16".equals(dateType)) {
+                returnValue = dateFormatter16.format(date);
+            } else if ("17".equals(dateType)) {
+                returnValue = dateFormatter17.format(date);
+            } else if ("18".equals(dateType)) {
+                returnValue = dateFormatter18.format(date);
+            } else {
+                returnValue = dateFormatter02.format(date);
+            }
+        }
+        return returnValue;
+    }
+
+    public static String getDate(int age) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        Date dt = null;
+        try {
+            dt = sdf.parse(sdf.format(new Date()));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(dt);
+        rightNow.add(Calendar.YEAR, age);
+        Date dt1 = rightNow.getTime();
+        return sdf.format(dt1);
+    }
+
+    /**
+     * 比较2个日期间大小
+     *
+     * @param DATE1
+     * @param DATE2
+     * @return
+     */
+    public static boolean compareDate(String DATE1, String DATE2) {
+        try {
+            Date dt1 = dateFormatter02.parse(DATE1);
+            Date dt2 = dateFormatter02.parse(DATE2);
+            if (dt1.getTime() >= dt2.getTime()) {
+                return false;
+            } else if (dt1.getTime() <= dt2.getTime()) {
+                return true;
+            }
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
+        return false;
+    }
+
+    //当前时间加定义天数
+    public static String dateAdd(String dateTime, Integer sum) {
+        String format = "";
+        Date parse = null;
+        try {
+            parse = defaultDateTimeFormatter.parse(dateTime);
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(parse);//设置起时间
+            //cal.add(Calendar.YEAR, 1);//增加一年
+            cal.add(Calendar.DATE, sum);//增加一天
+            //cd.add(Calendar.DATE, -10);//减10天
+            //cd.add(Calendar.MONTH, n);//增加一个月
+            format = defaultDateTimeFormatter.format(cal.getTime());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return format;
+    }
+
+
+    //计算两个时间之间的差
+    public static long  dateDay(String date1, String date2) {
+        long days = 0;
+        try {
+            Date parse1 = defaultDateFormatter.parse(date1);
+            Date parse2 = defaultDateFormatter.parse(date2);
+            Long time = null;
+            if (parse1.before(parse2)) {
+                time = parse2.getTime() - parse1.getTime();
+            } else {
+                time = parse1.getTime() - parse2.getTime();
+            }
+            days = time / (1000 * 60 * 60 * 24);//天
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return days;
+    }
+
+
+    public static String dateGap(String date1, String date2) {
+        String zqsc = "";
+        try {
+            Date parse1 = defaultDateTimeFormatter.parse(date1);
+            Date parse2 = defaultDateTimeFormatter.parse(date2);
+            Long time = null;
+            if (parse1.before(parse2)) {
+                time = parse2.getTime() - parse1.getTime();
+            } else {
+                time = parse1.getTime() - parse2.getTime();
+            }
+            long days = time / (1000 * 60 * 60 * 24);//天
+            long hours = (time - days * (1000 * 60 * 60 * 24)) / (1000 * 60 * 60);//小时
+            long minutes = (time - days * (1000 * 60 * 60 * 24) - hours * (1000 * 60 * 60)) / (1000 * 60);//分钟
+            zqsc = days + "天" + hours + "小时" + minutes + "分钟";
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return zqsc;
+    }
+
+
+    /**
+     * 日期转星期
+     *
+     * @param datetime
+     * @return
+     */
+    public static String dateToWeek(String datetime) {
+        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+        String[] weekDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
+        // 获得一个日历
+        Calendar cal = Calendar.getInstance();
+        Date datet = null;
+        try {
+            datet = f.parse(datetime);
+            cal.setTime(datet);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        // 指示一个星期中的某天。
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0) {
+            w = 0;
+        }
+        return weekDays[w];
+    }
+
+    /**
+     * 添加月份
+     *
+     * @param sourceDate
+     * @param month
+     * @return
+     */
+    public static Date stepMonth(Date sourceDate, int month) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(sourceDate);
+        c.add(Calendar.MONTH, month);
+        return c.getTime();
+    }
+
+    // 获取本月的最后一天
+    public static Date getThisMonthLastDay() {
+        Date date = new Date();
+        // 获取下个月的第一天
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.DAY_OF_MONTH, +1);
+        cal.roll(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
+    // 获取指定月的最后一天
+    public static Date getThisMonthLastDay(String time) {
+        time = time + "-01";
+        Date date = strToDate(time, "01");
+        // 获取下个月的第一天
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.DAY_OF_MONTH, +1);
+        cal.roll(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
+    /**
+     * 日期转星期
+     *
+     * @param date
+     * @return
+     */
+    public static int dateToWeek(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        int w = cal.get(Calendar.DAY_OF_WEEK) - 1;
+        if (w < 0) w = 0;
+        return w;
+    }
+
+    public static Long dayTimeInMillis() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        return calendar.getTimeInMillis();
+
+    }
+
+
+    /**
+     * 当前时间加定义天数
+     * @param type 01 年 02 月 03 天
+     * @param sum
+     * @return
+     */
+    public static String dateTypeAdd(String type, Integer sum) {
+        String format = "";
+        try {
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(new Date());//设置起时间
+            if("01".equals(type)) {
+                cal.add(Calendar.YEAR, sum);//增加一年
+            } else if("02".equals(type)) {
+                cal.add(Calendar.MONTH, sum);//增加一月
+            } else if("03".equals(type)) {
+                cal.add(Calendar.DATE, sum);//增加一天
+            } else if("04".equals(type)) {
+                cal.add(Calendar.YEAR, -sum);//减一年
+            } else if("05".equals(type)) {
+                cal.add(Calendar.MONTH, -sum);//减一月
+            } else if("06".equals(type)) {
+                cal.add(Calendar.DATE, -sum);//增减一天
+            }
+            //cd.add(Calendar.DATE, -10);//减10天
+            format = defaultDateFormatter.format(cal.getTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return format;
+    }
+
+    //日期转化方法
+    /**
+     * mongo 日期查询isodate
+     * @param dateStr
+     * @return
+     */
+    public static Date dateToISODate(String dateStr){
+        //T代表后面跟着时间，Z代表UTC统一时间
+        Date date = formatD(dateStr);
+        SimpleDateFormat format =
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
+        String isoDate = format.format(date);
+        try {
+            return format.parse(isoDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+    /** 时间格式(yyyy-MM-dd HH:mm:ss) */
+    public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+    public static Date formatD(String dateStr){
+        return formatD(dateStr,DATE_TIME_PATTERN);
+    }
+
+    public static Date formatD(String dateStr ,String format)  {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+        Date ret = null ;
+        try {
+            ret = simpleDateFormat.parse(dateStr) ;
+        } catch (ParseException e) {
+            //
+        }
+        return ret;
+    }
+
+
+
+    public static void main(String[] args) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String format = simpleDateFormat.format(new Date(1693584000000L));
+
+
+        System.out.println();
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DecimalUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DecimalUtils.java
new file mode 100644
index 0000000..93dc60f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DecimalUtils.java
@@ -0,0 +1,251 @@
+package com.mosty.base.utils;
+
+import java.math.BigDecimal;
+
+public class DecimalUtils {
+
+    /**
+     * 加法计算（result = x + y）
+     *
+     * @param x 被加数（可为null）
+     * @param y 加数 （可为null）
+     * @return 和 （可为null）
+     * @author 大脑补丁 on 2020-03-30 14:52
+     */
+    public static BigDecimal add(BigDecimal x, BigDecimal y) {
+        if (x == null) {
+            return y;
+        }
+        if (y == null) {
+            return x;
+        }
+        return x.add(y);
+    }
+
+    /**
+     * 加法计算（result = a + b + c + d）
+     *
+     * @param a 被加数（可为null）
+     * @param b 加数（可为null）
+     * @param c 加数（可为null）
+     * @param d 加数（可为null）
+     * @return BigDecimal （可为null）
+     * @author 大脑补丁 on 2020-03-30 22:17
+     */
+    public static BigDecimal add(BigDecimal a, BigDecimal b, BigDecimal c, BigDecimal d) {
+        BigDecimal ab = add(a, b);
+        BigDecimal cd = add(c, d);
+        return add(ab, cd);
+    }
+
+    /**
+     * 累加计算(result=x + result)
+     *
+     * @param x      被加数（可为null）
+     * @param result 和 （可为null,若被加数不为为null，result默认值为0）
+     * @return result 和 （可为null）
+     * @author 大脑补丁 on 2020-03-30 14:16
+     */
+    public static BigDecimal accumulate(BigDecimal x, BigDecimal result) {
+        if (x == null) {
+            return result;
+        }
+        if (result == null) {
+            result = new BigDecimal("0");
+        }
+        return result.add(x);
+    }
+
+    /**
+     * 减法计算(result = x - y)
+     *
+     * @param x 被减数（可为null）
+     * @param y 减数（可为null）
+     * @return BigDecimal 差 （可为null）
+     * @author 大脑补丁 on 2020-03-30 14:47
+     */
+    public static BigDecimal subtract(BigDecimal x, BigDecimal y) {
+        if (x == null || y == null) {
+            return null;
+        }
+        return x.subtract(y);
+    }
+
+    /**
+     * 乘法计算(result = x × y)
+     *
+     * @param x 乘数(可为null)
+     * @param y 乘数(可为null)
+     * @return BigDecimal 积
+     * @author 大脑补丁 on 2020-03-30 14:14
+     */
+    public static BigDecimal multiply(BigDecimal x, BigDecimal y) {
+        if (x == null || y == null) {
+            return null;
+        }
+        return x.multiply(y);
+    }
+
+    /**
+     * 除法计算(result = x ÷ y)
+     *
+     * @param x 被除数（可为null）
+     * @param y 除数（可为null）
+     * @return 商 （可为null,四舍五入，默认保留20位小数）
+     * @author 大脑补丁 on 2020-03-30 14:15
+     */
+    public static BigDecimal divide(BigDecimal x, BigDecimal y) {
+        if (x == null || y == null || y.compareTo(BigDecimal.ZERO) == 0) {
+            return null;
+        }
+        // 结果为0.000..时，不用科学计数法展示
+        return stripTrailingZeros(x.divide(y, 20, BigDecimal.ROUND_HALF_UP));
+    }
+
+    /**
+     * 转为字符串(防止返回可续计数法表达式)
+     *
+     * @param x 要转字符串的小数
+     * @return String
+     * @author 大脑补丁 on 2020-03-30 15:08
+     */
+    public static String toPlainString(BigDecimal x) {
+        if (x == null) {
+            return null;
+        }
+        return x.toPlainString();
+    }
+
+    /**
+     * 保留小数位数
+     *
+     * @param x     目标小数
+     * @param scale 要保留小数位数
+     * @return BigDecimal 结果四舍五入
+     * @author 大脑补丁 on 2020-03-30 15:17
+     */
+    public static BigDecimal scale(BigDecimal x, int scale) {
+        if (x == null) {
+            return null;
+        }
+        return x.setScale(scale, BigDecimal.ROUND_HALF_UP);
+    }
+
+    /**
+     * 整型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(Integer x) {
+        if (x == null) {
+            return null;
+        }
+        return new BigDecimal(x.toString());
+    }
+
+    /**
+     * 长整型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(Long x) {
+        if (x == null) {
+            return null;
+        }
+        return new BigDecimal(x.toString());
+    }
+
+    /**
+     * 双精度型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(Double x) {
+        if (x == null) {
+            return null;
+        }
+        return new BigDecimal(x.toString());
+    }
+
+    /**
+     * 单精度型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(Float x) {
+        if (x == null) {
+            return null;
+        }
+        return new BigDecimal(x.toString());
+    }
+
+    /**
+     * 字符串型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(String x) {
+        if (x == null || x.equals("")) {
+            return null;
+        }
+        return new BigDecimal(x);
+    }
+
+    /**
+     * 对象类型转为BigDecimal
+     *
+     * @param x(可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:24
+     */
+    public static BigDecimal toBigDecimal(Object x) {
+        if (x == null) {
+            return null;
+        }
+        BigDecimal result = null;
+        try {
+            result = toBigDecimal(x.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 倍数计算，用于单位换算
+     *
+     * @param x        目标数(可为null)
+     * @param multiple 倍数 (可为null)
+     * @return BigDecimal (可为null)
+     * @author 大脑补丁 on 2020-03-30 22:43
+     */
+    public static BigDecimal multiple(BigDecimal x, Integer multiple) {
+        if (x == null || multiple == null) {
+            return null;
+        }
+        return DecimalUtils.multiply(x, toBigDecimal(multiple));
+    }
+
+    /**
+     * 去除小数点后的0（如: 输入1.000返回1）
+     *
+     * @param x 目标数(可为null)
+     * @return
+     */
+    public static BigDecimal stripTrailingZeros(BigDecimal x) {
+        if (x == null) {
+            return null;
+        }
+        return x.stripTrailingZeros();
+    }
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DistanceUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DistanceUtils.java
new file mode 100644
index 0000000..5e56d8e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DistanceUtils.java
@@ -0,0 +1,179 @@
+package com.mosty.base.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.vividsolutions.jts.geom.Coordinate;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @title: DistanceUtils
+ * @projectName gxag-location
+ * @description:
+ * @date 2022/9/28 17:33
+ */
+public class DistanceUtils {
+
+    // 获取里程
+    public static Integer getLc(Integer lc, BigDecimal jd, BigDecimal wd, BigDecimal oldjd, BigDecimal oldwd) {
+        if (jd == null || wd == null || oldjd == null || oldwd == null) {
+            return 0;
+        }
+        Double distance = Kit.getDistance(jd.doubleValue(), wd.doubleValue(), oldjd.doubleValue(), oldwd.doubleValue());
+        return lc != null ? lc + distance.intValue() : distance.intValue();
+    }
+
+    // 获取时长
+    public static Integer getSc(Date kssj) {
+        if (ObjectUtils.isEmpty(kssj)) {
+            return 0;
+        }
+        long kssjTime = kssj.getTime();
+        //开始时间一定比当时时间小 如果是大于存在服务器时间或程序问题
+        long time = new Date().getTime();
+        long diff = time - kssjTime;
+        long min = diff / 1000;
+        int jssc = (int) min;
+        return jssc < 0 ? 0 : jssc;
+    }
+
+//    public static void main(String[] args) {
+//        Integer lc = getLc(null, new BigDecimal(104.629516), new BigDecimal(31.4615), new BigDecimal(104.629633), new BigDecimal(31.461166));
+//        System.out.println(lc);
+//    }
+
+    // 解析面类型为经纬度数组
+    public static List<BigDecimal[]> decodePolygon(String pl) {
+        if (ObjectUtils.isNotEmpty(pl)) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            List<String> coors = Arrays.asList(pl.split(","));
+            for (int i = 0; i < coors.size(); i = i + 2) {
+                BigDecimal[] temp = new BigDecimal[2];
+                temp[0] = new BigDecimal(coors.get(i));
+                temp[1] = new BigDecimal(coors.get(i + 1));
+                list.add(temp);
+            }
+            return list;
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+        String qy = "105.08283381,31.09182000," +
+                "105.08308400,31.09183069," +
+                "105.08308400,31.09183069," +
+                "105.08352520,31.09181746," +
+                "105.08403028,31.09178977," +
+                "105.08445001,31.09177617," +
+                "105.08478592,31.09173813," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.08122472,31.09391269," +
+                "105.09222463,31.08812880," +
+                "105.09211951,31.08791985," +
+                "105.09188968,31.08782107," +
+                "105.08838999,31.08990676," +
+                "105.09193248,31.08739517," +
+                "105.09193248,31.08739517," +
+                "105.09191169,31.08760434," +
+                "105.08866940,31.08967261," +
+                "105.08866940,31.08967261," +
+                "105.08866940,31.08967261," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.08831087,31.08979221," +
+                "105.09189786,31.08792470," +
+                "105.09175706,31.08767202," +
+                "105.09207374,31.08755983," +
+                "105.09186500,31.08738026," +
+                "105.09174475,31.08754481," +
+                "105.08842643,31.08965210," +
+                "105.08842643,31.08965210," +
+                "105.08842643,31.08965210," +
+                "105.09215019,31.08786811," +
+                "105.09206409,31.08767975," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.08867765,31.08982211," +
+                "105.09096204,31.09112914," +
+                "105.08757731,31.09327023," +
+                "105.09073557,31.09094196," +
+                "105.09089116,31.09108252," +
+                "105.09090319,31.09149281," +
+                "105.09059818,31.09154073," +
+                "105.09002922,31.09155509," +
+                "105.08939941,31.09156200," +
+                "105.08908552,31.09156787," +
+                "105.08601745,31.09370367," +
+                "105.08601745,31.09370367";
+        List<BigDecimal[]> bigDecimals = decodePolygon(qy);
+        int lc = 0;
+        for (int i = 0; i < bigDecimals.size() -1; i++) {
+            BigDecimal[] bigDecimals1 = bigDecimals.get(i);
+            BigDecimal[] bigDecimals2 = bigDecimals.get(i + 1);
+            System.out.println(i);
+            lc =  getLc(lc, bigDecimals1[0], bigDecimals1[1], bigDecimals2[0], bigDecimals2[1]);
+        }
+        System.out.println(lc);
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DoubleUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DoubleUtil.java
new file mode 100644
index 0000000..3d74f80
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/DoubleUtil.java
@@ -0,0 +1,17 @@
+package com.mosty.base.utils;
+
+public class DoubleUtil {
+
+	/**
+	 * Utility function to consistently compute the remainder over all java versions
+	 * @param value
+	 * @param remainder
+	 * @return
+	 */
+	public static double remainderWithFix(double value, int remainder) {
+		double res = value % remainder;
+		
+		// Fix for lower java versions, since the remainder-operator (%) changed in one version, idk which one
+		return res < 0 ? res += remainder : res;
+	}
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHash.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHash.java
new file mode 100644
index 0000000..1b9a71a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHash.java
@@ -0,0 +1,549 @@
+/*
+ * Copyright 2010, Silvio Heuberger @ IFS www.ifs.hsr.ch
+ *
+ * This code is release under the Apache License 2.0.
+ * You should have received a copy of the license
+ * in the LICENSE file. If you have not, see
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.mosty.base.utils;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+@SuppressWarnings("javadoc")
+public final class GeoHash implements Comparable<GeoHash>, Serializable {
+	public static final int MAX_BIT_PRECISION = 64;
+	public static final int MAX_CHARACTER_PRECISION = 12;
+	
+	private static final long serialVersionUID = -8553214249630252175L;
+	private static final int[] BITS = { 16, 8, 4, 2, 1 };
+	private static final int BASE32_BITS = 5;
+	public static final long FIRST_BIT_FLAGGED = 0x8000000000000000l;
+	private static final char[] base32 = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+
+	private static final int[] decodeArray = new int['z' + 1];
+
+	static {
+		Arrays.fill(decodeArray, -1);
+		int sz = base32.length;
+		for (int i = 0; i < sz; i++) {
+			decodeArray[base32[i]] = i;
+		}
+	}
+
+	protected long bits = 0;
+	private WGS84Point point;
+
+	private BoundingBox boundingBox;
+
+	protected byte significantBits = 0;
+
+	protected GeoHash() {
+	}
+
+	/**
+	 * This method uses the given number of characters as the desired precision
+	 * value. The hash can only be 64bits long, thus a maximum precision of 12
+	 * characters can be achieved.
+	 */
+	public static GeoHash withCharacterPrecision(double latitude, double longitude, int numberOfCharacters) {
+		if (numberOfCharacters > MAX_CHARACTER_PRECISION) {
+			throw new IllegalArgumentException("A geohash can only be " + MAX_CHARACTER_PRECISION + " character long.");
+		}
+		int desiredPrecision = (numberOfCharacters * 5 <= 60) ? numberOfCharacters * 5 : 60;
+		return new GeoHash(latitude, longitude, desiredPrecision);
+	}
+
+	/**
+	 * create a new {@link GeoHash} with the given number of bits accuracy. This
+	 * at the same time defines this hash's bounding box.
+	 */
+	public static GeoHash withBitPrecision(double latitude, double longitude, int numberOfBits) {
+		if (numberOfBits < 0) {
+			throw new IllegalArgumentException("A Geohash can't be of negative bits long!");
+		}
+		if (numberOfBits > MAX_BIT_PRECISION) {
+			throw new IllegalArgumentException("A Geohash can only be " + MAX_BIT_PRECISION + " bits long!");
+		}
+		if (Math.abs(latitude) > 90.0 || Math.abs(longitude) > 180.0) {
+			throw new IllegalArgumentException("Can't have lat/lon values out of (-90,90)/(-180/180)");
+		}
+		return new GeoHash(latitude, longitude, numberOfBits);
+	}
+
+	public static GeoHash fromBinaryString(String binaryString) {
+		GeoHash geohash = new GeoHash();
+		for (int i = 0; i < binaryString.length(); i++) {
+			if (binaryString.charAt(i) == '1') {
+				geohash.addOnBitToEnd();
+			} else if (binaryString.charAt(i) == '0') {
+				geohash.addOffBitToEnd();
+			} else {
+				throw new IllegalArgumentException(binaryString + " is not a valid geohash as a binary string");
+			}
+		}
+		geohash.bits <<= (MAX_BIT_PRECISION - geohash.significantBits);
+		long[] latitudeBits = geohash.getRightAlignedLatitudeBits();
+		long[] longitudeBits = geohash.getRightAlignedLongitudeBits();
+		return geohash.recombineLatLonBitsToHash(latitudeBits, longitudeBits);
+	}
+
+	/**
+	 * build a new {@link GeoHash} from a base32-encoded {@link String}.<br>
+	 * This will also set up the hashes bounding box and other values, so it can
+	 * also be used with functions like within().
+	 */
+	public static GeoHash fromGeohashString(String geohash) {
+		double[] latitudeRange = { -90.0, 90.0 };
+		double[] longitudeRange = { -180.0, 180.0 };
+
+		boolean isEvenBit = true;
+		GeoHash hash = new GeoHash();
+
+		for (int i = 0; i < geohash.length(); i++) {
+			char c = geohash.charAt(i);
+			int cd;
+			if (c >= decodeArray.length || (cd = decodeArray[c]) < 0) {
+				throw new IllegalArgumentException("Invalid character character '" + c + "' in geohash '"+geohash+"'!");
+			}
+			for (int j = 0; j < BASE32_BITS; j++) {
+				int mask = BITS[j];
+				if (isEvenBit) {
+					divideRangeDecode(hash, longitudeRange, (cd & mask) != 0);
+				} else {
+					divideRangeDecode(hash, latitudeRange, (cd & mask) != 0);
+				}
+				isEvenBit = !isEvenBit;
+			}
+		}
+
+		double latitude = (latitudeRange[0] + latitudeRange[1]) / 2;
+		double longitude = (longitudeRange[0] + longitudeRange[1]) / 2;
+
+		hash.point = new WGS84Point(latitude, longitude);
+		setBoundingBox(hash, latitudeRange, longitudeRange);
+		hash.bits <<= (MAX_BIT_PRECISION - hash.significantBits);
+		return hash;
+	}
+
+	public static GeoHash fromLongValue(long hashVal, int significantBits) {
+		double[] latitudeRange = { -90.0, 90.0 };
+		double[] longitudeRange = { -180.0, 180.0 };
+
+		boolean isEvenBit = true;
+		GeoHash hash = new GeoHash();
+
+		String binaryString = Long.toBinaryString(hashVal);
+		while (binaryString.length() < MAX_BIT_PRECISION) {
+			binaryString = "0" + binaryString;
+		}
+		for (int j = 0; j < significantBits; j++) {
+			if (isEvenBit) {
+				divideRangeDecode(hash, longitudeRange, binaryString.charAt(j) != '0');
+			} else {
+				divideRangeDecode(hash, latitudeRange, binaryString.charAt(j) != '0');
+			}
+			isEvenBit = !isEvenBit;
+		}
+
+		double latitude = (latitudeRange[0] + latitudeRange[1]) / 2;
+		double longitude = (longitudeRange[0] + longitudeRange[1]) / 2;
+
+		hash.point = new WGS84Point(latitude, longitude);
+		setBoundingBox(hash, latitudeRange, longitudeRange);
+		hash.bits <<= (MAX_BIT_PRECISION - hash.significantBits);
+		return hash;
+	}
+
+	/**
+	 * This method uses the given number of characters as the desired precision
+	 * value. The hash can only be 64bits long, thus a maximum precision of 12
+	 * characters can be achieved.
+	 */
+	public static String geoHashStringWithCharacterPrecision(double latitude, double longitude, int numberOfCharacters) {
+		GeoHash hash = withCharacterPrecision(latitude, longitude, numberOfCharacters);
+		return hash.toBase32();
+	}
+
+	private GeoHash(double latitude, double longitude, int desiredPrecision) {
+		point = new WGS84Point(latitude, longitude);
+		desiredPrecision = Math.min(desiredPrecision, MAX_BIT_PRECISION);
+
+		boolean isEvenBit = true;
+		double[] latitudeRange = { -90, 90 };
+		double[] longitudeRange = { -180, 180 };
+
+		while (significantBits < desiredPrecision) {
+			if (isEvenBit) {
+				divideRangeEncode(longitude, longitudeRange);
+			} else {
+				divideRangeEncode(latitude, latitudeRange);
+			}
+			isEvenBit = !isEvenBit;
+		}
+
+		setBoundingBox(this, latitudeRange, longitudeRange);
+		bits <<= (MAX_BIT_PRECISION - desiredPrecision);
+	}
+
+	private static void setBoundingBox(GeoHash hash, double[] latitudeRange, double[] longitudeRange) {
+		hash.boundingBox = new BoundingBox(latitudeRange[0], latitudeRange[1], longitudeRange[0], longitudeRange[1]);
+	}
+
+	public GeoHash next(int step) {
+		return fromOrd(ord() + step, significantBits);
+	}
+
+	public GeoHash next() {
+		return next(1);
+	}
+
+	public GeoHash prev() {
+		return next(-1);
+	}
+
+	public long ord() {
+		int insignificantBits = MAX_BIT_PRECISION - significantBits;
+		return bits >>> insignificantBits;
+	}
+
+	/**
+	 * Returns the number of characters that represent this hash.
+	 * 
+	 * @throws IllegalStateException
+	 *             when the hash cannot be encoded in base32, i.e. when the
+	 *             precision is not a multiple of 5.
+	 */
+	public int getCharacterPrecision() {
+		if (significantBits % 5 != 0) {
+			throw new IllegalStateException(
+					"precision of GeoHash is not divisble by 5: " + this);
+		}
+		return significantBits / 5;
+	}
+
+	public static GeoHash fromOrd(long ord, int significantBits) {
+		int insignificantBits = MAX_BIT_PRECISION - significantBits;
+		return fromLongValue(ord << insignificantBits, significantBits);
+	}
+
+	/**
+	 * Counts the number of geohashes contained between the two (ie how many
+	 * times next() is called to increment from one to two) This value depends
+	 * on the number of significant bits.
+	 * 
+	 * @param one
+	 * @param two
+	 * @return number of steps
+	 */
+	public static long stepsBetween(GeoHash one, GeoHash two) {
+		if (one.significantBits() != two.significantBits()) {
+			throw new IllegalArgumentException(
+					"It is only valid to compare the number of steps between two hashes if they have the same number of significant bits");
+		}
+		return two.ord() - one.ord();
+	}
+
+	private void divideRangeEncode(double value, double[] range) {
+		double mid = (range[0] + range[1]) / 2;
+		if (value >= mid) {
+			addOnBitToEnd();
+			range[0] = mid;
+		} else {
+			addOffBitToEnd();
+			range[1] = mid;
+		}
+	}
+
+	private static void divideRangeDecode(GeoHash hash, double[] range, boolean b) {
+		double mid = (range[0] + range[1]) / 2;
+		if (b) {
+			hash.addOnBitToEnd();
+			range[0] = mid;
+		} else {
+			hash.addOffBitToEnd();
+			range[1] = mid;
+		}
+	}
+
+	/**
+	 * returns the 8 adjacent hashes for this one. They are in the following
+	 * order:<br>
+	 * N, NE, E, SE, S, SW, W, NW
+	 */
+	public GeoHash[] getAdjacent() {
+		GeoHash northern = getNorthernNeighbour();
+		GeoHash eastern = getEasternNeighbour();
+		GeoHash southern = getSouthernNeighbour();
+		GeoHash western = getWesternNeighbour();
+		return new GeoHash[] { northern, northern.getEasternNeighbour(), eastern, southern.getEasternNeighbour(),
+				southern,
+				southern.getWesternNeighbour(), western, northern.getWesternNeighbour() };
+	}
+
+	/**
+	 * how many significant bits are there in this {@link GeoHash}?
+	 */
+	public int significantBits() {
+		return significantBits;
+	}
+
+	public long longValue() {
+		return bits;
+	}
+
+	/**
+	 * get the base32 string for this {@link GeoHash}.<br>
+	 * this method only makes sense, if this hash has a multiple of 5
+	 * significant bits.
+	 * 
+	 * @throws IllegalStateException
+	 *             when the number of significant bits is not a multiple of 5.
+	 */
+	public String toBase32() {
+		if (significantBits % 5 != 0) {
+			throw new IllegalStateException("Cannot convert a geohash to base32 if the precision is not a multiple of 5.");
+		}
+		StringBuilder buf = new StringBuilder();
+
+		long firstFiveBitsMask = 0xf800000000000000l;
+		long bitsCopy = bits;
+		int partialChunks = (int) Math.ceil(((double) significantBits / 5));
+
+		for (int i = 0; i < partialChunks; i++) {
+			int pointer = (int) ((bitsCopy & firstFiveBitsMask) >>> 59);
+			buf.append(base32[pointer]);
+			bitsCopy <<= 5;
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * returns true iff this is within the given geohash bounding box.
+	 */
+	public boolean within(GeoHash boundingBox) {
+		return (bits & boundingBox.mask()) == boundingBox.bits;
+	}
+
+	/**
+	 * find out if the given point lies within this hashes bounding box.<br>
+	 * <i>Note: this operation checks the bounding boxes coordinates, i.e. does
+	 * not use the {@link GeoHash}s special abilities.s</i>
+	 */
+	public boolean contains(WGS84Point point) {
+		return boundingBox.contains(point);
+	}
+
+	/**
+	 * returns the {@link WGS84Point} that was originally used to set up this.<br>
+	 * If it was built from a base32-{@link String}, this is the center point of
+	 * the bounding box.
+	 */
+	public WGS84Point getOriginatingPoint() {
+		return point;
+	}
+
+	/**
+	 * return the center of this {@link GeoHash}s bounding box. this is rarely
+	 * the same point that was used to build the hash.
+	 */
+	public WGS84Point getBoundingBoxCenter() {
+		return boundingBox.getCenter();
+	}
+
+	public BoundingBox getBoundingBox() {
+		return boundingBox;
+	}
+
+	public boolean enclosesCircleAroundPoint(WGS84Point point, double radius) {
+		return false;
+	}
+
+	protected GeoHash recombineLatLonBitsToHash(long[] latBits, long[] lonBits) {
+		GeoHash hash = new GeoHash();
+		boolean isEvenBit = false;
+		latBits[0] <<= (MAX_BIT_PRECISION - latBits[1]);
+		lonBits[0] <<= (MAX_BIT_PRECISION - lonBits[1]);
+		double[] latitudeRange = { -90.0, 90.0 };
+		double[] longitudeRange = { -180.0, 180.0 };
+
+		for (int i = 0; i < latBits[1] + lonBits[1]; i++) {
+			if (isEvenBit) {
+				divideRangeDecode(hash, latitudeRange, (latBits[0] & FIRST_BIT_FLAGGED) == FIRST_BIT_FLAGGED);
+				latBits[0] <<= 1;
+			} else {
+				divideRangeDecode(hash, longitudeRange, (lonBits[0] & FIRST_BIT_FLAGGED) == FIRST_BIT_FLAGGED);
+				lonBits[0] <<= 1;
+			}
+			isEvenBit = !isEvenBit;
+		}
+		hash.bits <<= (MAX_BIT_PRECISION - hash.significantBits);
+		setBoundingBox(hash, latitudeRange, longitudeRange);
+		hash.point = hash.boundingBox.getCenter();
+		return hash;
+	}
+
+	public GeoHash getNorthernNeighbour() {
+		long[] latitudeBits = getRightAlignedLatitudeBits();
+		long[] longitudeBits = getRightAlignedLongitudeBits();
+		latitudeBits[0] += 1;
+		latitudeBits[0] = maskLastNBits(latitudeBits[0], latitudeBits[1]);
+		return recombineLatLonBitsToHash(latitudeBits, longitudeBits);
+	}
+
+	public GeoHash getSouthernNeighbour() {
+		long[] latitudeBits = getRightAlignedLatitudeBits();
+		long[] longitudeBits = getRightAlignedLongitudeBits();
+		latitudeBits[0] -= 1;
+		latitudeBits[0] = maskLastNBits(latitudeBits[0], latitudeBits[1]);
+		return recombineLatLonBitsToHash(latitudeBits, longitudeBits);
+	}
+
+	public GeoHash getEasternNeighbour() {
+		long[] latitudeBits = getRightAlignedLatitudeBits();
+		long[] longitudeBits = getRightAlignedLongitudeBits();
+		longitudeBits[0] += 1;
+		longitudeBits[0] = maskLastNBits(longitudeBits[0], longitudeBits[1]);
+		return recombineLatLonBitsToHash(latitudeBits, longitudeBits);
+	}
+
+	public GeoHash getWesternNeighbour() {
+		long[] latitudeBits = getRightAlignedLatitudeBits();
+		long[] longitudeBits = getRightAlignedLongitudeBits();
+		longitudeBits[0] -= 1;
+		longitudeBits[0] = maskLastNBits(longitudeBits[0], longitudeBits[1]);
+		return recombineLatLonBitsToHash(latitudeBits, longitudeBits);
+	}
+
+	protected long[] getRightAlignedLatitudeBits() {
+		long copyOfBits = bits << 1;
+		long value = extractEverySecondBit(copyOfBits, getNumberOfLatLonBits()[0]);
+		return new long[] { value, getNumberOfLatLonBits()[0] };
+	}
+
+	protected long[] getRightAlignedLongitudeBits() {
+		long copyOfBits = bits;
+		long value = extractEverySecondBit(copyOfBits, getNumberOfLatLonBits()[1]);
+		return new long[] { value, getNumberOfLatLonBits()[1] };
+	}
+
+	private long extractEverySecondBit(long copyOfBits, int numberOfBits) {
+		long value = 0;
+		for (int i = 0; i < numberOfBits; i++) {
+			if ((copyOfBits & FIRST_BIT_FLAGGED) == FIRST_BIT_FLAGGED) {
+				value |= 0x1;
+			}
+			value <<= 1;
+			copyOfBits <<= 2;
+		}
+		value >>>= 1;
+		return value;
+	}
+
+	protected int[] getNumberOfLatLonBits() {
+		if (significantBits % 2 == 0) {
+			return new int[] { significantBits / 2, significantBits / 2 };
+		} else {
+			return new int[] { significantBits / 2, significantBits / 2 + 1 };
+		}
+	}
+
+	protected final void addOnBitToEnd() {
+		significantBits++;
+		bits <<= 1;
+		bits = bits | 0x1;
+	}
+
+	protected final void addOffBitToEnd() {
+		significantBits++;
+		bits <<= 1;
+	}
+
+	@Override
+	public String toString() {
+		if (significantBits % 5 == 0) {
+			return String.format("%s -> %s -> %s", padLeft(Long.toBinaryString(bits), 64, "0"), boundingBox, toBase32());
+		} else {
+			return String.format("%s -> %s, bits: %d", padLeft(Long.toBinaryString(bits), 64, "0"), boundingBox, significantBits);
+		}
+	}
+
+	private static String padLeft(String s, int n, String pad) {
+		return String.format("%" + n + "s", s).replace(" ", pad);
+	}
+
+	public String toBinaryString() {
+		StringBuilder bui = new StringBuilder();
+		long bitsCopy = bits;
+		for (int i = 0; i < significantBits; i++) {
+			if ((bitsCopy & FIRST_BIT_FLAGGED) == FIRST_BIT_FLAGGED) {
+				bui.append('1');
+			} else {
+				bui.append('0');
+			}
+			bitsCopy <<= 1;
+		}
+		return bui.toString();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) {
+			return true;
+		}
+		if (obj instanceof GeoHash) {
+			GeoHash other = (GeoHash) obj;
+			if (other.significantBits == significantBits && other.bits == bits) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		int f = 17;
+		f = 31 * f + (int) (bits ^ (bits >>> 32));
+		f = 31 * f + significantBits;
+		return f;
+	}
+
+	/**
+	 * return a long mask for this hashes significant bits.
+	 */
+	private long mask() {
+		if (significantBits == 0) {
+			return 0;
+		} else {
+			long value = FIRST_BIT_FLAGGED;
+			value >>= (significantBits - 1);
+			return value;
+		}
+	}
+
+	private long maskLastNBits(long value, long n) {
+		long mask = 0xffffffffffffffffl;
+		mask >>>= (MAX_BIT_PRECISION - n);
+		return value & mask;
+	}
+
+	@Override
+	public int compareTo(GeoHash o) {
+		int bitsCmp = Long.compare(bits ^ FIRST_BIT_FLAGGED, o.bits ^ FIRST_BIT_FLAGGED);
+		if (bitsCmp != 0) {
+			return bitsCmp;
+		} else {
+			return Integer.compare(significantBits, o.significantBits);
+		}
+	}
+
+//	public static void main(String[] args) {
+//		GeoHash gh = GeoHash.fromGeohashString("wm64dqg2hj1w7hwxbpbpbpxbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpbpb");
+//		WGS84Point poit = gh.getBoundingBoxCenter();
+//		WGS84Point centet = gh.boundingBox.getCenter();
+//		System.out.println(JSONObject.toJSONString(poit));
+//	}
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHashKit.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHashKit.java
new file mode 100644
index 0000000..dfbaefa
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/GeoHashKit.java
@@ -0,0 +1,139 @@
+package com.mosty.base.utils;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ * 经纬度相关工具
+ **/
+public class GeoHashKit {
+    private static final char[] _base32 = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
+
+    private final static Map<Character, Integer> _decodemap = new HashMap<>();
+
+    private static final int[] bits = {16, 8, 4, 2, 1};
+
+    static {
+        int sz = _base32.length;
+        for (int i = 0; i < sz; i++) {
+            _decodemap.put(_base32[i], i);
+        }
+    }
+
+
+    public static void main(String[] args) {
+        String gc1 = encode(new BigDecimal("39.916527"), new BigDecimal("116.397128"));
+        System.out.println(gc1);
+        BigDecimal[] gd1 = decode(gc1);
+        System.out.println(gd1[0] + ", " + gd1[1]);
+    }
+
+
+    /**
+     * 经纬度换算geoHash
+     *
+     * @param lat
+     * @param lon
+     * @return
+     */
+    public static String encode(BigDecimal lon, BigDecimal lat) {
+        double latitude = lat.doubleValue();
+        double longitude = lon.doubleValue();
+        double[] lat_interval = {-90.0, 90.0};
+        double[] lon_interval = {-180.0, 180.0};
+        StringBuilder geohash = new StringBuilder();
+        boolean is_even = true;
+        int bit = 0, ch = 0;
+        int precision = 100;
+        while (geohash.length() < precision) {
+            double mid;
+            if (is_even) {
+                mid = (lon_interval[0] + lon_interval[1]) / 2;
+                if (longitude > mid) {
+                    ch |= bits[bit];
+                    lon_interval[0] = mid;
+                } else {
+                    lon_interval[1] = mid;
+                }
+            } else {
+                mid = (lat_interval[0] + lat_interval[1]) / 2;
+                if (latitude > mid) {
+                    ch |= bits[bit];
+                    lat_interval[0] = mid;
+                } else {
+                    lat_interval[1] = mid;
+                }
+            }
+            is_even = !is_even;
+            if (bit < 4) {
+                bit++;
+            } else {
+                geohash.append(_base32[ch]);
+                bit = 0;
+                ch = 0;
+            }
+        }
+        return geohash.toString();
+    }
+
+
+    public static BigDecimal[] decode(String geohash) {
+        double[] ge = decode_exactly(geohash);
+        double lat, lon, lat_err, lon_err;
+        lat = ge[0];
+        lon = ge[1];
+        lat_err = ge[2];
+        lon_err = ge[3];
+        double lat_precision = Math.max(1, Math.round(-Math.log10(lat_err))) - 1;
+        double lon_precision = Math.max(1, Math.round(-Math.log10(lon_err))) - 1;
+        lat = getPrecision(lat, lat_precision);
+        lon = getPrecision(lon, lon_precision);
+        return new BigDecimal[]{new BigDecimal(lat), new BigDecimal(lon)};
+    }
+
+
+    public static double[] decode_exactly(String geohash) {
+        double[] lat_interval = {-90.0, 90.0};
+        double[] lon_interval = {-180.0, 180.0};
+        double lat_err = 90.0;
+        double lon_err = 180.0;
+        boolean is_even = true;
+        int sz = geohash.length();
+        int bsz = bits.length;
+        double latitude, longitude;
+        for (int i = 0; i < sz; i++) {
+            int cd = _decodemap.get(geohash.charAt(i));
+            for (int mask : bits) {
+                if (is_even) {
+                    lon_err /= 2;
+                    if ((cd & mask) != 0) {
+                        lon_interval[0] = (lon_interval[0] + lon_interval[1]) / 2;
+                    } else {
+                        lon_interval[1] = (lon_interval[0] + lon_interval[1]) / 2;
+                    }
+                } else {
+                    lat_err /= 2;
+                    if ((cd & mask) != 0) {
+                        lat_interval[0] = (lat_interval[0] + lat_interval[1]) / 2;
+                    } else {
+                        lat_interval[1] = (lat_interval[0] + lat_interval[1]) / 2;
+                    }
+                }
+                is_even = !is_even;
+            }
+        }
+        latitude = (lat_interval[0] + lat_interval[1]) / 2;
+        longitude = (lon_interval[0] + lon_interval[1]) / 2;
+        return new double[]{latitude, longitude, lat_err, lon_err};
+    }
+
+
+    static double getPrecision(double x, double precision) {
+        double base = Math.pow(10, -precision);
+        double diff = x % base;
+        return x - diff;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/IDCardUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/IDCardUtil.java
new file mode 100644
index 0000000..19048e7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/IDCardUtil.java
@@ -0,0 +1,208 @@
+package com.mosty.base.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Description：身份证号的util
+ * @Author:
+ * @Date: Created in 11:26 2019-03-27
+ * @Modified By:
+ */
+public class IDCardUtil {
+    /**
+     * 15位身份证号
+     */
+    private static final Integer FIFTEEN_ID_CARD = 15;
+    /**
+     * 18位身份证号
+     */
+    private static final Integer EIGHTEEN_ID_CARD = 18;
+    private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+    /**
+     * 根据身份证号获取性别
+     *
+     * @param IDCard
+     * @return
+     */
+    public static Integer getSexInteger(String IDCard) {
+        Integer sex = 3;
+        if (StringUtils.isNotBlank(IDCard)) {
+            //15位身份证号
+            if (IDCard.length() == FIFTEEN_ID_CARD) {
+                if (Integer.parseInt(IDCard.substring(14, 15)) % 2 == 0) {
+                    sex = 2;
+                } else {
+                    sex = 1;
+                }
+                //18位身份证号
+            } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
+                // 判断性别
+                if (Integer.parseInt(IDCard.substring(16).substring(0, 1)) % 2 == 0) {
+                    sex = 2;
+                } else {
+                    sex = 1;
+                }
+            }
+        }
+        return sex;
+    }
+
+    /**
+     * 根据身份证号获取性别
+     *
+     * @param IDCard
+     * @return
+     */
+    public static String getSex(String IDCard) {
+        String sex = "";
+        if (StringUtils.isNotBlank(IDCard)) {
+            //15位身份证号
+            if (IDCard.length() == FIFTEEN_ID_CARD) {
+                if (Integer.parseInt(IDCard.substring(14, 15)) % 2 == 0) {
+                    sex = "女";
+                } else {
+                    sex = "男";
+                }
+                //18位身份证号
+            } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
+                // 判断性别
+                if (Integer.parseInt(IDCard.substring(16).substring(0, 1)) % 2 == 0) {
+                    sex = "女";
+                } else {
+                    sex = "男";
+                }
+            }
+        }
+        return sex;
+    }
+
+    /**
+     * 根据身份证号获取年龄
+     *
+     * @param IDCard
+     * @return
+     */
+    public static Integer getAge(String IDCard) {
+        Integer age = 0;
+        Date date = new Date();
+        if (StringUtils.isNotBlank(IDCard) && isValid(IDCard)) {
+            //15位身份证号
+            if (IDCard.length() == FIFTEEN_ID_CARD) {
+                // 身份证上的年份(15位身份证为1980年前的)
+                String uyear = "19" + IDCard.substring(6, 8);
+                // 身份证上的月份
+                String uyue = IDCard.substring(8, 10);
+                // 当前年份
+                String fyear = format.format(date).substring(0, 4);
+                // 当前月份
+                String fyue = format.format(date).substring(5, 7);
+                if (Integer.parseInt(uyue) <= Integer.parseInt(fyue)) {
+                    age = Integer.parseInt(fyear) - Integer.parseInt(uyear) + 1;
+                    // 当前用户还没过生
+                } else {
+                    age = Integer.parseInt(fyear) - Integer.parseInt(uyear);
+                }
+                //18位身份证号
+            } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
+                // 身份证上的年份
+                String year = IDCard.substring(6).substring(0, 4);
+                // 身份证上的月份
+                String yue = IDCard.substring(10).substring(0, 2);
+                // 当前年份
+                String fyear = format.format(date).substring(0, 4);
+                // 当前月份
+                String fyue = format.format(date).substring(5, 7);
+                // 当前月份大于用户出身的月份表示已过生日
+                if (Integer.parseInt(yue) <= Integer.parseInt(fyue)) {
+                    age = Integer.parseInt(fyear) - Integer.parseInt(year) + 1;
+                    // 当前用户还没过生日
+                } else {
+                    age = Integer.parseInt(fyear) - Integer.parseInt(year);
+                }
+            }
+        }
+        return age;
+    }
+
+    /**
+     * 获取出生日期  yyyy年MM月dd日
+     *
+     * @param IDCard
+     * @return
+     */
+    public static String getBirthday(String IDCard) {
+        String birthday = "";
+        String year = "";
+        String month = "";
+        String day = "";
+        if (StringUtils.isNotBlank(IDCard)) {
+            //15位身份证号
+            if (IDCard.length() == FIFTEEN_ID_CARD) {
+                // 身份证上的年份(15位身份证为1980年前的)
+                year = "19" + IDCard.substring(6, 8);
+                //身份证上的月份
+                month = IDCard.substring(8, 10);
+                //身份证上的日期
+                day = IDCard.substring(10, 12);
+                //18位身份证号
+            } else if (IDCard.length() == EIGHTEEN_ID_CARD) {
+                // 身份证上的年份
+                year = IDCard.substring(6).substring(0, 4);
+                // 身份证上的月份
+                month = IDCard.substring(10).substring(0, 2);
+                //身份证上的日期
+                day = IDCard.substring(12).substring(0, 2);
+            }
+            birthday = year + "-" + month + "-" + day;
+        }
+        return birthday;
+    }
+
+    /**
+     * 身份证验证
+     *
+     * @param id 号码内容
+     * @return 是否有效
+     */
+    public static boolean isValid(String id) {
+        Boolean validResult = true;
+        //校验长度只能为15或18
+        int len = id.length();
+        if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD) {
+            validResult = false;
+        }
+        //校验生日
+        if (!validDate(id)) {
+            validResult = false;
+        }
+        return validResult;
+    }
+
+    /**
+     * 校验生日
+     *
+     * @param id
+     * @return
+     */
+    private static boolean validDate(String id) {
+        try {
+            if (id.length() < 15) {
+                return false;
+            }
+            String birth = id.length() == 15 ? "19" + id.substring(6, 12) : id.substring(6, 14);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            Date birthDate = sdf.parse(birth);
+            if (!birth.equals(sdf.format(birthDate))) {
+                return false;
+            }
+        } catch (ParseException e) {
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/JtsUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/JtsUtils.java
new file mode 100644
index 0000000..e3e8260
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/JtsUtils.java
@@ -0,0 +1,243 @@
+package com.mosty.base.utils;
+
+import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jts.linearref.LengthIndexedLine;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+public class JtsUtils {
+    private static final double EARTH_RADIUS = 6378137;
+    public static GeometryFactory factory = new GeometryFactory(new PrecisionModel(100000000000d));
+    private static final DecimalFormat df = new DecimalFormat("0.00000000000");
+    private static final DecimalFormat format = new DecimalFormat("0.0000");
+
+    public static String toEwkt(Geometry geom) {
+        if (geom == null) {
+            return null;
+        }
+        String type = geom.getGeometryType().toUpperCase();
+        switch (type) {
+            case "POINT": {
+                Coordinate coor = geom.getCoordinate();
+                return "POINT(" + formatCoordinate(coor) + ")";
+            }
+            case "MULTIPOINT": {
+                return coordinateToEwkt("MULTIPOINT(", geom.getCoordinates(), ")");
+            }
+            case "LINESTRING": {
+                return coordinateToEwkt("LINESTRING(", geom.getCoordinates(), ")");
+            }
+            case "POLYGON": {
+                return coordinateToEwkt("POLYGON((", geom.getCoordinates(), "))");
+            }
+            case "MULTILINESTRING": {
+                StringBuffer sb = new StringBuffer();
+                sb.append("MULTILINESTRING(");
+                sb.append(multiGeometryFormat(geom));
+                sb.append(")");
+                return sb.toString();
+            }
+            case "MULTIPOLYGON": {
+                StringBuffer sb = new StringBuffer();
+                sb.append("MULTIPOLYGON(");
+                sb.append(multiGeometryFormat(geom));
+                sb.append(")");
+                return sb.toString();
+            }
+            case "GEOMETRYCOLLECTION": {
+                StringBuffer sb = new StringBuffer();
+                int num = geom.getNumGeometries();
+                sb.append("GEOMETRYCOLLECTION(");
+                for (int j = 0; j < num; j++) {
+                    Geometry element = geom.getGeometryN(j);
+                    String subType = element.getGeometryType().toUpperCase();
+                    if ("POINT".equals(subType)) {
+                        sb.append("POINT(" + formatCoordinate(element.getCoordinate()) + ")");
+                    } else if ("LINESTRING".equals(subType)) {
+                        sb.append(coordinateToEwkt("LINESTRING(", element.getCoordinates(), ")"));
+                    } else if ("POLYGON".equals(subType)) {
+                        sb.append(coordinateToEwkt("POLYGON((", element.getCoordinates(), "))"));
+                    }
+                    if (j < num - 1) {
+                        sb.append(",");
+                    }
+                }
+                sb.append(")");
+                return sb.toString();
+            }
+        }
+        return null;
+    }
+
+    private static String formatCoordinate(Coordinate coordinate) {
+        return df.format(coordinate.x) + " " + df.format(coordinate.y);
+    }
+
+    public static String coordinateToEwkt(String prefix, Coordinate[] coordinates, String suffix) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(prefix);
+        boolean append = false;
+        for (Coordinate coordinate : coordinates) {
+            if (append) {
+                sb.append(",");
+            }
+            sb.append(formatCoordinate(coordinate));
+            append = true;
+        }
+        sb.append(suffix);
+        return sb.toString();
+    }
+
+    public static String multiGeometryFormat(Geometry geom) {
+        StringBuffer sb = new StringBuffer();
+        int num = geom.getNumGeometries();
+        for (int i = 0; i < num; i++) {
+            Geometry g = geom.getGeometryN(i);
+            sb.append(coordinateToEwkt("((", g.getCoordinates(), "))"));
+            if (i < num - 1) {
+                sb.append(",");
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取两组成的线的几何中心
+     *
+     * @param s 起始点
+     * @param e 结束点
+     * @return
+     */
+    public static Coordinate getCentroid(Coordinate s, Coordinate e) {// 获取两点组成的线的图心
+        if (s.x == e.x && s.y == e.y) {
+            return s;
+        }
+        LineString ls = factory.createLineString(new Coordinate[]{s, e});
+        Point cp = ls.getCentroid();
+        return cp.getCoordinate();
+    }
+
+    /**
+     * 获取多个离散几何点的几何中心
+     *
+     * @param coors
+     * @return
+     */
+    public static Coordinate getCentroid(Coordinate[] coors) {// 获取多个离散点的图心
+        MultiPoint mp = factory.createMultiPoint(coors);
+        return mp.getCentroid().getCoordinate();
+    }
+
+    /**
+     * 获取面
+     *
+     * @param list
+     * @return
+     */
+    public static Polygon getPolygon(List<BigDecimal[]> list) {
+        Coordinate[] coors = new Coordinate[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            BigDecimal[] item = list.get(i);
+            Coordinate coor = new Coordinate();
+            coor.x = item[0].doubleValue();
+            coor.y = item[1].doubleValue();
+            coors[i] = coor;
+        }
+        return factory.createPolygon(coors);
+    }
+
+    /**
+     * 获取线
+     *
+     * @param list [[x,y],[x1,y1],[x2,y2]....]
+     * @return
+     */
+    public static LineString createLine(List<BigDecimal[]> list) {
+        Coordinate[] coors = new Coordinate[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            BigDecimal[] item = list.get(i);
+            Coordinate coor = new Coordinate();
+            coor.x = item[0].doubleValue();
+            coor.y = item[1].doubleValue();
+            coors[i] = coor;
+        }
+        return factory.createLineString(coors);
+    }
+
+    /**
+     * 获取点
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    public static Point getPoint(BigDecimal x, BigDecimal y) {
+        Coordinate coor = new Coordinate(x.doubleValue(), y.doubleValue());
+        return factory.createPoint(coor);
+    }
+
+    // 解析面类型为经纬度数组
+    public static List<BigDecimal[]> decodePolygon(Polygon pl) {
+        if (pl != null) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            Coordinate[] coors = pl.getCoordinates();
+            if (coors.length > 0) {
+                for (Coordinate coor : coors) {
+                    BigDecimal[] temp = new BigDecimal[2];
+                    temp[0] = new BigDecimal(coor.x);
+                    temp[1] = new BigDecimal(coor.y);
+                    list.add(temp);
+                }
+            }
+            return list;
+        }
+        return null;
+    }
+
+
+
+    public static List<BigDecimal[]> decodeLine(LineString lineString) {
+        if (lineString != null) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            Coordinate[] coors = lineString.getCoordinates();
+            if (coors.length > 0) {
+                for (Coordinate coor : coors) {
+                    BigDecimal[] temp = new BigDecimal[2];
+                    temp[0] = new BigDecimal(coor.x);
+                    temp[1] = new BigDecimal(coor.y);
+                    list.add(temp);
+                }
+            }
+            return list;
+        }
+        return null;
+    }
+
+    // 解析面类型为经纬度数组
+    public static List<BigDecimal[]> decodeLineString(LineString line) {
+        if (line != null) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            Coordinate[] coors = line.getCoordinates();
+            if (coors.length > 0) {
+                for (Coordinate coor : coors) {
+                    BigDecimal[] temp = new BigDecimal[2];
+                    temp[0] = new BigDecimal(coor.x);
+                    temp[1] = new BigDecimal(coor.y);
+                    list.add(temp);
+                }
+            }
+            return list;
+        }
+        return null;
+    }
+
+    public static Coordinate getCenter(LineString line) {
+        LengthIndexedLine indexedLine = new LengthIndexedLine(line);
+        double[] index = indexedLine.indicesOf(line);
+        Coordinate mid = indexedLine.extractPoint((index[0] + index[1]) / 2);
+        return mid;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Kit.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Kit.java
new file mode 100644
index 0000000..6f4013b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/Kit.java
@@ -0,0 +1,226 @@
+package com.mosty.base.utils;
+
+import com.mosty.common.base.exception.BusinessException;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.builder.BuilderException;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+import org.locationtech.jts.geom.Polygon;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 其他的一些工具类
+ */
+public class Kit {
+    /**
+     * 对象转Map
+     *
+     * @param obj
+     * @return
+     * @throws IllegalAccessException
+     */
+    public static Map beanToMap(Object obj) throws IllegalAccessException {
+        Map<String, Object> map = new HashMap<>();
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            field.setAccessible(true);
+            String value = field.get(obj) != null ? field.get(obj).toString() : "";
+            map.put(field.getName(), value);
+        }
+        return map;
+    }
+
+    /**
+     * 文件转base64
+     *
+     * @param file
+     * @return
+     */
+    public static String fileToBase64(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException("图片不能为空!");
+        }
+        // String fileName = file.getOriginalFilename();
+        // String fileType = fileName.substring(fileName.lastIndexOf("."));
+        String contentType = file.getContentType();
+        byte[] imageBytes;
+        String base64EncoderImg;
+        try {
+            imageBytes = file.getBytes();
+            BASE64Encoder base64Encoder = new BASE64Encoder();
+//            base64EncoderImg = "data:" + contentType + ";base64," + base64Encoder.encode(imageBytes);
+            base64EncoderImg = base64Encoder.encode(imageBytes);
+            base64EncoderImg = base64EncoderImg.replaceAll("[\\s*\t\n\r]", "");
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new BuilderException("图片转base64异常");
+        }
+        return base64EncoderImg;
+    }
+
+
+    /**
+     * 取得两个经纬度之间的距离<br>
+     *
+     * @param longitude1 坐标点1经度
+     * @param latitude1  坐标点1纬度
+     * @param longitude2 坐标点2经度
+     * @param latitude2  坐标点2纬度
+     * @return
+     */
+    public static Double getDistance(double longitude1, double latitude1,
+                                     double longitude2, double latitude2) {
+        double distance = 0;
+        if (longitude1 != 0 && latitude1 != 0 && longitude2 != 0
+                && latitude2 != 0) {
+            double radius = 6378140; // 假设地球为正球形，直径为6378140米
+            double PI = Math.PI;
+            distance = (2 * Math.atan2(Math
+                    .sqrt(Math.sin((latitude1 - latitude2) * PI / 180
+                            / 2)
+                            * Math.sin((latitude1 - latitude2) * PI
+                            / 180 / 2)
+                            + Math.cos(latitude2 * PI / 180)
+                            * Math.cos(latitude1 * PI / 180)
+                            * Math.sin((longitude1 - longitude2) * PI
+                            / 180 / 2)
+                            * Math.sin((longitude1 - longitude2) * PI
+                            / 180 / 2)), Math.sqrt(1
+                    - Math
+                    .sin((latitude1 - latitude2) * PI / 180 / 2)
+                    * Math
+                    .sin((latitude1 - latitude2) * PI / 180 / 2)
+                    + Math.cos(latitude2 * PI / 180)
+                    * Math.cos(latitude1 * PI / 180)
+                    * Math.sin((longitude1 - longitude2) * PI / 180
+                    / 2)
+                    * Math.sin((longitude1 - longitude2) * PI / 180
+                    / 2))))
+                    * radius;
+            distance = Math.round(distance * 100); // 取两位小数
+            distance = distance / 100;
+        }
+        return distance;
+    }
+
+    // unicode编码转中文
+    public static String decodeUnicode(String dataStr) {
+        int start = 0;
+        int end = 0;
+        StringBuilder buffer = new StringBuilder();
+        while (start > -1) {
+            end = dataStr.indexOf("\\x", start + 2);
+            String charStr = "";
+            if (end == -1) {
+                charStr = dataStr.substring(start + 2, dataStr.length());
+            } else {
+                charStr = dataStr.substring(start + 2, end);
+            }
+            char letter = (char) Integer.parseInt(charStr, 16); // 16进制parse整形字符串。
+            buffer.append(letter);
+            start = end;
+        }
+        return buffer.toString();
+    }
+
+
+    // 将字符串中的unicode编码转换成中文
+    public static String unicodeToStr(String str) {
+        if (StringUtils.isBlank(str)) {
+            return str;
+        }
+        Pattern pattern = Pattern.compile("(\\\\u(\\p{XDigit}{4}))");
+        Matcher matcher = pattern.matcher(str);
+        char ch;
+        while (matcher.find()) {
+            ch = (char) Integer.parseInt(matcher.group(2), 16);
+            str = str.replace(matcher.group(1), ch + "");
+        }
+        return str;
+    }
+
+    /**
+     * 判断点在范围内
+     *
+     * @param coordinates
+     * @param isPoint
+     * @return
+     */
+    public static boolean isInGeometry(Coordinate[] coordinates, String isPoint) {
+        if (coordinates[0].x != coordinates[coordinates.length - 1].x || coordinates[0].y != coordinates[coordinates.length - 1].y) {
+            coordinates[coordinates.length - 1] = new Coordinate(coordinates[0].x, coordinates[0].y);
+        }
+        String[] sp = isPoint.split(",");
+        double xx = Double.parseDouble(sp[0]);
+        double yy = Double.parseDouble(sp[1]);
+        //点是否在多边形内判断
+        Coordinate coordinate = new Coordinate(xx, yy);
+        GeometryFactory gf = new GeometryFactory();
+        Point point = gf.createPoint(coordinate);
+        Polygon polygon = gf.createPolygon(coordinates);
+        if (point.within(polygon) || point.intersects(polygon)) {
+            return true;
+        }
+        return false;
+    }
+
+    // 检查经纬度是否合法
+    public static boolean checkJwd(BigDecimal jd, BigDecimal wd) {
+        if (jd == null || wd == null) return true;
+        if (jd.doubleValue() > 180L || jd.doubleValue() < -180L) {
+            return false;
+        }
+        return !(wd.doubleValue() > 90L) && !(wd.doubleValue() < -90L);
+    }
+
+    // 判断字符串是否为数值
+    public static boolean isNumber(String str) {
+        for (int i = 0; i < str.length(); i++) {
+            if (!Character.isDigit(str.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // 解析面类型为经纬度数组
+    public static List<BigDecimal[]> decodePolygon(String pl) {
+        if (ObjectUtils.isNotEmpty(pl)) {
+            List<BigDecimal[]> list = new ArrayList<>();
+            List<String> coors = Arrays.asList(pl.split(","));
+            for (int i = 0; i < coors.size(); i = i + 2) {
+                BigDecimal[] temp = new BigDecimal[2];
+                temp[0] = new BigDecimal(coors.get(i));
+                temp[1] = new BigDecimal(coors.get(i + 1));
+                list.add(temp);
+            }
+            return list;
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+
+        String qy = "104.72283588722,31.51256561279,104.72484217957,31.5102159977,104.72811447456,31.50651454926,104.7266660817,31.50549530983,104.72650514916,31.50521636009,104.7263978608,31.50503396988,104.72636567429,31.50476574898,104.7270845063,31.50304913521,104.72724543884,31.50257706642,104.72740637138,31.50194406509,104.72771750763,31.49861812592,104.72804758698,31.49434804916,104.72813341767,31.49299621582,104.72907755524,31.48911237717,104.72954962403,31.48640871048,104.73090522923,31.48658037186,104.73222487606,31.48667156696,104.74315378815,31.487159729,104.7430919297,31.48764252663,104.74313484505,31.488468647,104.74319921806,31.48914456367,104.74175903946,31.49587154388,104.74122259766,31.4987039566,104.74095689133,31.49990558624,104.74064575508,31.50073170662,104.73997805268,31.50192260742,104.73699040711,31.50544166565,104.73321385682,31.51020526886,104.73123975098,31.51200771332,104.72544617951,31.51453971863,104.72283588722,31.51256561279";
+        List<BigDecimal[]> bigDecimals = decodePolygon(qy);
+        Coordinate[] coordinates = new Coordinate[bigDecimals.size()];
+        for (int i = 0; i < bigDecimals.size(); i++) {
+            BigDecimal[] jwd = bigDecimals.get(i);
+            Coordinate coor = new Coordinate();
+            coor.x = jwd[0].doubleValue();
+            coor.y = jwd[1].doubleValue();
+            coordinates[i] = coor;
+        }
+        System.out.println(Kit.isInGeometry(coordinates, 104.72283588722 + "," + 31.51256561279));
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/OkHttpUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/OkHttpUtils.java
new file mode 100644
index 0000000..e182b7f
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/OkHttpUtils.java
@@ -0,0 +1,389 @@
+package com.mosty.base.utils;
+
+import com.alibaba.fastjson.JSON;
+import okhttp3.*;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+public class OkHttpUtils {
+    private static volatile OkHttpClient okHttpClient = null;
+    private static volatile Semaphore semaphore = null;
+    private Map<String, String> headerMap;
+    private Map<String, Object> paramMap;
+    private String url;
+    private Request.Builder request;
+
+    /**
+     * 初始化okHttpClient，并且允许https访问
+     */
+    private OkHttpUtils() {
+        if (okHttpClient == null) {
+            synchronized (OkHttpUtils.class) {
+                if (okHttpClient == null) {
+                    TrustManager[] trustManagers = buildTrustManagers();
+                    okHttpClient = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS).readTimeout(20, TimeUnit.SECONDS).sslSocketFactory(createSSLSocketFactory(trustManagers), (X509TrustManager) trustManagers[0]).hostnameVerifier((hostName, session) -> true).retryOnConnectionFailure(true).build();
+                    addHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+                }
+            }
+        }
+    }
+
+    /**
+     * 用于异步请求时，控制访问线程数，返回结果
+     *
+     * @return
+     */
+    private static Semaphore getSemaphoreInstance() {
+        //只能1个线程同时访问
+        synchronized (OkHttpUtils.class) {
+            if (semaphore == null) {
+                semaphore = new Semaphore(0);
+            }
+        }
+        return semaphore;
+    }
+
+    /**
+     * 创建OkHttpUtils
+     *
+     * @return
+     */
+    public static OkHttpUtils builder() {
+        return new OkHttpUtils();
+    }
+
+    /**
+     * 添加url
+     *
+     * @param url
+     * @return
+     */
+    public OkHttpUtils url(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * 添加参数
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addParam(String key, Object value) {
+        if (paramMap == null) {
+            paramMap = new LinkedHashMap<>(16);
+        }
+        paramMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 添加请求头
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addHeader(String key, String value) {
+        if (headerMap == null) {
+            headerMap = new LinkedHashMap<>(16);
+        }
+        headerMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 初始化get方法
+     *
+     * @return
+     */
+    public OkHttpUtils get() {
+        request = new Request.Builder().get();
+        StringBuilder urlBuilder = new StringBuilder(url);
+        if (paramMap != null) {
+            urlBuilder.append("?");
+            try {
+                for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
+                    urlBuilder.append(URLEncoder.encode(entry.getKey(), "utf-8")).append("=").append(URLEncoder.encode(entry.getValue().toString(), "utf-8")).append("&");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        }
+        request.url(urlBuilder.toString());
+        return this;
+    }
+
+    /**
+     * 初始化delet方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils delete(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().delete(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils post(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    public OkHttpUtils post(Map<String,Object> data, boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(Map<String,Object> data, boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 同步请求
+     *
+     * @return
+     */
+    public String sync() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            assert response.body() != null;
+            return response.body().string();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "请求失败：" + e.getMessage();
+        }
+    }
+
+    /**
+     * 异步请求，有返回值
+     */
+    public String async() {
+        StringBuilder buffer = new StringBuilder("");
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                buffer.append("请求出错：").append(e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                buffer.append(response.body().string());
+                getSemaphoreInstance().release();
+            }
+        });
+        try {
+            getSemaphoreInstance().acquire();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * 异步请求，带有接口回调
+     *
+     * @param callBack
+     */
+    public void async(ICallBack callBack) {
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callBack.onFailure(call, e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                callBack.onSuccessful(call, response.body().string());
+            }
+        });
+    }
+
+    /**
+     * 为request添加请求头
+     *
+     * @param request
+     */
+    private void setHeader(Request.Builder request) {
+        if (headerMap != null) {
+            try {
+                for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+                    request.addHeader(entry.getKey(), entry.getValue());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 生成安全套接字工厂，用于https请求的证书跳过
+     *
+     * @return
+     */
+    private static SSLSocketFactory createSSLSocketFactory(TrustManager[] trustAllCerts) {
+        SSLSocketFactory ssfFactory = null;
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new SecureRandom());
+            ssfFactory = sc.getSocketFactory();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ssfFactory;
+    }
+
+    private static TrustManager[] buildTrustManagers() {
+        return new TrustManager[]{new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[]{};
+            }
+        }};
+    }
+    /**
+     * 自定义一个接口回调
+     */
+    public interface ICallBack {
+
+        void onSuccessful(Call call, String data);
+
+        void onFailure(Call call, String errorMsg);
+
+    }
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PageUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PageUtils.java
new file mode 100644
index 0000000..8d3795e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PageUtils.java
@@ -0,0 +1,32 @@
+package com.mosty.base.utils;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+public class PageUtils {
+
+    /**
+     * 当前记录起始索引 默认值
+     */
+    public static final int DEFAULT_PAGE_NUM = 1;
+
+    /**
+     * 每页显示记录数 默认值 默认查全部
+     */
+    public static final int DEFAULT_PAGE_SIZE = 50;
+
+
+    /**
+     * 构建 MP 普通分页对象
+     *
+     * @param <T> domain 实体
+     * @return 分页对象
+     */
+    public static <T> IPage<T> buildPage(Integer pageSize, Integer pageNum) {
+        IPage<T> page = new Page<>();
+        page.setSize((pageSize == null || pageSize == 0) ? DEFAULT_PAGE_SIZE : pageSize);
+        page.setCurrent((pageNum == null || pageNum == 0) ? DEFAULT_PAGE_NUM : pageNum);
+        return page;
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PingYinUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PingYinUtil.java
new file mode 100644
index 0000000..7051fc8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PingYinUtil.java
@@ -0,0 +1,95 @@
+package com.mosty.base.utils;
+ 
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+ 
+/**
+ * 拼音工具类
+ * 
+ * @author lsf
+ */
+public class PingYinUtil {
+    /**
+     * 将字符串中的中文转化为拼音,其他字符不变
+     * 
+     * @param inputString
+     * @return
+     */
+    public static String getPingYin(String inputString) {
+        HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat();
+        format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+        format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+        format.setVCharType(HanyuPinyinVCharType.WITH_V);
+ 
+        char[] input = inputString.trim().toCharArray();
+        String output = "";
+ 
+        try {
+            for (int i = 0; i < input.length; i++) {
+                if (Character.toString(input[i]).matches("[\\u4E00-\\u9FA5]+")) {
+                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(input[i], format);
+                    output += temp[0];
+                } else
+                    output += Character.toString(input[i]);
+            }
+        } catch (BadHanyuPinyinOutputFormatCombination e) {
+            e.printStackTrace();
+        }
+        return output;
+    }
+    /**  
+     * 获取汉字串拼音首字母，英文字符不变  
+     * @param chinese 汉字串  
+     * @return 汉语拼音首字母  
+     */  
+    public static String getFirstSpell(String chinese) {   
+            StringBuffer pybf = new StringBuffer();   
+            char[] arr = chinese.toCharArray();   
+            HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();   
+            defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);   
+            defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);   
+            for (int i = 0; i < arr.length; i++) {   
+                    if (arr[i] > 128) {   
+                            try {   
+                                    String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[i], defaultFormat);   
+                                    if (temp != null) {   
+                                            pybf.append(temp[0].charAt(0));   
+                                    }   
+                            } catch (BadHanyuPinyinOutputFormatCombination e) {   
+                                    e.printStackTrace();   
+                            }   
+                    } else {   
+                            pybf.append(arr[i]);   
+                    }   
+            }   
+            return pybf.toString().replaceAll("\\W", "").trim();   
+    }   
+    /**  
+     * 获取汉字串拼音，英文字符不变  
+     * @param chinese 汉字串  
+     * @return 汉语拼音  
+     */  
+    public static String getFullSpell(String chinese) {   
+            StringBuffer pybf = new StringBuffer();   
+            char[] arr = chinese.toCharArray();   
+            HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();   
+            defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);   
+            defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);   
+            for (int i = 0; i < arr.length; i++) {   
+                    if (arr[i] > 128) {   
+                            try {   
+                                    pybf.append(PinyinHelper.toHanyuPinyinStringArray(arr[i], defaultFormat)[0]);   
+                            } catch (BadHanyuPinyinOutputFormatCombination e) {   
+                                    e.printStackTrace();   
+                            }   
+                    } else {   
+                            pybf.append(arr[i]);   
+                    }   
+            }   
+            return pybf.toString();   
+    }  
+}  
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PositionUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PositionUtil.java
new file mode 100644
index 0000000..6ae62fb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/PositionUtil.java
@@ -0,0 +1,197 @@
+package com.mosty.base.utils;
+
+import java.util.Arrays;
+
+/**
+ * 坐标系转换工具类 </br>
+ * WGS84坐标系 地球坐标系，国际通用坐标系 </br>
+ * GCJ02坐标系 火星坐标系，WGS84坐标系加密后的坐标系；Google国内地图、高德、QQ地图 使用 </br>
+ * BD09坐标系 百度坐标系，GCJ02坐标系加密后的坐标系
+ */
+public class PositionUtil {
+
+	private static double pi = 3.1415926535897932384626;
+	private static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	private static double a = 6378245.0;
+	private static double ee = 0.00669342162296594323;
+
+	private static double transformLat(double x, double y) {
+		double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	private static double transformLon(double x, double y) {
+		double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	private static double[] transform(double latitude, double longitude) {
+		if (outOfChina(latitude, longitude)) {
+			return new double[] { latitude, longitude };
+		}
+		double dLat = transformLat(longitude - 105.0, latitude - 35.0);
+		double dLon = transformLon(longitude - 105.0, latitude - 35.0);
+		double radLat = latitude / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = latitude + dLat;
+		double mgLon = longitude + dLon;
+		return new double[] { mgLat, mgLon };
+	}
+
+	private static boolean outOfChina(double latitude, double longitude) {
+		if (longitude < 72.004 || longitude > 137.8347) {
+			return true;
+		}
+		if (latitude < 0.8293 || latitude > 55.8271) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * WGS-84 转 火星坐标系
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] wgs84ToGcj02(double latitude, double longitude) {
+		if (outOfChina(latitude, longitude)) {
+			return new double[] { latitude, longitude };
+		}
+		double dLat = transformLat(longitude - 105.0, latitude - 35.0);
+		double dLon = transformLon(longitude - 105.0, latitude - 35.0);
+		double radLat = latitude / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = latitude + dLat;
+		double mgLon = longitude + dLon;
+		return new double[] { mgLat, mgLon };
+	}
+	
+	public static void main(String[] args) {
+		double[] wgs84ToGcj02 = wgs84ToGcj02(30.55956521, 104.27152736);
+		System.out.println(Arrays.toString(wgs84ToGcj02));
+	}
+
+	/**
+	 * 火星坐标系 (GCJ-02) 转 WGS-84
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] gcj02ToWgs84(double latitude, double longitude) {
+		double[] wgs = transform(latitude, longitude);
+		double longitudetitude = longitude * 2 - wgs[1];
+		double latitudeitude = latitude * 2 - wgs[0];
+		return new double[] { latitudeitude, longitudetitude };
+	}
+
+	/**
+	 * 火星坐标系 (GCJ-02) 转百度坐标系 (BD-09)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] gcj02ToBd09(double latitude, double longitude) {
+		double x = longitude, y = latitude;
+		double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta) + 0.0065;
+		double tempLat = z * Math.sin(theta) + 0.006;
+		double[] wgs = { tempLat, tempLon };
+		return wgs;
+	}
+
+	/**
+	 * 百度坐标系 (BD-09) 转 火星坐标系 (GCJ-02)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] bd09ToGcj02(double latitude, double longitude) {
+		double x = longitude - 0.0065, y = latitude - 0.006;
+		double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta);
+		double tempLat = z * Math.sin(theta);
+		double[] wgs = { tempLat, tempLon };
+		return wgs;
+	}
+
+	/**
+	 * WGS-84 转 百度坐标系 (BD-09)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] wgs84ToBd09(double latitude, double longitude) {
+		double[] gcj02 = wgs84ToGcj02(latitude, longitude);
+		double[] bd09 = gcj02ToBd09(gcj02[0], gcj02[1]);
+		return bd09;
+	}
+
+	/**
+	 * 百度坐标系 (BD-09) 转 WGS-84
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] bd09ToWgs84(double latitude, double longitude) {
+		double[] gcj02 = bd09ToGcj02(latitude, longitude);
+		double[] wgs84 = gcj02ToWgs84(gcj02[0], gcj02[1]);
+		// 保留小数点后六位
+		wgs84[0] = retain6(wgs84[0]);
+		wgs84[1] = retain6(wgs84[1]);
+		return wgs84;
+	}
+
+	/**
+	 * 保留小数点后六位
+	 *
+	 * @param num
+	 * @return
+	 */
+	private static double retain6(double num) {
+		String result = String.format("%.6f", num);
+		return Double.valueOf(result);
+	}
+
+	/**
+	 * 计算两个坐标之间的距离
+	 * 
+	 * @param latitude1
+	 * @param longitude1
+	 * @param latitude2
+	 * @param longitude2
+	 * @return
+	 */
+	public static long getDistance(double latitude1, double longitude1, double latitude2, double longitude2) {
+		double rad = pi / 180.0;
+		double radlatitude1 = latitude1 * rad;
+		double radlatitude2 = latitude2 * rad;
+		double s = 2
+				* Math.asin(Math.sqrt(Math.pow(Math.sin((radlatitude1 - radlatitude2) / 2), 2) + Math.cos(radlatitude1)
+						* Math.cos(radlatitude2) * Math.pow(Math.sin(((longitude1 - longitude2) * rad) / 2), 2)));
+		return Math.round(s * a * 100) / 100;
+	}
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/SystemFiledsAddUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/SystemFiledsAddUtil.java
new file mode 100644
index 0000000..23d41a9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/SystemFiledsAddUtil.java
@@ -0,0 +1,40 @@
+package com.mosty.base.utils;
+
+import com.mosty.base.model.BaseEntity;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+
+public class SystemFiledsAddUtil {
+
+
+//    public static void insertFill(BaseEntity metaObject) {
+//        UserInfo userInfo = UserInfoManager.getUser();
+//
+//        //根据属性名字设置要填充的值
+//        if (metaObject.hasGetter("xtCjip")) {
+//            if (metaObject.getValue("xtCjip") == null) {
+//                this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+//            }
+//        }
+//        //根据属性名字设置要填充的值
+//        if (metaObject.hasGetter("xtSjzt")) {
+//            if (metaObject.getValue("xtSjzt") == null) {
+//                this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+//            }
+//        }
+//        if (metaObject.hasGetter("xtScbz")) {
+//            if (metaObject.getValue("xtScbz") == null) {
+//                this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+//            }
+//        }
+//        if (metaObject.hasGetter("xtCjsj")) {
+//            if (metaObject.getValue("xtCjsj") == null) {
+//                this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+//            }
+//        }
+//    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/UUIDGenerator.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/UUIDGenerator.java
new file mode 100644
index 0000000..62c3aeb
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/UUIDGenerator.java
@@ -0,0 +1,41 @@
+package com.mosty.base.utils;
+
+import java.util.UUID;
+
+public class UUIDGenerator {
+
+	/**
+	 * 获取UUID
+	 * @return
+	 */
+	public static String getUUID() {
+		UUID uuid = UUID.randomUUID();
+		String str = uuid.toString();
+		// 去掉"-"符号
+		str = str.replace("-", "");
+		return str;
+	}
+
+	/**
+	 * 获得指定数量的UUID
+	 * @param number 指定数量
+	 * @return
+	 */
+	public static String[] getUUID(int number) {
+		if (number < 1) {
+			return null;
+		}
+		String[] ss = new String[number];
+		for (int i = 0; i < number; i++) {
+			ss[i] = getUUID();
+		}
+		return ss;
+	}
+
+	public static void main(String[] args) {
+		String[] ss = getUUID(10);
+		for (int i = 0; i < ss.length; i++) {
+			System.out.println("ss[" + i + "]=====" + getUUID());
+		}
+	}
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/WGS84Point.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/WGS84Point.java
new file mode 100644
index 0000000..6c0805c
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/WGS84Point.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010, Silvio Heuberger @ IFS www.ifs.hsr.ch
+ *
+ * This code is release under the Apache License 2.0.
+ * You should have received a copy of the license
+ * in the LICENSE file. If you have not, see
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.mosty.base.utils;
+
+import java.io.Serializable;
+
+/**
+ * {@link WGS84Point} encapsulates coordinates on the earths surface.<br>
+ * Coordinate projections might end up using this class...
+ */
+public class WGS84Point implements Serializable {
+	private static final long serialVersionUID = 7457963026513014856L;
+	private final double longitude;
+	private final double latitude;
+
+	public WGS84Point(double latitude, double longitude) {
+		this.latitude = latitude;
+		this.longitude = longitude;
+		if (Math.abs(latitude) > 90 || Math.abs(longitude) > 180) {
+			throw new IllegalArgumentException("The supplied coordinates " + this + " are out of range.");
+		}
+	}
+
+	public WGS84Point(WGS84Point other) {
+		this(other.latitude, other.longitude);
+	}
+
+	public double getLatitude() {
+		return latitude;
+	}
+
+	public double getLongitude() {
+		return longitude;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("(" + latitude + "," + longitude + ")");
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof WGS84Point) {
+			WGS84Point other = (WGS84Point) obj;
+			return latitude == other.latitude && longitude == other.longitude;
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = 42;
+		long latBits = Double.doubleToLongBits(latitude);
+		long lonBits = Double.doubleToLongBits(longitude);
+		result = 31 * result + (int) (latBits ^ (latBits >>> 32));
+		result = 31 * result + (int) (lonBits ^ (lonBits >>> 32));
+		return result;
+	}
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/getPinYin.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/getPinYin.java
new file mode 100644
index 0000000..85977cf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/getPinYin.java
@@ -0,0 +1,48 @@
+package com.mosty.base.utils;
+
+
+import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
+import net.sourceforge.pinyin4j.PinyinHelper;
+import org.apache.commons.lang3.StringUtils;
+
+
+public class getPinYin {
+    /**
+     * 获取中文拼音
+     *
+     * @param str
+     * @param shortPinyin 为true获取中文拼音首字母
+     * @param retain      为true保留其他字符
+     * @return String
+     */
+    private static String getPinyin(String str, boolean shortPinyin, boolean retain) {
+        if (StringUtils.isBlank(str)) {
+            return "";
+        }
+        StringBuffer pinyinBuffer = new StringBuffer();
+        char[] arr = str.toCharArray();
+        for (char c : arr) {
+            String[] temp = PinyinHelper.toHanyuPinyinStringArray(c);
+            if (ArrayUtils.isNotEmpty(temp)) {
+                if (StringUtils.isNotBlank(temp[0])) {
+                    if (shortPinyin) {
+                        pinyinBuffer.append(temp[0].charAt(0));
+                    } else {
+                        pinyinBuffer.append(temp[0].replaceAll("\\d", ""));
+                    }
+                }
+            } else {
+                if (retain) {
+                    pinyinBuffer.append(c);
+                }
+            }
+        }
+        return pinyinBuffer.toString();
+    }
+
+    public static String getShortPinyin(String str) {
+        return getPinyin(str, true, false);
+    }
+
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ECompare.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ECompare.java
new file mode 100644
index 0000000..25dcded
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ECompare.java
@@ -0,0 +1,21 @@
+package com.mosty.base.utils.mongo.core.constant;
+
+/**
+ * 比较类型
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public enum ECompare {
+
+    EQ,
+    NE,
+    LE,
+    LT,
+    GE,
+    GT,
+    BW,
+    IN,
+    NIN
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/EConditionType.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/EConditionType.java
new file mode 100644
index 0000000..68571e9
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/EConditionType.java
@@ -0,0 +1,14 @@
+package com.mosty.base.utils.mongo.core.constant;
+
+/**
+ * 比较类型
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public enum EConditionType {
+
+    AND,
+    OR
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ESortType.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ESortType.java
new file mode 100644
index 0000000..d2352d0
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/constant/ESortType.java
@@ -0,0 +1,14 @@
+package com.mosty.base.utils.mongo.core.constant;
+
+/**
+ * 排序类型
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public enum ESortType {
+
+    ASC,
+    DESC
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Condition.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Condition.java
new file mode 100644
index 0000000..bb576a7
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Condition.java
@@ -0,0 +1,90 @@
+package com.mosty.base.utils.mongo.core.entity;
+
+import com.mosty.base.utils.mongo.core.constant.ECompare;
+import com.mosty.base.utils.mongo.core.constant.EConditionType;
+import com.mosty.base.utils.mongo.core.wrapper.ConditionWrapper;
+
+import java.util.List;
+
+/**
+ * 条件
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class Condition {
+
+    public Condition() {
+    }
+
+    public Condition(ECompare type, String col, List<Object> args) {
+        this.type = type;
+        this.col = col;
+        this.args = args;
+    }
+
+    /**
+     * 嵌套条件比较类型
+     */
+    private EConditionType conditionType = EConditionType.AND;
+
+    /**
+     * 比较类型
+     */
+    private ECompare type;
+
+    /**
+     * 集合对应的列
+     */
+    private String col;
+
+    /**
+     * 比较值
+     */
+    private List<Object> args;
+
+    /**
+     * 条件包装类
+     */
+    private ConditionWrapper conditionWrapper;
+
+    public EConditionType getConditionType() {
+        return conditionType;
+    }
+
+    public void setConditionType(EConditionType conditionType) {
+        this.conditionType = conditionType;
+    }
+
+    public ECompare getType() {
+        return type;
+    }
+
+    public void setType(ECompare type) {
+        this.type = type;
+    }
+
+    public String getCol() {
+        return col;
+    }
+
+    public void setCol(String col) {
+        this.col = col;
+    }
+
+    public List<Object> getArgs() {
+        return args;
+    }
+
+    public void setArgs(List<Object> args) {
+        this.args = args;
+    }
+
+    public ConditionWrapper getConditionWrapper() {
+        return conditionWrapper;
+    }
+
+    public void setConditionWrapper(ConditionWrapper conditionWrapper) {
+        this.conditionWrapper = conditionWrapper;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Page.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Page.java
new file mode 100644
index 0000000..73bc9a6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/Page.java
@@ -0,0 +1,65 @@
+package com.mosty.base.utils.mongo.core.entity;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 分页数据
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class Page<T> {
+
+    /**
+     * 查询数据列表
+     */
+    private List<T> records = Collections.emptyList();
+
+    /**
+     * 总数
+     */
+    private long total = 0;
+
+    /**
+     * 每页显示条数，默认 10
+     */
+    private int pageSize = 10;
+
+    /**
+     * 当前页
+     */
+    private int pageNum = 1;
+
+    public List<T> getRecords() {
+        return records;
+    }
+
+    public void setRecords(List<T> records) {
+        this.records = records;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SelectField.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SelectField.java
new file mode 100644
index 0000000..f20844b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SelectField.java
@@ -0,0 +1,30 @@
+package com.mosty.base.utils.mongo.core.entity;
+
+/**
+ * 查询的列
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class SelectField {
+
+    /**
+     * 集合对应的列
+     */
+    private String col;
+
+    public SelectField() {
+    }
+
+    public SelectField(String col) {
+        this.col = col;
+    }
+
+    public String getCol() {
+        return col;
+    }
+
+    public void setCol(String col) {
+        this.col = col;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SortCondition.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SortCondition.java
new file mode 100644
index 0000000..83f3ae3
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/entity/SortCondition.java
@@ -0,0 +1,46 @@
+package com.mosty.base.utils.mongo.core.entity;
+
+import com.mosty.base.utils.mongo.core.constant.ESortType;
+
+/**
+ * 排序字段
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class SortCondition {
+
+    /**
+     * 排序类型
+     */
+    private ESortType sortType = ESortType.ASC;
+
+    /**
+     * 集合对应的列
+     */
+    private String col;
+
+    public SortCondition() {
+    }
+
+    public SortCondition(ESortType sortType, String col) {
+        this.sortType = sortType;
+        this.col = col;
+    }
+
+    public ESortType getSortType() {
+        return sortType;
+    }
+
+    public void setSortType(ESortType sortType) {
+        this.sortType = sortType;
+    }
+
+    public String getCol() {
+        return col;
+    }
+
+    public void setCol(String col) {
+        this.col = col;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/EasyMongoService.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/EasyMongoService.java
new file mode 100644
index 0000000..270ce70
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/EasyMongoService.java
@@ -0,0 +1,125 @@
+package com.mosty.base.utils.mongo.core.sdk;
+
+import com.mosty.base.utils.mongo.core.entity.Page;
+import com.mosty.base.utils.mongo.core.wrapper.LambdaQueryWrapper;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * mongo 基础方法接口
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public interface EasyMongoService<I extends Serializable, T> {
+
+    /**
+     * 查询单条数据
+     *
+     * @param queryWrapper 条件构造器
+     * @return 查询到的集合数据
+     */
+    T getOne(LambdaQueryWrapper<T> queryWrapper);
+
+    /**
+     * 保存新的数据
+     *
+     * @param entity 需要保存的实体
+     * @return 是否保存成功
+     */
+    boolean save(T entity);
+
+    /**
+     * 批量保存新的数据 内部递归调用单个保存
+     *
+     * @param entityList 需要保存的数据列表
+     * @return 是否保存成功
+     */
+    boolean saveBatch(Collection<T> entityList);
+
+    /**
+     * 通过ID删除数据
+     *
+     * @param id 数据ID
+     * @return 是否删除成功
+     */
+    boolean removeById(I id);
+
+    /**
+     * 通过条件构建器删除数据
+     *
+     * @param queryWrapper 条件构建器
+     * @return 是否删除成功
+     */
+    boolean remove(LambdaQueryWrapper<T> queryWrapper);
+
+    /**
+     * 通过ID更新数据 只有存在数据的字段才会更新
+     *
+     * @param entity 需要更新的数据
+     * @return 是否更新成功
+     */
+    boolean updateById(T entity);
+
+    /**
+     * 通过条件构造器更新数据 只有存在数据的字段才会更新
+     *
+     * @param entity       需要更新的数据
+     * @param queryWrapper 条件构建起
+     * @return 是否更新成功
+     */
+    boolean update(T entity, LambdaQueryWrapper<T> queryWrapper);
+
+    /**
+     * 通过ID获取数据
+     *
+     * @param id 数据ID
+     * @return 集合中的数据
+     */
+    T getById(I id);
+
+    /**
+     * 通过数据ID集合获取数据集合
+     *
+     * @param idList 数据ID集合
+     * @return 查询到的数据集合
+     */
+    Collection<T> listByIds(Collection<I> idList);
+
+    /**
+     * 通过条件构建起统计数据量
+     *
+     * @param queryWrapper 条件构建起
+     * @return 数据两
+     */
+    long count(LambdaQueryWrapper<T> queryWrapper);
+
+    /**
+     * 通过条件构建起查询列表
+     *
+     * @param queryWrapper 条件构建器
+     * @return 数据集合
+     */
+    List<T> list(LambdaQueryWrapper<T> queryWrapper);
+
+    /**
+     * 通过条件构建起进行分页查询
+     *
+     * @param queryWrapper 条件构建器
+     * @param pageNo       页面
+     * @param pageSize     页面大小
+     * @return 分页对象
+     */
+    Page<T> page(LambdaQueryWrapper<T> queryWrapper, int pageNo, int pageSize);
+
+    /**
+     * 通过条件构建器判断是否存在数据
+     *
+     * @param queryWrapper 条件构建器
+     * @return 是否存在数据
+     */
+    boolean exist(LambdaQueryWrapper<T> queryWrapper);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Compare.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Compare.java
new file mode 100644
index 0000000..e047dcf
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Compare.java
@@ -0,0 +1,205 @@
+package com.mosty.base.utils.mongo.core.sdk.base;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * 查询条件封装
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public interface Compare<LambdaQueryWrapper, R> extends Serializable {
+
+    /**
+     * eq 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper eq(R column, Object val) {
+        return eq(true, column, val);
+    }
+
+    /**
+     * ne 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper ne(R column, Object val) {
+        return ne(true, column, val);
+    }
+
+    /**
+     * le 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper le(R column, Object val) {
+        return le(true, column, val);
+    }
+
+    /**
+     * lt 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper lt(R column, Object val) {
+        return lt(true, column, val);
+    }
+
+    /**
+     * ge 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper ge(R column, Object val) {
+        return ge(true, column, val);
+    }
+
+    /**
+     * gt 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper gt(R column, Object val) {
+        return gt(true, column, val);
+    }
+
+    /**
+     * between 条件构建 左右均包括
+     *
+     * @param column 参与比较的列
+     * @param leftV  左边比较值
+     * @param rightV 右边比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper between(R column, Object leftV, Object rightV) {
+        return between(true, column, leftV, rightV);
+    }
+
+    /**
+     * in 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper in(R column, Collection<Object> val) {
+        return in(true, column, val);
+    }
+
+    /**
+     * notIn 条件构建
+     *
+     * @param column 参与比较的列
+     * @param val    比较值
+     * @return 当前条件构建器
+     */
+    default LambdaQueryWrapper notIn(R column, Collection<Object> val) {
+        return notIn(true, column, val);
+    }
+
+    /**
+     * in 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper eq(boolean condition, R column, Object val);
+
+    /**
+     * ne 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper ne(boolean condition, R column, Object val);
+
+    /**
+     * le 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper le(boolean condition, R column, Object val);
+
+    /**
+     * lt 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper lt(boolean condition, R column, Object val);
+
+    /**
+     * ge 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper ge(boolean condition, R column, Object val);
+
+    /**
+     * gt 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper gt(boolean condition, R column, Object val);
+
+    /**
+     * between 条件构建 左右均包括
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param leftV     左边比较值
+     * @param rightV    右边比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper between(boolean condition, R column, Object leftV, Object rightV);
+
+    /**
+     * in 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper in(boolean condition, R column, Collection<Object> val);
+
+    /**
+     * notIn 条件构建
+     *
+     * @param condition 是否使用该条件进行构建
+     * @param column    参与比较的列
+     * @param val       比较值
+     * @return 当前条件构建器
+     */
+    LambdaQueryWrapper notIn(boolean condition, R column, Collection<Object> val);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Func.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Func.java
new file mode 100644
index 0000000..33d6988
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Func.java
@@ -0,0 +1,76 @@
+package com.mosty.base.utils.mongo.core.sdk.base;
+
+import java.io.Serializable;
+
+/**
+ * 功能接口
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public interface Func<T, LambdaQueryWrapper, R extends SFunction<T, ?>> extends Serializable {
+
+    /**
+     * 升序 排序接口
+     *
+     * @param column 参与排序的列
+     * @return 当前构建器
+     */
+    default LambdaQueryWrapper orderByAsc(R column) {
+        return orderByAsc(true, column);
+    }
+
+    /**
+     * 降序 排序接口
+     *
+     * @param column 参与排序的列
+     * @return 当前构建器
+     */
+    default LambdaQueryWrapper orderByDesc(R column) {
+        return orderByDesc(true, column);
+    }
+
+    /**
+     * 升序 排序接口
+     *
+     * @param condition 是否参与排序
+     * @param column    参与排序的列
+     * @return 当前构建器
+     */
+    LambdaQueryWrapper orderByAsc(boolean condition, R column);
+
+    /**
+     * 降序 排序接口
+     *
+     * @param condition 是否参与排序
+     * @param column    参与排序的列
+     * @return 当前构建器
+     */
+    LambdaQueryWrapper orderByDesc(boolean condition, R column);
+
+    /**
+     * 分页skip接口
+     *
+     * @param skip 跳过多少条数据
+     * @return 当前构建器
+     */
+    LambdaQueryWrapper skip(Long skip);
+
+
+    /**
+     * 分页limit接口
+     *
+     * @param limit 最多取多少条数据
+     * @return 当前构建器
+     */
+    LambdaQueryWrapper limit(Integer limit);
+
+    /**
+     * 需要查询的列,不设置默认查询全部
+     *
+     * @param columns 查询的列
+     * @return 当前构建器
+     */
+    LambdaQueryWrapper select(R... columns);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Nested.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Nested.java
new file mode 100644
index 0000000..4f96bc2
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/Nested.java
@@ -0,0 +1,41 @@
+package com.mosty.base.utils.mongo.core.sdk.base;
+
+import java.io.Serializable;
+import java.util.function.Function;
+
+/**
+ * 查询条件封装
+ * <p>嵌套</p>
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public interface Nested<Param, LambdaQueryWrapper> extends Serializable {
+
+    /**
+     * 嵌套条件构造器
+     *
+     * @param func 嵌套条件
+     * @return 当前条件构造器
+     */
+    default LambdaQueryWrapper and(Function<Param, Param> func) {
+        return and(true, func);
+    }
+
+    /**
+     * 嵌套条件构造器 使用or连接
+     *
+     * @return 当前条件构造器
+     */
+    LambdaQueryWrapper or();
+
+    /**
+     * 嵌套条件构造器
+     *
+     * @param condition 是否开启嵌套
+     * @param func      嵌套条件
+     * @return 当前条件构造器
+     */
+    LambdaQueryWrapper and(boolean condition, Function<Param, Param> func);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/SFunction.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/SFunction.java
new file mode 100644
index 0000000..e028838
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/sdk/base/SFunction.java
@@ -0,0 +1,17 @@
+package com.mosty.base.utils.mongo.core.sdk.base;
+
+import java.io.Serializable;
+
+/**
+ * 支持序列化的 Function
+ * 为了获取字段名字
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+@FunctionalInterface
+public interface SFunction<T, R> extends Serializable {
+
+    R apply(T t);
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/ConditionWrapper.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/ConditionWrapper.java
new file mode 100644
index 0000000..293ed5a
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/ConditionWrapper.java
@@ -0,0 +1,93 @@
+package com.mosty.base.utils.mongo.core.wrapper;
+
+import com.mosty.base.utils.mongo.core.entity.Condition;
+import com.mosty.base.utils.mongo.core.entity.SelectField;
+import com.mosty.base.utils.mongo.core.entity.SortCondition;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 条件包装类
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class ConditionWrapper {
+
+    /**
+     * 主动查询的集合字段
+     */
+    private List<SelectField> fields = Collections.emptyList();
+
+    /**
+     * 条件构建器参数集合
+     */
+    private List<Condition> conditions = Collections.emptyList();
+
+    /**
+     * 条件构建器排序集合
+     */
+    private List<SortCondition> sortConditions = Collections.emptyList();
+
+    /**
+     * 分页 skip
+     */
+    private Long skip;
+
+    /**
+     * 分页 limit
+     */
+    private Integer limit;
+
+    public ConditionWrapper() {
+    }
+
+    public ConditionWrapper(List<SelectField> fields, List<Condition> conditions, List<SortCondition> sortConditions, Long skip, Integer limit) {
+        this.fields = fields;
+        this.conditions = conditions;
+        this.sortConditions = sortConditions;
+        this.skip = skip;
+        this.limit = limit;
+    }
+
+    public List<SelectField> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<SelectField> fields) {
+        this.fields = fields;
+    }
+
+    public List<Condition> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(List<Condition> conditions) {
+        this.conditions = conditions;
+    }
+
+    public List<SortCondition> getSortConditions() {
+        return sortConditions;
+    }
+
+    public void setSortConditions(List<SortCondition> sortConditions) {
+        this.sortConditions = sortConditions;
+    }
+
+    public Long getSkip() {
+        return skip;
+    }
+
+    public void setSkip(Long skip) {
+        this.skip = skip;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/LambdaQueryWrapper.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/LambdaQueryWrapper.java
new file mode 100644
index 0000000..54c23b8
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/LambdaQueryWrapper.java
@@ -0,0 +1,205 @@
+package com.mosty.base.utils.mongo.core.wrapper;
+
+import com.mosty.base.utils.mongo.core.constant.ECompare;
+import com.mosty.base.utils.mongo.core.constant.EConditionType;
+import com.mosty.base.utils.mongo.core.constant.ESortType;
+import com.mosty.base.utils.mongo.core.entity.Condition;
+import com.mosty.base.utils.mongo.core.entity.SelectField;
+import com.mosty.base.utils.mongo.core.entity.SortCondition;
+import com.mosty.base.utils.mongo.core.sdk.base.Compare;
+import com.mosty.base.utils.mongo.core.sdk.base.Func;
+import com.mosty.base.utils.mongo.core.sdk.base.Nested;
+import com.mosty.base.utils.mongo.core.sdk.base.SFunction;
+import com.mosty.base.utils.mongo.utils.ConvertUtil;
+import com.mosty.base.utils.mongo.utils.ExceptionUtils;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 条件构建器
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class LambdaQueryWrapper<T>
+        implements
+        Compare<LambdaQueryWrapper<T>, SFunction<T, ?>>,
+        Func<T, LambdaQueryWrapper<T>, SFunction<T, ?>>,
+        Nested<LambdaQueryWrapper<T>, LambdaQueryWrapper<T>> {
+
+    private final List<SelectField> fields = new ArrayList<>(5);
+    private final List<Condition> conditions = new ArrayList<>(5);
+    private final List<SortCondition> sortConditions = new ArrayList<>(5);
+    private Long skip;
+    private Integer limit;
+
+    public ConditionWrapper getCondition() {
+        return new ConditionWrapper(fields, conditions, sortConditions, skip, limit);
+    }
+
+    private String getFieldMeta(SFunction<T, ?> column) {
+        return ConvertUtil.convertToFieldName(column);
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> eq(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.EQ, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> ne(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.NE, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> le(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.LE, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> lt(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.LT, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> ge(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.GE, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> gt(boolean condition, SFunction<T, ?> column, Object val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.GT, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> between(boolean condition, SFunction<T, ?> column, Object leftV, Object rightV) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.BW, getFieldMeta(column), Arrays.asList(leftV, rightV)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> in(boolean condition, SFunction<T, ?> column, Collection<Object> val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.IN, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> notIn(boolean condition, SFunction<T, ?> column, Collection<Object> val) {
+        if (condition) {
+            conditions.add(new Condition(ECompare.NIN, getFieldMeta(column), Collections.singletonList(val)));
+        }
+        return this;
+    }
+
+
+    @Override
+    public LambdaQueryWrapper<T> and(boolean condition, Function<LambdaQueryWrapper<T>, LambdaQueryWrapper<T>> func) {
+
+        if (condition) {
+            LambdaQueryWrapper<T> apply = func.apply(new LambdaQueryWrapper<>());
+            ConditionWrapper conditionWrapper = apply.getCondition();
+            Condition c = new Condition();
+            c.setConditionWrapper(conditionWrapper);
+            this.conditions.add(c);
+        }
+        return this;
+
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> or() {
+
+        if (conditions.size() == 0) {
+            throw ExceptionUtils.mpe("not first use or");
+        }
+        Condition lastCondition = conditions.get(conditions.size() - 1);
+        ConditionWrapper conditionWrapper = lastCondition.getConditionWrapper();
+        if (Objects.isNull(conditionWrapper)) {
+            conditionWrapper = new ConditionWrapper(fields, conditions, sortConditions, skip, limit);
+        }
+        List<Condition> sub = conditionWrapper.getConditions();
+        Condition condition = sub.get(sub.size() - 1);
+        condition.setConditionType(EConditionType.OR);
+        return this;
+
+    }
+
+    @Override
+    public final LambdaQueryWrapper<T> orderByAsc(boolean condition, SFunction<T, ?> column) {
+
+        if (condition) {
+            appendSortField(column, ESortType.ASC);
+        }
+        return this;
+
+    }
+
+    @Override
+    public final LambdaQueryWrapper<T> orderByDesc(boolean condition, SFunction<T, ?> column) {
+
+        if (condition) {
+            appendSortField(column, ESortType.DESC);
+        }
+        return this;
+
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> skip(Long skip) {
+
+        this.skip = skip;
+        return this;
+
+    }
+
+    @Override
+    public LambdaQueryWrapper<T> limit(Integer limit) {
+
+        this.limit = limit;
+        return this;
+
+    }
+
+    @SafeVarargs
+    @Override
+    public final LambdaQueryWrapper<T> select(SFunction<T, ?>... columns) {
+
+        if (Objects.nonNull(columns) && columns.length > 0) {
+            List<SelectField> fields = Arrays.stream(columns).map(column -> new SelectField(getFieldMeta(column))).collect(Collectors.toList());
+            this.fields.addAll(fields);
+        }
+        return this;
+
+    }
+
+    private void appendSortField(SFunction<T, ?> column, ESortType sortType) {
+
+        sortConditions.add(new SortCondition(sortType, getFieldMeta(column)));
+
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/Wrappers.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/Wrappers.java
new file mode 100644
index 0000000..5acb527
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/core/wrapper/Wrappers.java
@@ -0,0 +1,15 @@
+package com.mosty.base.utils.mongo.core.wrapper;
+
+/**
+ * Wrapper 条件构造
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public final class Wrappers {
+
+    public static <T> LambdaQueryWrapper<T> lambdaQuery() {
+        return new LambdaQueryWrapper<>();
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/exception/EasyMongoException.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/exception/EasyMongoException.java
new file mode 100644
index 0000000..ba8c4a6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/exception/EasyMongoException.java
@@ -0,0 +1,22 @@
+package com.mosty.base.utils.mongo.exception;
+
+/**
+ * mongo 异常类
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class EasyMongoException extends RuntimeException {
+
+    public EasyMongoException(String message) {
+        super(message);
+    }
+
+    public EasyMongoException(Throwable throwable) {
+        super(throwable);
+    }
+
+    public EasyMongoException(String message, Throwable throwable) {
+        super(message, throwable);
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ArrayUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ArrayUtils.java
new file mode 100644
index 0000000..f00b01e
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ArrayUtils.java
@@ -0,0 +1,35 @@
+package com.mosty.base.utils.mongo.utils;
+
+/**
+ * ArrayUtils工具类
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public final class ArrayUtils {
+
+    private ArrayUtils() {
+    }
+
+    /**
+     * 判断数据是否为空
+     *
+     * @param array 长度
+     * @return 数组对象为null或者长度为 0 时，返回 false
+     */
+    public static boolean isEmpty(Object[] array) {
+        return array == null || array.length == 0;
+    }
+
+    /**
+     * 判断数组是否不为空
+     *
+     * @param array 数组
+     * @return 数组对象内含有任意对象时返回 true
+     * @see ArrayUtils#isEmpty(Object[])
+     */
+    public static boolean isNotEmpty(Object[] array) {
+        return !isEmpty(array);
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ClassUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ClassUtil.java
new file mode 100644
index 0000000..7ff4e23
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ClassUtil.java
@@ -0,0 +1,100 @@
+package com.mosty.base.utils.mongo.utils;
+
+import org.springframework.data.annotation.Id;
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 字节码工具
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class ClassUtil {
+
+    private ClassUtil() {
+    }
+
+    /**
+     * 缓存目标类上的泛型值
+     */
+    private static final Map<Class<?>, Class<?>> CACHE = new ConcurrentHashMap<>(64);
+
+    /**
+     * 缓存mongo实体的主键字段
+     */
+    private static final Map<Class<?>, Field> FIELD_CACHE = new ConcurrentHashMap<>(64);
+
+    /**
+     * 获取mongo集合实体的主键值
+     *
+     * @param obj 目标对象
+     * @return id对应的值
+     */
+    public static Serializable getId(Object obj) {
+
+        Field field = getIdField(obj);
+        field.setAccessible(true);
+        try {
+            return (Serializable) field.get(obj);
+        } catch (IllegalAccessException e) {
+            throw ExceptionUtils.mpe("not exist id value");
+        }
+
+    }
+
+    /**
+     * 获取mongo集合实体的主键字段
+     *
+     * @param obj 目标对象
+     * @return 主建字段
+     */
+    public static Field getIdField(Object obj) {
+
+        Class<?> clazz = obj.getClass();
+        Field result = FIELD_CACHE.get(clazz);
+        if (Objects.nonNull(result)) {
+            return result;
+        }
+        for (Field field : clazz.getDeclaredFields()) {
+            Id annotation = field.getAnnotation(Id.class);
+            if (Objects.nonNull(annotation)) {
+                FIELD_CACHE.put(clazz, field);
+                return field;
+            }
+        }
+        throw ExceptionUtils.mpe("no exist id");
+
+    }
+
+    /**
+     * 获取对象上的泛型
+     *
+     * @param obj 目标类
+     * @return 类名
+     */
+    public static Class<?> getTClass(Object obj) {
+
+        if (Objects.isNull(obj)) {
+            return null;
+        }
+        Class<?> clazz = obj.getClass();
+        Class<?> result = CACHE.get(clazz);
+        if (Objects.nonNull(result)) {
+            return result;
+        }
+        Type aClass = obj.getClass().getGenericSuperclass();
+        Type subType = ((ParameterizedTypeImpl) aClass).getActualTypeArguments()[1];
+        result = (Class<?>) subType;
+        CACHE.put(clazz, result);
+        return result;
+
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ConvertUtil.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ConvertUtil.java
new file mode 100644
index 0000000..809307b
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ConvertUtil.java
@@ -0,0 +1,81 @@
+package com.mosty.base.utils.mongo.utils;
+
+import com.mosty.base.utils.mongo.core.sdk.base.SFunction;
+
+import java.io.Serializable;
+import java.lang.invoke.SerializedLambda;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 转转换工具
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class ConvertUtil {
+
+    private ConvertUtil() {
+    }
+
+    public static final String GET = "get";
+
+    public static final String IS = "is";
+
+    /**
+     * 缓存方法应用对应的属性名称
+     */
+    private static final Map<Class<?>, String> CLASS_FIELD_META_MAP = new ConcurrentHashMap<>();
+
+    /**
+     * 转换方法引用为属性名
+     */
+    public static <T> String convertToFieldName(SFunction<T, ?> fn) {
+
+        SerializedLambda lambda = getSerializedLambda(fn);
+        String cacheData = CLASS_FIELD_META_MAP.get(fn.getClass());
+        if (Objects.nonNull(cacheData)) {
+            return cacheData;
+        }
+        String methodName = lambda.getImplMethodName();
+        if (methodName.startsWith(GET)) {
+            methodName = methodName.substring(3);
+        } else if (methodName.startsWith(IS)) {
+            methodName = methodName.substring(2);
+        } else {
+            throw new IllegalArgumentException("无效的getter方法：" + methodName);
+        }
+        try {
+            String fieldMeta = StringUtils.firstToLowerCase(methodName);
+            CLASS_FIELD_META_MAP.put(fn.getClass(), fieldMeta);
+            return fieldMeta;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    /**
+     * 获取一个实现了序列化的lambda函数
+     *
+     * @param fn 目标函数
+     * @return 实现了序列化的lambda函数
+     */
+    public static SerializedLambda getSerializedLambda(Serializable fn) {
+
+        SerializedLambda lambda;
+        try {
+            // 提取SerializedLambda并缓存
+            Method method = fn.getClass().getDeclaredMethod("writeReplace");
+            method.setAccessible(Boolean.TRUE);
+            lambda = (SerializedLambda) method.invoke(fn);
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return lambda;
+
+    }
+}
\ No newline at end of file
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ExceptionUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ExceptionUtils.java
new file mode 100644
index 0000000..efc5275
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/ExceptionUtils.java
@@ -0,0 +1,47 @@
+package com.mosty.base.utils.mongo.utils;
+
+import com.mosty.base.utils.mongo.exception.EasyMongoException;
+
+/**
+ * 异常工具
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public final class ExceptionUtils {
+
+    private ExceptionUtils() {
+    }
+
+    /**
+     * 返回一个新的异常，统一构建，方便统一处理
+     *
+     * @param msg 消息
+     * @param t   异常信息
+     * @return 返回异常
+     */
+    public static EasyMongoException mpe(String msg, Throwable t, Object... params) {
+        return new EasyMongoException(StringUtils.format(msg, params), t);
+    }
+
+    /**
+     * 重载的方法
+     *
+     * @param msg 消息
+     * @return 返回异常
+     */
+    public static EasyMongoException mpe(String msg, Object... params) {
+        return new EasyMongoException(StringUtils.format(msg, params));
+    }
+
+    /**
+     * 重载的方法
+     *
+     * @param t 异常
+     * @return 返回异常
+     */
+    public static EasyMongoException mpe(Throwable t) {
+        return new EasyMongoException(t);
+    }
+
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/StringUtils.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/StringUtils.java
new file mode 100644
index 0000000..f1d80fc
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/utils/mongo/utils/StringUtils.java
@@ -0,0 +1,40 @@
+package com.mosty.base.utils.mongo.utils;
+
+/**
+ * 字符串工具类
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class StringUtils {
+
+    private StringUtils() {
+    }
+
+    /**
+     * 安全的进行字符串 format
+     *
+     * @param target 目标字符串
+     * @param params format 参数
+     * @return format 后的
+     */
+    public static String format(String target, Object... params) {
+        if (target.contains("%s") && ArrayUtils.isNotEmpty(params)) {
+            return String.format(target, params);
+        }
+        return target;
+    }
+
+    /**
+     * 首字母转换小写
+     *
+     * @param str 需要转换的字符串
+     * @return 转换好的字符串
+     */
+    public static String firstToLowerCase(final String str) {
+        if (null == str || str.length() == 0) {
+            return "";
+        }
+        return str.substring(0, 1).toLowerCase() + str.substring(1);
+    }
+}
diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/resources/rebel.xml b/feign-client-api/mosty-base-feign-sdk/src/main/resources/rebel.xml
new file mode 100644
index 0000000..e0aacf6
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-base-feign-sdk</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/feign-client-api/mosty-base-feign-sdk/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/feign-client-api/mosty-base-feign-sdk/src/resources/META-INF/spring.factories b/feign-client-api/mosty-base-feign-sdk/src/resources/META-INF/spring.factories
new file mode 100644
index 0000000..1e76d76
--- /dev/null
+++ b/feign-client-api/mosty-base-feign-sdk/src/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.mosty.base.feign.FeignAutoConfiguration
\ No newline at end of file
diff --git a/feign-client-api/pom.xml b/feign-client-api/pom.xml
new file mode 100644
index 0000000..13c2cbd
--- /dev/null
+++ b/feign-client-api/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>feign-client-api</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>mosty-base-feign-sdk</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/mosty-base/mosty-base.iml b/mosty-base/mosty-base.iml
new file mode 100644
index 0000000..7398690
--- /dev/null
+++ b/mosty-base/mosty-base.iml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353923" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-log-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.20" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.xfire:xfire-core:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ws.commons:XmlSchema:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-base/pom.xml b/mosty-base/pom.xml
new file mode 100644
index 0000000..3943ef3
--- /dev/null
+++ b/mosty-base/pom.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-base</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <springfox-version>2.8.0</springfox-version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>common-config-starter</artifactId>-->
+        <!--            <version>1.0.0-SNAPSHOT</version>-->
+        <!--        </dependency>-->
+
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>common-base-starter</artifactId>-->
+        <!--            <version>1.0.0-SNAPSHOT</version>-->
+        <!--        </dependency>-->
+
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>common-core-starter</artifactId>-->
+        <!--            <version>1.0.0-SNAPSHOT</version>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>common-generator-starter</artifactId>-->
+        <!--            <version>1.0.0-SNAPSHOT</version>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-log-base-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <!--        <dependency>-->
+        <!--            <groupId>org.mybatis.spring.boot</groupId>-->
+        <!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
+        <!--            <version>2.2.0</version>-->
+        <!--            <optional>true</optional>-->
+        <!--        </dependency>-->
+
+        <!--base-feign-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.mosty</groupId>-->
+        <!--            <artifactId>mosty-base-feign-sdk</artifactId>-->
+        <!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.20</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mxparser</artifactId>
+                    <groupId>io.github.x-stream</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.codehaus.xfire/xfire-core -->
+        <dependency>
+            <groupId>org.codehaus.xfire</groupId>
+            <artifactId>xfire-core</artifactId>
+            <version>1.2.6</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>wsdl4j</artifactId>
+                    <groupId>wsdl4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.7</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-io -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-base/src/main/java/com/mosty/base/MostyBaseApplication.java b/mosty-base/src/main/java/com/mosty/base/MostyBaseApplication.java
new file mode 100644
index 0000000..6b3bb40
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/MostyBaseApplication.java
@@ -0,0 +1,34 @@
+package com.mosty.base;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	基础微服务
+ * 包括：登陆服务、认证授权（IDP服务）、操作日志
+ *
+ * @author kevin
+ * @date 2022/1/22 4:23 PM
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+//@MapperScan("com.mosty")
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@SpringBootApplication
+@EnableScheduling
+public class MostyBaseApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyBaseApplication.class, args);
+	}
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/config/FeignConfig.java b/mosty-base/src/main/java/com/mosty/base/config/FeignConfig.java
new file mode 100644
index 0000000..a185f82
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.base.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/config/GlobalYmlConfig.java b/mosty-base/src/main/java/com/mosty/base/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..8e088f7
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/config/GlobalYmlConfig.java
@@ -0,0 +1,30 @@
+package com.mosty.base.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     *  token放行的配置列表
+     */
+    private List<String> token;
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/config/WebMvcConfig.java b/mosty-base/src/main/java/com/mosty/base/config/WebMvcConfig.java
new file mode 100644
index 0000000..56568e1
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/config/WebMvcConfig.java
@@ -0,0 +1,137 @@
+package com.mosty.base.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+//        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+//        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 tokenExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getToken()));
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+//        registry.addViewController("/").setViewName("redirect:swagger-ui.html");
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+//        registry.addInterceptor(tokenInterceptor()).addPathPatterns("/**")
+//                .excludePathPatterns(globalYmlConfig.getToken())
+//                .excludePathPatterns(globalYmlConfig.getSwagger());
+
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+//    @Bean
+//    public TokenInterceptor tokenInterceptor() {
+//        log.info("初始化WebMvcConfig 拦截器TokenInterceptor");
+//        return new TokenInterceptor();
+//    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/DeptController.java b/mosty-base/src/main/java/com/mosty/base/controller/DeptController.java
new file mode 100644
index 0000000..d44c035
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/DeptController.java
@@ -0,0 +1,145 @@
+package com.mosty.base.controller;
+
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.DeptService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 部门数据处理相关
+ **/
+@Api(tags = "部门数据处理相关")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/deptFeign")
+public class DeptController {
+
+    private final DeptService deptService;
+
+    @ApiOperation("根据部门deptid获取所属分县局、所属地市州")
+    @JwtSysUser
+    @GetMapping("getOrgByDeptId/{deptid}")
+    public ResponseResult<DeptInfoVo> getOrgByDeptId(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(this.deptService.getOrgByDeptId(deptid));
+    }
+
+    @ApiOperation("根据部门orgcode获取所属分县局、所属地市州")
+    @GetMapping("getOrgByOrgcode/{orgcode}")
+    public ResponseResult<DeptInfoVo> getOrgByOrgcode(@PathVariable("orgcode") String orgcode) {
+        return ResponseResult.success(this.deptService.getOrgByOrgcode(orgcode));
+    }
+
+    @ApiOperation("查询所有的部门信息列表")
+    @JwtSysUser
+    @GetMapping("getDeptAll")
+    public ResponseResult<List<DeptInfoVo>> getDeptAll() {
+        return ResponseResult.success(this.deptService.getDeptAll());
+    }
+
+    @ApiOperation("查询部门下的所有子部门信息,排除一些部门")
+    @JwtSysUser
+    @PostMapping("getChildDept")
+    public ResponseResult<List<DeptInfoVo>> getChildDept(@RequestBody GetDeptListDTO dto) {
+        return ResponseResult.success(this.deptService.getChildDept(dto));
+    }
+
+    @ApiOperation("查询分局下的所有的派出所信息")
+    @PostMapping("getPcsByFxjdm/{orgcode}")
+    public ResponseResult<List<SysDeptDTO>> getPcsByFxjdm(@PathVariable("orgcode") String orgcode) {
+        return ResponseResult.success(this.deptService.getPcsByFxjdm(orgcode));
+    }
+
+    @ApiOperation("获取部门信息")
+    @PostMapping("getOrg")
+    public ResponseResult<List<SysDept>> getOrg(@RequestBody SysDeptQuery deptQuery) {
+        return ResponseResult.success(this.deptService.getOrg(deptQuery));
+    }
+
+
+    @ApiOperation("获取组织机构信息列表")
+    @PostMapping("getOrganizationList")
+    public ResponseResult<List<SysDept>> getOrganizationList(@RequestBody GetSysDeptListQuery query) {
+        return ResponseResult.success(this.deptService.getOrganizationList(query));
+    }
+
+    @ApiOperation("重置部门的部门ROOT")
+    @PostMapping("resetRootPath")
+    public ResponseResult<Void> resetRootPath() {
+        this.deptService.resetRootPath();
+        return ResponseResult.success();
+    }
+
+//     @ApiOperation("获取查询条件")
+//    @PostMapping("getSsbm/{ssbmdm}/{isChild}")
+//    public ResponseResult<String> getSsbm(@PathVariable("ssbmdm") String ssbmdm,
+//                                          @PathVariable("isChild") String isChild) {
+//        return ResponseResult.success("成功", this.deptService.getSsbm(ssbmdm, isChild));
+//    }
+
+
+    @ApiOperation("获取查询条件")
+    @PostMapping("getSsbm")
+    @JwtSysUser
+    public ResponseResult<String> getSsbm(@RequestBody GetSsbmDto dto) {
+        return ResponseResult.success("成功", this.deptService.getSsbm(dto.getSsbmdm(), dto.getIsChild()));
+    }
+
+
+    @ApiOperation("根据类型查询所有的部门")
+    @GetMapping("getDeptByType")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 01.市局 02.县局 03.派出所", required = true)
+    })
+    public ResponseResult<List<SysDept>> getJzOrPcs(String type, String ssbmdm) {
+        return ResponseResult.success(this.deptService.getDeptByType(type, ssbmdm));
+    }
+
+    @ApiOperation("查询父级部门")
+    @GetMapping("getParentOrgCode")
+    @JwtSysUser
+    public ResponseResult<List<String>> getParentOrgCode(String ssbmdm) {
+        return ResponseResult.success(this.deptService.getParentOrgCode(ssbmdm));
+    }
+
+    @ApiOperation("查询父级部门")
+    @GetMapping("/getParentDept")
+    ResponseResult<SysDept> getParentDept(String ssbmid) {
+        return ResponseResult.success(this.deptService.getParentDept(ssbmid));
+    }
+
+    @ApiOperation("查询部门详情")
+    @GetMapping("/getSysDeptBySsbmdm")
+    ResponseResult<SysDept> getSysDeptBySsbmdm(String ssbmdm) {
+        return ResponseResult.success(this.deptService.getSysDeptBySsbmdm(ssbmdm));
+    }
+
+    @ApiOperation("同步组织机构部门")
+    @GetMapping("/tbZjjgDm")
+    public ResponseResult<Void> tbZjjgDm() {
+        this.deptService.tbZjjgDm();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("同步组织机构人员")
+    @GetMapping("/tbZzjgRy")
+    public ResponseResult<Void> tbZzjgRy() {
+        this.deptService.tbZzjgRy();
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/OtherController.java b/mosty-base/src/main/java/com/mosty/base/controller/OtherController.java
new file mode 100644
index 0000000..c7bfbc4
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/OtherController.java
@@ -0,0 +1,131 @@
+package com.mosty.base.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.base.GetYqListDto;
+import com.mosty.base.model.dto.base.RsHjyjSearchDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.base.service.DeptService;
+import com.mosty.base.service.GajgSearchService;
+import com.mosty.base.utils.OkHttpUtils;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.entity.log.SysOperLog;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.core.business.entity.SysLogininfor;
+import com.mosty.common.core.business.entity.request.LoginLogPage;
+import com.mosty.common.core.business.mapper.SysLogininforMapper;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.operation.log.entity.VO.OperlogPage;
+import com.mosty.operation.log.mapper.SysOperLogMapper;
+import com.mosty.operation.log.service.SysOperLogService;
+import io.lettuce.core.GeoCoordinates;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.*;
+
+@RestController
+@RequestMapping("other")
+@Api(tags = "其他的一些接口")
+@AllArgsConstructor
+public class OtherController {
+
+    private final GajgSearchService gajgSearchService;
+    private final SysOperLogMapper sysOperLogMapper;
+    private final SysLogininforMapper sysLogininforMapper;
+    private final DeptService deptService;
+
+
+
+
+
+
+
+    @PostMapping("getGajg")
+    @ApiOperation("公安机关所有信息")
+    @JwtSysUser
+    public ResponseResult<TbYsGajgVo> getGajg() {
+        return ResponseResult.success(this.gajgSearchService.getGajg());
+    }
+
+    @PostMapping("getZxd")
+    @ApiOperation("获取区域中心点")
+    @JwtSysUser
+    public ResponseResult<GeoCoordinates> getZxd(@RequestBody List<BigDecimal[]> dtm) {
+        int total = dtm.size();
+        double X = 0, Y = 0, Z = 0;
+        for (BigDecimal[] yjxx : dtm) {
+            double jd, wd, x, y, z;
+            jd = yjxx[0].doubleValue() * Math.PI / 180;
+            wd = yjxx[1].doubleValue() * Math.PI / 180;
+            x = Math.cos(wd) * Math.cos(jd);
+            y = Math.cos(wd) * Math.sin(jd);
+            z = Math.sin(wd);
+            X += x;
+            Y += y;
+            Z += z;
+        }
+        X = X / total;
+        Y = Y / total;
+        Z = Z / total;
+        double jd = Math.atan2(Y, X);
+        double Hyp = Math.sqrt(X * X + Y * Y);
+        double wd = Math.atan2(Z, Hyp);
+        return ResponseResult.success(GeoCoordinates.create(jd * 180 / Math.PI, wd * 180 / Math.PI));
+    }
+
+    @PostMapping("/exportOperlog")
+    @ApiOperation("导出查询日志")
+    @Log(title = "导出查询日志", businessType = BusinessType.OTHER)
+    public void exportOperlog(OperlogPage dto, HttpServletResponse response) {
+        LambdaQueryWrapper<SysOperLog> qw = new LambdaQueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(dto.getTitle()), SysOperLog::getTitle, dto.getTitle())
+                .like(StringUtils.isNotBlank(dto.getOperName()), SysOperLog::getOperName, dto.getOperName())
+                .eq(Objects.nonNull(dto.getBusinessType()), SysOperLog::getBusinessType, dto.getBusinessType())
+                .eq(Objects.nonNull(dto.getStatus()), SysOperLog::getStatus, dto.getStatus())
+                .orderByDesc(SysOperLog::getOperId).last(" limit 10000");
+        List<SysOperLog> list = sysOperLogMapper.selectList(qw);
+
+        ExcelUtil<SysOperLog> util = new ExcelUtil<
+                >(SysOperLog.class);
+        util.exportExcel(response, list, "巡逻辅警导出", "巡逻辅警导出");
+    }
+
+
+    @PostMapping("/exportLoginLog")
+    @ApiOperation("导出登陆日志")
+    @Log(title = "导出登陆日志", businessType = BusinessType.OTHER)
+    public void exportLoginLog(LoginLogPage dto, HttpServletResponse response) {
+        QueryWrapper<SysLogininfor> qw = new QueryWrapper<>();
+        String ssbm = deptService.getSsbm(null, null);
+        qw.lambda().like(StringUtils.isNotBlank(dto.getUserName()), SysLogininfor::getUserName, dto.getUserName())
+                .eq(Objects.nonNull(dto.getStatus()), SysLogininfor::getStatus, dto.getStatus())
+                .likeRight(StringUtils.isNotBlank(ssbm), SysLogininfor::getSsbmdm, ssbm);
+        qw.lambda().orderByDesc(SysLogininfor::getInfoId).last(" limit 10000");
+        List<SysLogininfor> list = sysLogininforMapper.selectList(qw);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<>(SysLogininfor.class);
+        util.exportExcel(response, list, "导出登陆日志", "导出登陆日志");
+    }
+
+
+
+
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/SysConfigNewController.java b/mosty-base/src/main/java/com/mosty/base/controller/SysConfigNewController.java
new file mode 100644
index 0000000..2ff5357
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/SysConfigNewController.java
@@ -0,0 +1,36 @@
+package com.mosty.base.controller;
+
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.DeptService;
+import com.mosty.base.service.SysConfigNewService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/10/15
+ * 系统配置信息相关接口
+ **/
+@Api(tags = "系统配置信息相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysConfigNew")
+public class SysConfigNewController {
+
+    private final SysConfigNewService sysConfigNewService;
+
+    @ApiOperation("通过key获取配置信息")
+    @GetMapping("getValue/{pzj}")
+    public ResponseResult<String> getValue(@PathVariable("pzj") String pzj) {
+        return ResponseResult.success(this.sysConfigNewService.getValue(pzj));
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/SysMessageController.java b/mosty-base/src/main/java/com/mosty/base/controller/SysMessageController.java
new file mode 100644
index 0000000..64add2c
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/SysMessageController.java
@@ -0,0 +1,44 @@
+package com.mosty.base.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.base.SysMessageInfo;
+import com.mosty.base.model.query.base.GetMyMessageQuery;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.service.SysMessageService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 布控车辆接口
+ **/
+@Api(tags = "消息相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/sysMessage")
+public class SysMessageController {
+
+    private final SysMessageService sysMessageService;
+
+    @PostMapping("sendMsg")
+    @ApiOperation(value = "发送消息")
+    @Log(title = "发送消息", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Integer> sendMsg(@RequestBody SysMessageInfoInsertDto dto) {
+        return ResponseResult.success(this.sysMessageService.sendMsg(dto));
+    }
+
+    @GetMapping("getPageList")
+    @ApiOperation(value = "获取我的消息列表")
+    @JwtSysUser
+    public ResponseResult<IPage<SysMessageInfo>> getPageList(GetMyMessageQuery dto) {
+        return ResponseResult.success(this.sysMessageService.getPageList(dto));
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/UserConfigController.java b/mosty-base/src/main/java/com/mosty/base/controller/UserConfigController.java
new file mode 100644
index 0000000..22ab718
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/UserConfigController.java
@@ -0,0 +1,56 @@
+package com.mosty.base.controller;
+
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.DeptService;
+import com.mosty.base.service.UserConfigService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigVo;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 部门数据处理相关
+ **/
+@Api(tags = "APP用户配置相关接口（NEW）")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/AppUserConfig")
+public class UserConfigController {
+
+    private final UserConfigService userConfigService;
+
+    @ApiOperation("查询用户配置")
+    @JwtSysUser
+    @GetMapping("getUserConfig")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "用户ID", name = "userId", dataType = "int"),
+            @ApiImplicitParam(value = "首页ID", name = "homeId", dataType = "int"),
+    })
+    public ResponseResult<SysUserAppHomeconfigVo> getUserConfig(int userId, int homeId) {
+        return ResponseResult.success(this.userConfigService.getUserConfig(userId, homeId));
+    }
+
+//    @ApiOperation("修改用户配置")
+//    @JwtSysUser
+//    @GetMapping("updateUserConfig")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(value = "用户ID", name = "userId", dataType = "int"),
+//            @ApiImplicitParam(value = "首页ID", name = "homeId", dataType = "int"),
+//    })
+//    public ResponseResult<SysUserAppHomeconfigVo> updateUserConfig(List<SysUserAppHomeconfig> plates) {
+//        return ResponseResult.success(this.userConfigService.updateUserConfig(plates));
+//    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/UserDeptController.java b/mosty-base/src/main/java/com/mosty/base/controller/UserDeptController.java
new file mode 100644
index 0000000..f95462f
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/UserDeptController.java
@@ -0,0 +1,70 @@
+package com.mosty.base.controller;
+
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.UserDeptService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ * 部门数据处理相关
+ **/
+@Api(tags = "用户信息处理相关")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/userDeptFeign")
+public class UserDeptController {
+
+    private final UserDeptService userDeptService;
+
+    @ApiOperation("查询所有的用户数据（包含对应的部门信息）")
+    @JwtSysUser
+    @GetMapping("getUserAll/{deptid}")
+    public ResponseResult<List<SysUserDeptVO>> getUserAll(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(this.userDeptService.getUserAll(deptid));
+    }
+
+    @ApiOperation("查询部门下的总人数（包含子部门）")
+    @JwtSysUser
+    @GetMapping("getUserCount/{deptid}")
+    public ResponseResult<Integer> getUserCount(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(this.userDeptService.getUserCount(deptid));
+    }
+
+    @ApiOperation("查询部门下的人员信息，不包含子部门")
+    @JwtSysUser
+    @GetMapping("getUserList/{deptid}")
+    public ResponseResult<List<SysUserDeptVO>> getUserList(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(this.userDeptService.getUserList(deptid));
+    }
+
+    @ApiOperation("根据用户ID，获取用户部门信息")
+    @JwtSysUser
+    @GetMapping("getDeptInfoByUserId/{userId}")
+    public ResponseResult<DeptInfoVo> getDeptInfoByUserId(@PathVariable("userId") String userId) {
+        return ResponseResult.success(this.userDeptService.getDeptInfoByUserId(userId));
+    }
+
+    @ApiOperation("查询用户是否有该部门的数据权限")
+    @JwtSysUser
+    @GetMapping("getDataPermission")
+    public ResponseResult<Boolean> getDataPermission(String sfz, String deptcode) {
+        return ResponseResult.success(this.userDeptService.getDataPermission(sfz, deptcode));
+    }
+
+
+    @ApiOperation("根据用户身份证号，获取用户部门信息")
+    @JwtSysUser
+    @GetMapping("getDeptInfoBySfzh/{sfzh}")
+    public ResponseResult<DeptInfoVo> getDeptInfoBySfzh(@PathVariable("sfzh") String sfzh) {
+        return ResponseResult.success(this.userDeptService.getDeptInfoBySfzh(sfzh));
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/controller/UserInfoController.java b/mosty-base/src/main/java/com/mosty/base/controller/UserInfoController.java
new file mode 100644
index 0000000..6df5469
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/controller/UserInfoController.java
@@ -0,0 +1,43 @@
+package com.mosty.base.controller;
+
+import com.mosty.base.service.UserInfoService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ * 部门数据处理相关
+ **/
+@Api(tags = "用户信息相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/userFeign")
+public class UserInfoController {
+
+    private final UserInfoService userDeptService;
+
+    @ApiOperation("根据用户Id获取用户详情信息")
+    @JwtSysUser
+    @GetMapping("getUserInfo/{userId}")
+    public ResponseResult<SysUser> getUserInfo(@PathVariable("userId") String userId) {
+        return ResponseResult.success(this.userDeptService.getUserInfo(userId));
+    }
+
+    @ApiOperation("根据用户Id获取用户详情信息")
+    @JwtSysUser
+    @GetMapping("getUserInfoBySfzh/{sfzh}")
+    public ResponseResult<SysUser> getUserInfoBySfzh(@PathVariable("sfzh") String sfzh) {
+        return ResponseResult.success(this.userDeptService.getUserInfoBySfzh(sfzh));
+    }
+
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/manager/img.png b/mosty-base/src/main/java/com/mosty/base/manager/img.png
new file mode 100644
index 0000000000000000000000000000000000000000..7732afc342218bf8ef10749887a5d86da7fc4667
GIT binary patch
literal 164826
zcmZs?1yEc;(>99BVhb$pzPJT<*x>H&8iIu2?vmi{ut*4j;1XPeI|O$L?(Ubo@BO~}
z*I&14s?MA_XLqNkr~B!rr#DJfSq1|@41j@w!H|=MsKda(z4c)yQIOt7&?XXSVPFDb
z<RB87p2kOQw>~U$Zmi!sEc`R>|N2~h9FNZHze#dfsA1h_)Jw!;Q7-}`aYhLkUT_&2
zuXd7neI66o&HgMoCSc<#PGjTRn_GXg4@dkb#&t3u1}DtPPs>didZ3w8du!~IH?fwO
z;b5J$VBPTlUd$St7I6Rf?mvU&4&mUDkK9WmytSkMxg7CIf&R}|NZhli0RPAHT8x%a
zVA%ipz2Ph7z%YMG5WHfegJKO-3~ucgYu|0UOM3L^OSBXJ0~H$;wQc9;ZvPx})2%3@
zzvvH-Auu<yVxf81UM7ClcV1nALDxs$ZIrbX`>X@{(CNbm=a0tIzob(eh@sn~4ABvy
zGkGd<tQc~@6*SlySpeIVaMbp&2$qk2rfqyhgo8bQd=6xP3dZ;RSsy1Hn?k|t(0X4z
z)t5z)VcqqBq=A=kY88;TvFh;aY2Y>&^OW2s)HeR{_bD19oPR+;r>eoaTd0wC_!p2$
zbUBeZN2Ds)H1=lzir5l0lDs_iScn-|tt!n+zGt=X=$KV|iG=l)WS)%y&*J{1dMbQ4
zkIfBqk6GAeP+oWb7fT6EG64b3Ka2`Bhyz`3-3|VOB|pT$oy3XCI}4$}w5>?Z5jwH1
zfCwiFM5y#^^P8HRE42IDTt!VfFGJox6qmxg`lM^OHQG2;E?>`-x@N{iT?5<aou_-s
zt1fywy|cmq3q(tVujI==^9rFvf0niIo>z?sH}`~E6(sQZ>m-KAraOt;#R;P$-m}11
z(h=4rtI#5$HmlKdu9^*XuJT&c^ZC4qAXa1K-?M1F%sKx}`t?l?^Bom}6*H%-|COWA
z;`s8q^cfwACCBta3jUVl;~@<$f_?3hC)(r^2gHnjp4X?rUz3Re7y>i~4}1?2+bn+e
zc3l4|+Za%^AvS;ZCd7ZF8F+`Lp+{AV{k}cz*)QCuapQt!Eh~MfTU3uQI-TfBCIP-o
zD6qdLDp4+)9&mFi<m@I^i1e&V8a;&(PR05jTW+M(6rHg#&5x;TmG`*c!Y;1*BC6Ce
z@*6z0T(|9-i1woMeS({1z+cUvHiy_7$A5|!d&de1J+}Uy$NLBF()WXXh{WH^0NuSR
zd8+UgYIfp#ink3L<>1TN9*u+8*_sYJ4&NmT=74Vp`&JT-m@Wnf+l3+6rK4IT$5gq<
zT$rLjbOS9MM+j*F_|zHg2|s1wB+R)ykMmus#S0ucXzaPuyRO0(mFE=$@^v;YZ^2J6
z4nOF&q)#HWxZ>J=XMjVKkHHdq4A^Iwu+za%<B<G?2ua_;O0+Z4XARPaQB<D=hTt=i
z<M9XSz*7~;5tPgzY<*&{5ZTktqW9tVEKqXGtAx-_xHd#@3|LXAo#9H31R-hkNR%e?
zg(9rmOQyPPHLE=H^zsI~fH8D(icggk)P0}75z`kt#FC}1pd-kkBT0DKv@hxgtzyR`
z{^2~QL;FMtNT5QyNt+1Sf8XWv$?*pIlFQNTHttH4_~Ir(kbDV39ww}axC^@ddS31X
z^AL8Nf#e1JHu~8KwF=uDd$^2(7P}f@Q5htQ11FC|_>-fkm+PrZm2avU1d9e$M!oUa
z9Ah!zJDD%+zo}6XP}E+k6SF~zi~BW)g}o)9fsr)D+mC6X0#&iqpviA|hc5Nu`{(Z#
z(nq_bw>Lkb;i5P_4mXFolnVO^qgDAUFrqA=RIv$qzZd-dYhK2O*3r%DdYGS^kBd+}
z-xo&ARO~ge<|AC#Q-UqMHJJ2<=-b=If}dLkFvcB0SPo*qBcMVTVYfI@H4sJ;=9Rj5
zh+Hf3i9(tgY$3vA5+vR-MA&8XNNH~zkc2TB-?jIDO_&qoz*c?nuZ8%vV%Cr!<vgYg
zRO%Y$m^CLv{JTO<5)?CP#X7ETp_1orc7o%(2r03B?LZJBe(!;T*<OgTas*S!jbn*t
zW?AnBV~U_o^$h=)q91G~Odni|TbX2-sw>M!ABh7`B`lS2*O%<Qj!)0|*Zpef9*EY^
zHD@g41yqglzVaGV#)eDQ-I{+Y80Blwl=DfG@`hT%#iL47B+Fujq9~<L#D@_=B)Yof
zXX|N++lV<S?;THFzO<AY=Iwk0CwL3DjHR&ij0u;zZ_8`>@eciNt_B*tlp?2c=Q<=g
zth_`M35)8AJ$<`zdgiaX`pZ}C5Q~NPr|HW<GhC@hium8*V%UcI(x1|T%|@FTb%Eds
zMk+N^OKz9wkd^i~*^gVgEO5ePU4W?Ut(oq0C?|ipO3Q~+5{KSV8qNRu0F|}RL8L^Z
z1pLu!E(zut`1*f2yJCU-bTT~+LKcbyns>C5r`+8wzeli2_Mg8!w5TA}m_<*<9&%4M
zNPw2TIHm;D)zX4^^O%ao-TY$tNfe6f3ylYZ_mNEJC#cc1HQ&57%5?<g9qbbpGVG;3
zMFpH(;M~OVwXB7G{Sc0vyq8<J=8U!YDpx&=JP_$%aYjK)bD@Oz$bnni=j-H+^zhu{
zLLN`Zd5^Iejo+=V9nH3i*9zxUOTTyHKgUdwsSTT`u9igBkm2QRtdA<9k$~wnj%fCM
zYLBXgSjoe-ylZ&&?t4OmS(Kz@KxqsZV#{v-BT~)cD!6=~h$S9t(D?jevAC&N`vd8{
zs=nSACh*WhIGm@>&eWn7tHVnD)T|Z_D_Kgj)1fu78QEtFFH&YP?M2T^i{co*wOnn)
z^|oea>YIfAp11qA2f7z}qG&fYaXWs;_u83m<JHMD|MT{LKBnZ?=uTAUsxAB3r^z$(
z>u=a8)x#p0JXF{c?D5pp8~tPdOJpJ=j)X8uWZDngf!pGsE>&4LLmvbLs{GmrS)2!F
zqcqoBuc9$6gy8tF$K5YINm$hCloj73?Q9uS`x?~kPQY_D=<QOp(r+kbSGW_$<51`8
zvlRVj)x5rK^5U3FKwseK4UVOU{}<f;b$ppe|7U@BmJV&pt==%{-^80J_E#+a2Tbkv
z%YzMd6qs+1wKg4@!k&^iEK8GA4~Npi{{r@p+$B7!n7h9ix_nHg0tlw4+sI`w&cNUJ
z4OnA`$r=M`)v9V^<{@4B&q}*75xb6=uv*!ZFe(faj7p<C>S`(QsY&0+wH0iNukO{(
z;$@zmV>U6GirM$@^KyN9Bi@+=^vt1nHu@8+XBU_*=t_4R-$Zpbmppr!c%1pbQKelW
zkxp$@5;#pDhMcI~O|CA9Q+_atj~cQhyhZ=SlPafEDbvrAt|x9hfNaBoj)NG`$u7!P
z-fatqA}Q;sly((p`R<*LyyGMd;}2Olfzn{%_sJG0<$_VYeDw~>JGZ%Pksoz#oP^aB
zuLU#98wA`vr4T;S-vj}(V^j;T5SOPGbdY!R(Z{56leLQ#w2X4EIx|qh`0u75>`Jaw
z!uCv^_4p&r)Co6!@f;AGurAx)^eD;gP2AaF`Pl(`Z&?R2<x)40yqi(%uMM>X+N(P<
zoct+JYr1Ftj3EFADL3GG0_JSR@XaP^%-A0xrYqAg<xX(Ri+ycoH4_9bAH2n<S7ghQ
zZgS-ZAXJf(&6<*;^A776byy0Z;OA(t^EdbbI2kUfc_AO-;#DI!kR3rtS*duQ3>|)%
zVu%|~ROu@3PnV^oIS2>Ys!y{i*Fi)&rrSFr@6ShPr4~veTiS$hW*<MuIK?a)9s|Ps
z&+9a0DY5}%mHCjM5R%aX#Uy1=Ijv|f3ro*^PWIdaW6p{rxXQe=d<-Y8MAqAPtZN{M
z<3k`p@YGSztwqqTF&CY0XeHL2=*b&eaIUVcylGNz4gEVzA?s}dOCb0v{2<V~?p&})
zh;m+e|DY^I-=iWqm}TY{pr{@#6s~*?t7iQ)LRjL3U%yM`9!~8ng!al)h)PQ2?p65{
zpO(D89pHt}BvX*7Xvu{A%DI&iU|foPM!Lb-<+5<-B{&n;HgewS>Up{!>N$tSNp@h%
zwfL7GmTVf{d}4Huj_kx)Gq<4u!x9RuhqTa?eW)pFO0mG#H?0<cpH$2$+Ts*cTklIU
zi-O}6R$FhrunrTzL9FejrZ~B-m$Oi)*POLfh@p{L6f8>^Ly=5sm!&YSAVB|4AU~rF
zN@hXV?3_cqLE=p@Ww&oN3s{{a!&nSoXkQrnc}X50dZNmz8gi-c>{TL7Oe{29+?_#Z
zRj;>c%amrU>;RGiJv~d%q4)&_-UY*+2S<9`G(_>u)2+1Q14GRR+2rFNzESUA2z^ok
zqtYSLqPlIgX;4Q=<_(!>5NfpfA2~4QR*BgoZACn1^^x4{D$&gkKkNqWeDvs&ThHwc
za!;lFWP4hMZDRoirP0afaH}+XFPlfg5!e)HjQ?KXS2lAly`Q%XLQZI<q*sgl#S3RG
z;#Hd~LIWVp>O`dUe#|T)moG1;HX_bc$X{Q^2{kWBdyhyghlzrN^p$o57*<JqQ}geK
z{Z=G!KB90e2}W^dbO2lfa&Qm}2rQwEYp^PvjAMVz8A}I~<z<3gT^4Bv8n7T;1Q!Z0
zHGd8-CBj=NQQD?<>?0Z{s77<x+S-c*r7~NX{)C+Uc$#6vj(QJDrmdpjMo0vHn7!P)
zP@$V&QWrK0m__fydgP1YI~vcDuS&Zvi})lPUBQWsD7bXwZ`#|g7MHO$uSQR|Bd4yH
z!{$K7Ly2llM$nOmR{Kd9TD|pQc;jj5_$mK953IKSa3L6<@VVKisCJkR?@xxhelE+;
zV?24B`G{`G%dqmanq)g#xjS#%Fx~%!gi8io3r3lLe57BV#L53(CkfqWq5&hClNS=y
z8;AfE(xu4>VmdOL2*H?|QDZBvCsNnUz=T@|np7dv!fppXN0=2%AQ!BoVT(*1J0&cJ
z<1qd-0~P3cKPA(YtX49RR_}eK25iVmezyXWDw1Af-rPo|@an(lPWL5>=|%eHx;d&)
zu)R5S+y4@=|BsRJW<*{e4Q%xf{ucy}$I%uwgfzzyi~z%_4Y#whcvlK~R$n|b6@F8^
zJ7m6lB5Pjewh^6(MTSd)fP!aL767}xS-(x5f-vnq{zxuJgfOxxA%v9n8f7K}=S>DW
z0i(@G6J_$(hk@Y|p(w=IkLS++Wg>k~K`x8KV%WO3qzVG&{{_$gqG}$wQ0uiSb8MEx
z7m+|bGs-Q7gHMKKKC!xvhoz}C&5Fm;&hNAX37tuUbspveP;kZuf(dp7-Kl0Ux^897
z-iL3e&?#uxq$I|$1^jeH{E<RyTL%Y$rj1YTLPdjP#JK}q5SO}bCof{3ME}7ch5aJo
z#nzkqdko{8b&1a8)&Gx%{#R8?Q}ng51-T-U0)5H<p|TrwzdCO3INlM9)sY0}OO4gB
z<w<4d`Z6-ABzx<KUVSCOlzoIz<51|nB(PDs4Otn(B7W_s1w54+a!YriyHKj_9ou6^
zl<8ieQOJF2q5_b%+M)z|NnENUJxz$no?6#YMU%Im&B1x{c_xS289rg&Y;F8w&&&=V
z@3n~v|Nqy_*r)8SbN=zcAQ|j>PbBx53H4+;DE#VT|2T<*zo<ut8E@>P+;|6rR;=Xy
zMFR#9Q4E<=vf*iSx*E+G7?#SGW{F1!hgIB^HBDtSwO^K?EG7$&A{iIvj|`+=r38rl
zYbYXJnE7Os8B|de`+jdKOBI`~o4njw<3+ZbsvE6NvAC+6y!aOv{U>tx*9oxAyia|q
zc#C3x5h^>y7Jn?<`M0j^a$f_MNEw1%%k4Bq=V|;K+5RA20}e=sL~mmp=+sp&RCQvG
zPu!T)@->|N`Ny87ehNP0k`w}8upTjBdLX|B5~%<pZA$99ERs;1qE^B8yV13$Gp;=G
zC{@_+OjTUgX9+Yy$5E$M+u2MJd6hmv06wjzD@kxxZ_bvKc-BdyU;<w1V>8vA(tHCI
z^1*&je8h+16%*E+An#JdEfwZp%vRT4Q>Zn^ho|rx91toPqO0o=rmNdvkgNRXG>w|C
zxOBC5(0A@y>#M5hT^|P2>fHs<fry-tt{ExrWCQzjN>?Vm^*7aOlYOG_5;lA@I}0Te
z`xnc)(Scn*T+T%g3am{dv0m2+vLq;9f1D$ndkU{+lw@Z<GYXDG7O}Ieg-q!-Xf<VO
z2(*7tnnoFb8!kplaG>#ce0d&0VzJ~|i-Ch^UwZG9L1&3t`}Zk61FL}%<S$0i4U7Hl
z5L!~HN1BVnSRtFpWYb)CBaskxu&(u|RPt!Ejw7FYPt_IS`!;E&b@JjJXPrThATNcT
z?SDK2Qrz)4S>QYeZC;8Us>QozsZg2Q8{tukUwzrPi(|+q*rL|$a$6!Ie_tJLi2}b}
z5|>p64P49gc(eOF3{;)itvWy;sh?=ia-{Hk@|sNrS_luYK8a)75IC<>9wNe#nzvNG
zZ>dC*`<{%?z75Z{Zp#!OUErgBGJveMeky*o&yVOXf<XD17O<)sH}=K$*j+(F@5gp3
zePl^3L{8E}EK)K6?}kVGr)vn<6|EHj#MK~B0uv0vwUD5Y*G6B(O9NW^<Vjcq%Iz#h
z8ID}8JvnMf@5}cdd`Kbn``AE*hQjU6Tzt`n7Z263W0YZo-uhV)q{_x<lFIsQUW<>4
zxlIAdPZ-Eg6e0$XjsB$Q2L@%a1s&Hj;!jI|?>2a`L;M97`zrL^UGsek@`|9!%Vc4R
zxgJu0Vcg=v2!;M6@EJoXkrGPe+#&ZCF488PnE?gwm9;1AJ<JMzh*O41MQy58EG+=W
z0v8+7g&thx2ve|bALgM+D?sN_+?@hfph~T2Y$O4$pe%_Lz!Q<cv?WED9`U{0M@r74
zvh3m%;V1p<+5#J=2MswIzp~4aa1=g47c3stVIcGO4sdT6kcLT>g;(B~d=0?{5EfX4
z<<Ila>w1b+G9fh9ZRH+Q+9dP|)o|*)T69{h){-Mdzsg8ym+UGwMoQ{LhK_MMKkJ$@
zgyWm1S%6e2BY@4G-8c_X-41<=wz?dKf2%k=n6jsW+$S+DR>^;)Hi+Z3OT^50*3j|1
z;t%jdN;)O6HG{S*Avam~qlUgw9p@9fhsm?<5uoI6vc`k(cDC%nAA=}EnZzZBV2>n-
z1rgjL8wPgW_HVf-o1v#8PIilD>!KH)zuufk|C<+X*J>XOwo0eRJYa9}#Xv4|GFXCy
z3PT#)K0EwcWg*MI7~|kZwJmHyo)Ut43aBk%v$LV#8Rj`7{ft$XHMfUpp{jc_mY?7i
z>?IvH5fn)kqHXX661no>#)*U-5^xyR#ReaTwmQsYQ8boE=vfK9-~>Ei*j1HOe@!wK
z@j&{}yO7JiAI4XlPpzge4*F%R5N}_PAPWk{K^Gt2J8(>Zm`$8u;e<_eE;Lft(qx2&
zli#(>%Hu0q21N+Istbf;t*VhE8z&SItfX>z)V%Zg8oG*E63SU)Dhg=@ZuKZJ9gXik
zrZ=50b0?RdqSBZ`Nm5qvVzVdie!yZ9cJ~6bX@<T7Y(hfOqiRf(5%Hp;npFwye8KZq
z@<07rI;3w!sMxA{u&Y&Byj5_*BwV4s34|luq4~_cT$zub#(gq{nW&R&rovY}Xm!WA
ztjHioF41twL8pX9?B{_-P+>Mt_67`Yc&JcsjnpR%(-c~M37qT?y>=r@;`oaaMP<ZO
zbUde-nk_CpkRUO#QPG~NGxf1x3657bJBQEm8!&1E$c&|(pJj1|(Dn8zi6uekdZt;M
zjoc0mI!ontjZ(K3a{sl&!8c3fyY6g|BO)SmJ9vjpUjxzOz98`;v+CVL8_I#b4#fEq
zPnDk_C^?8IC&Mo}{Q2OE#EM2`tbW=mZY+sg(hy$WFqfvB&;+(60lv*&RcVU>Q(YZ&
ziAWcsXQglCo25dY?5jx^?=*K+5JDW*jBn=m4tE28Z%ABB!pao1i>Ro7b&@mIN_=-a
z6BQ@+d3;i(D-hGX&NZ3}VAfLs={j&Eq(zyvdNWA`vTz_G9h!TAX$1)-Am)9dwy(hu
zNn-IJasefJOpV!v1*G<Sf0ya+eiCh($S~W#vgV!b8?ul@L;yBo_Q$qS9h#r3A67`9
ze5*~Uha^E1`11JZik9J!&Z|$2k5uchqG=cm!ZpT<CZ0v{SSp}9HkPkV-;$<p0|)Fq
zM{GDm^t~WGFXfY_udnIrw|O((amb$Rvwrp6b&s+I>%>7|!!#yfSjDRJK=Rx`dJOok
zb;Yb8p5>nI_O}Ig*o(_PjN0B?+oK>>BcudGJBP7Y^<Ml|=~5CcaO>2R)HEPNN+s1J
zOy;3+!cVuBZQ0p3=rseTzT_j@t%on;VoWjjO;flkBMnBy+Ms%<ePU5)BwQKc;;0l+
zEiDS#y}2McYf6ZGA=ki=8k7_^U4ZiuiXkXiqr&&*$rKUR?Vt^Shd>1r!GW})HbM~W
zu%IN_0*<SiJKV6BgDT32o`Uo2ANjD~Y@B`;@Nwy?6=EaWZwnwU0*(#Lo(EL@X&I}=
zSo@Tre3QsqoX&ctm_Q!mXf>8_(EQkbTj=;P(n2nIX+CwOmCl#vfC4<3cjh9~{$h`A
z7GZ7V^ugp{6-=Z$k1!EY#jHKdYN1ZBfwwhj)`Y}wGIK~5><ptsq#WoDp6%(`6R$$|
zZKNO`p}<*%SOU}>vZMNB^-G1Z(=TOpS~z6fW$*G&)}M>2m>S=2Kb5f{b1Rx5?n1F}
z4PH`kiY=yTbjUgSHKy3eArc~H`v@(VX0}c2Gl9J86Oo0|pn8L82=1MjD?~Am=NdSy
zS_TQqkKOFlM|;Pjc#5uOBQw0}Tov%u3F*k;-5VQY<~{1|!kl$$kp{V#B{_`&!^DtT
z3V>+%YLV!F^x&MZk-rM-TEHDa%sMTA0D(tFBI)w!Goh$Jx}qyfInrM?0iZ&3`fPz2
z1+}2rKJFQDEG^{(2vzxd@=>}?rs~69<hA1Fp$f>;qyhFTIK5#l>U0)r*+uAR(Obq4
z1=c)hb0h6VSGyZBWk9Spt@j#A81qNPMf{clTY<zBA&-EBT=|<CkeXX{6|tkKJ1N6F
zT8>Vv1d>Hb2HA!}rK8}aX0OtZUHEX0);15Zd>*6UNY+;jA<n8EV3<5GEPG!Z#59>6
zJr(^zIgM3KjXW#K2aiDIOZNE4N^MHuh?c6lgt!I}x>&~XZ%bQEG9pY_JnnpfBqC3b
zN;nlSUUB}A;Yx;q5Zek#RB@Qj@RZw9;~`Ckn)0KoQDg7p(g5%mqA9#pW!{~Hb0~sZ
zv6jNDA{j!!&e6f|K_|iB?LJDtj(Gu~5Ibx?xU`b*$OyT|OdP)+Enm9@OYUIFR}22l
zR35~tuOYN%RaZmKV-YERY~#Fne|9)g$nw^)#B^FXsIs=G0h4Q6S%^M9IpDt4)xs8*
zaPvU0t0H{C1Zu$q5$%tH?yG4sZL58G&*p(qN;yiwg$}}8VtEL_qlnUAJJ5&%oeC4c
zi}zIxuC<RE04c!~tTP3{Af`!<;oZ;YQ7jPr@WMt~q{fqalt&gR95^(`j!FRjRFn>X
zCaN|AWwl{$!q4gncluQ4gpeW&;6mkxm%AiN%BO*94DmRDkRYTsZ_k4KEl@NECZ_c}
z2o)9t3JZZU55Pu;gX`poR53L-SC1CIPupDF|0Ssr*1rFS_AP2Pa<byMYOw}SgisPV
z6FCR=;+P|W0}dw;Qev64;mF~H$43BZ(#<Y_^Z<NpC^vK^Y2IKgg6HpGv-QWwbJljw
zbaXvpAD>2CWFgtjML4|aI5323A*u`9T1hT748`k{SG%!h3b&(=BQMjFo*wZa18sLn
z$X|yOiq9K75~6a59d%(}&AKH(BnICHLOP#9Igr_0CX$Ljem70;M}cokrGk#AzEi8Z
zK$b;nA?c26?Q0gp%g6ymBdpT6oN3dRbG>JpNZ{0Sb8<3xJ8zINW7lyFpFcT<KzS8G
z`SE5GLJwusk&>8^lJJp|?4eBj$>30NkS`_R_?i+BB^4<dfrEg9_?0Cd93M$oGZA~*
zFQG&VyCMO{4WqzY!nJ86lLRlsNQmlQknduJ?JIqeOdCoQ-{s6_X{(B?3kgh+E;OO0
zj&<dqw<0>JS-(Skp(wc~V(5(rVt%o1%;I4i)?X|9W5CGjhbK>Xbjt5%mUi#ixvIQ{
zxVmKgGGA3tPGc4hhWM=yO1s_*!Kn_s08oU~N(n(##5^ydBHpHPY;{*!Q7wfCBe{N|
z)?W5ZC|^}|i=a)7>cU1GNI>gYx%EzIZ_3o}YIN7EMkbb{Lfp4GRPN+jkd_}(S5AVZ
zJ&DtD(4!F)7^S_H4@AO-Eu{_O(!leFRt1q2bN$GtI-GE7`4M8oYR)0xtH_Km!sG?2
zT*=@ol7fk$-D+|*Ow5m52vFhH#(=M-k)E^T+g-{?(vn3-YN8|2bW%@pX9jI}@pA1x
zIm(}lMAvh%rB!q?-npjAYp8@BU}GB7!rESDq0qX8u{DIe8>`v8ZfzJ=DfzuD<Ayqw
z**si~C>U1b;AWz4M0J!{)v<N;JFmxBn62++<+z9vpQRvP@J|#RvQE8(nL7tM3Ar#g
zr=~JBHGW0Z5DAMIbKt68S*2m-qr6!s<1f$vm(_OaoZ<dhV!@)NZ;~P2d~6j#{^#tT
zRoJklKWgQ37nv1jnSkSVeLUv^Y&fMI)wyi;`xLC=A~re0<1k99@Mpf;RAvb?+Q7b6
zXf5F_lQxu(raUI7(Suo6zH3^mAV2ua)s0&v{1xH7X_5JMH6Y<Ojuw!b*4=jPmrkIU
z3jH$UuUr7czxnQ+0p9$>hPsL+Pvj6e;U3C0E!&7FhqJdaM@X|eE)jvRCJV3j3s4YG
zmIZbupa-y00`4gRhBG4=1ryjTh#O!e0WbjfjSmIhZM4IWYXpM#T4HDVN~kyW#F7v(
z5u(Xk31cMS$mJ&7Bm{}=2p{`Sa0a|$`SmaBTLSIroyDnXqGn)caEq_)Y`GUU_gSXF
zv}Ez_ZiMJ+`7imG5^Wl)Dd6`!j6Z}H+el@$G(~z|**{yRKZ@&2Y;a5toavV2Ka-U(
z&%fmiKQLJw9j_243z7;3;se73fnmv|5K!~8gZeRJ@=Sq&`d{TlX(uRV#RoL(w_Q$;
zx!ND>cIpXbfx8jbc+m#?OJjo--%TvwdF(9z6iJN#toI?aHbG__Bf729uwqq=iNu3F
zwa2DW96YV%Y2Xd*e4J<9==Q3|2^Lgo7nbb+-%hj1x>>|>M9T)NZVdH`#17_c*Q!U#
z`zL$pX@7jsR5n^D9V%MRV7gTwm(}mW5SjZ9(;D_8oMrhiJG-Mv$B`i?v4zpbHGtv%
zU4>ZLqtKuYNavIy^_gLA<Dqu*1M|#lNn_81rGit~8=WaC7u7n*y43X2^5KG(b2*P(
z3TN9uv-c_42VI!YLq$uPsWb>YpchcCZMTJDkDbMkLYL<aHA4?|wl$IR9q)L5<+Tmv
z3&tjw)A-d8yO9>(+xXP9-tP+r!KZ>mZse8jdZlL1nAfwzAYp5L5;;1N-=_7j$rARz
zFd8>A0Uke!c0$1XwMDgabX}@gmdyEEIIfd)bO2ajn6eaTD3P}0Dwcm~ay2-dwhj<k
z7<d%KQWwlpS0Mb8N|gCYF&WA_z*VDYb(dPbc&7<@I<RTA4NEMRnT@qbEQdwN&|y<r
zRsZBcAYaU2R3q<LhOP-c*7-G6^ov(*$-&N#%Tnz9G?-7==26Vu>?^IciFO9H8YOng
z@}I`-AHrvu52<i5EG~Ws?sWW_XjC-)mXil6JL~&D)t8bPSdHBUh<Agr2YJ~G;n`wD
z>35COjAXQjPYUg6d0xN0@X9i~#ue79x(rhc4Gy<x^5M<V+aZLkq>qa1Y@UDvUzny(
zrZEGG-`#*VTOs53KGdYYltR8Kge$~UAPqT5PA&ED2%m|O`=)&pt?lKP^H&ITBYKYM
zAXZFmOGl4xYs-=trYWRTrRQ;2kctd$?65~sn=n?EjCs*f1j!pkZJy(&tL_DE#JszB
z!wNjR8HV5~HB%#-p>d?OZ7bU*{BBhy8^@DWF~7T_Bhe;l02D!RPoP_a-J@i9v%Yp`
zSH)k)*!QqQ6Kr=@DZ<Ytw=h>!U!t$?{i6t;rDG}qajU~%*3pC#RZk~bRW)7X!g1i}
zzH;c`=VgB6$>74_<Mu84t7gNI0o-_@Cf8S|VHq^zw4aY@U7tORBv*IJl3YAVvu;=t
z30CilSqxqiKCZS9hFT?joUaG&f31F%yyQDE24ALjuy#B=ckBzKkfOr1ur+UV@k75S
zx>O7l3nBk8Ww10-r*jwDFCxB-Alm(tzvk(x$hIm<iKgAkpfER@8nI8%JFOl3m~JbH
zC_5GPb!j_f+$1@Sc}?n`U^tCL?2nD3P?cu2*C{of#PX?Vv;6FFI{RtBjm*9IpT}RX
zYM<P8%G6>iI-;okj}vzaVNXKSR3<3jc(6o>Lo|Oye{B{#o&1k!w2C0GrMyhs=Rh#R
z6HpzGBa$h=adC}`l`I@=`L?|mxj%K7)1k7e!z72Q(X&1$K!V02T-2z0xHj5Sz>3Jd
zmHvHStpiGfuRoaXXvu%=P&8b*SO1euHF&SHJ&}RovN7u)f9c1+3Vu{BPvV|)FFR7@
z9Wz`)+-g_5#IL*;U%lVfquaBJ)g)t{z%1!Pol>1nXO$Uq2p$Q*tZ|m7fyD&g(G%Vi
z>#$k6M?D=yQGoUGV<|Z)B}|I~ClTHG&IsUzp0Dp-r{kN_b}p?>#U01(EvZnqsRVA3
zhP+X%JdJZbUu0@_=k?tr_nZyeeIS^53rt=qSgQ1dPqEa4Wxr?`@6(E^4%%mUEoF@?
z=&yV;B`lgXJ=Kdr4!^pSf-h_~AADT+o{Nf73~_A?Dg?EaL@&vX*Y3)KtU`|+?3v7u
z)&>;A$caXS)JyF~)eBTrlh8@JPMD-X!4s?xWeMC6GnOh`c%e6#pC`xj&sYCpP_wgs
zA9K;~5x^?LCh_Y7P7$<4F|(O@n+^SNn*CMr<@_;#PNn_K!s|X~ZHT+_$uQS{zl0<4
z^Sayao>LfKU7BPSIV0+w>m-TG)f4X^qfb6L%rto5vcp$}1_0U|Pi<vnU~`y02`kFB
zzo-<uZ}4qBQ}SdgRRy|DEgC?L2QwW$@AP-PG!QQ{-(vR6lSfPm!XQ>-eX;K#&ueX!
zin*-JyZ2c5wTlJ}L%(($f$1k+W>ATOqaoDv)(lPM683eciGFn#v0jZ*Sh6~7FRr<r
zC#J)VmaGdpyL%uhT1@$wJNnh>Sz6oS9vxu|C$bOmI@6Ipd!jAMJv$`L4N?A(TDan;
zXQj@0yOZrqVRfS=F%WT?T@j}sD)>GA+esJ^LK7i`3L6rH9hMLotnwfZ%9H?Igwp|j
zzm47Q*0L0Ix)4$qPKFW{a4^lU?j<C!yt|hNxq|je-PT)py%dTnL=3nToFt{)2TF&9
zsFv~u4k?7`D8_vBqB<82eRlX|FESnShAGyb@D{J~lJ_V?TjWq7ZWgJD`#7H0$wApQ
zE#4xPS+#dcZY*PK!Y~2?#j!o%MznVd;uGTv77Pb9joJrUXhjVIPNqka76k2jPW8g_
zE$EvsoU+46F}k^}tt7pVQpxAs87)_21JAcR6z#VJ%_UM7g9HJ=(`OyqYyM9v`i?q2
z?V8ORJIkXvHLlN(HD<TF@xvG{=VRnezD{}H@|vop##UG9Y#cXqZ(A(4UJ$wLyDn?|
zPle^!T3K>esp(2@P9Oi6ab5LUn!SO)GQj*_m`Zfz31jU1ogYp(ZiHRKLfmTOgf+SM
zX;>bFX*5r}U);E(zxk;t*HiN12hPqw7}-S*#Y@i9I>A~(PK35ZXTxxS$YaMpCm504
zUL%t!#QYnhQi${Mhcrn8g&{1~!+WcHrvOFak}sPS9j|E@En+W_OR@V+9#7o01P?L4
zw~)G)DaPsb(WF!AUX_#;-E8)2OPegl%O+3lcAozkL5<5LDILPQR!!xSilgpxUQfP5
ztKAKDtNZY{?LW7<6T;ry(VEV!!Lf~d?}-e)7S*xIwFnT3TJcFKNu^423>{7t%_h;{
zowx#1Kq8f&Y`&tsPA|rUAMn6a$r10FwFx{Dft%RHMcM4<uO%M5<OZ5i%$+4@aIv`A
zY-fUf5|i#t+L?#>{8>;{U5rRoIPI<-31(4EM<78f@YRvQ@Nml*3l~^)fM-fT5N}<U
z{vf*wjM^`}_n^#T6mUwPf4mkj44<&>t)+6PaTs%o2!(vFQIYG_a1tiJTam>V_Ip3I
z$EtmiuZDO;l8=0_=u-E!;v1EL)$yg3(_r)Qr5mZ7pGK}UMuiA}0d_rEM5==IhC}J)
zw!DKytn}&pPZ?^JDN&pA!;4v&4xRqZpK-Zb3>!UOmA0Cu_u(p9>>S;m=QmU_aLaOn
z%>83db0>(>bPFruIW9uy=#h^uUJkPw7kv@q0|kF5hGw6KgV?PG7vm%##yZ{3cSqWP
z-jW%9^d0v-w{KASgeE&G$<KaU3~yEDS~L(eUAFVw6c9h^v*EhDhQ_c*=xpdnOPW{~
zhdFdzMB^fK9lD7>#dl;tIo@&kS+Cuyfi?(ScQ@qPOy1&rw02V#^d5BNLV-2EbO_<R
zxp90;R&XdqO19VC7<`G6o&{_uA+%zh%3yKF!f<kci4juH;txk!>ejcWllWciaCI*w
zo6@|LE9gl>Oh*#J?8V}9`sao&M)L+0PM^pnU%~-r$3@&6$pNZn>>k#8gos?PhjGdS
z-$WEBLlt-s2Am(AUe4gPaD-n!4jKSr-Arv?RZd@(@g`%XOn#(Y47GG<6`ne>&t?FB
zilnITD@K@mn!FsB1pJ(fN8rd-F?Ze@vF2H9i7gMD(k(E;bsBqVBesrJ+dG@Jr48&?
zTCtkisnojYJSQZDhr;828u=V6WxDo*2P;dA;Uq{$Lp_I<=)SQCZfBi8LcaC%CF!uf
z{7BxE@aF1I&Y3=8F$XrPx7x1b(H~pnLeLu`{(fv{&bnbs-9BQrUB7z?lKbxQJO4Zz
zyy)B!3xk}PDl0U!glW;;ev%4<p+Ly7$f^qXsrt@>1^}G#KLr-VBNnJ)6-?l;aM41=
zOftm@Gm8))u$HiZl8i5KmQaBKn{FZc!JMMoT;W~?r)UaVxMlkQ_I9({O3f%ZR4MMk
zVD}wOyFB3*YJtxi#uoyF7ftaiJe#&-a};)kA1(3Mrr3}hd}6h1kGCkLFU3YzcGOkx
zQM_8#5ro-KN4<<&kX1}pXm%@3)3|kRhoIA0;+eaF;=-^}uL(yY?aE|`?yMu3k2u+p
za~tREQv>k*JPG_0llc~saGi&-*-K2f8tj8n3N0xt*}*-VFr_wW2rcYl*|#_+P2v~K
z6p<~p;>{sP_&kt}>EG;wDJ_rdC`H`@>!w4N{3ucCNFpYy@zj4}h`wZgQxx#9Z)|<M
zudTV9cVYbQ_njNO2uHex_b=$wbr@v3Jr8VaQwCW$ow{!V(Ue~7ARzr<{O{lC0jnhl
z;8+TAfc^top#+`qw*E8+u{U5_?Zhji_K4?x`iQ}57+QR>U&FT@5>`2oz2h|a^oL?V
z5QVh`b6{4-DTh6eJ*U`A?1rR<B4J$@!JUGXzaBf>C1P8LcHn^Za{C&~pM43_w{*2D
zMus89HoK`oM<Q-#dnZSgx`pRSh5ao`Qo37<;F!6dLWYy<X?0zRxEL;Z)xw({4c!uq
zk4H)m&saew)f|{$=x1y_-<bA%(LQ$tDX0XlP|+nKY>lYex}0cv-lw_cWd;}(!jggq
zE8v+~1#XFN=3K`g9akG6J?S=;r`R?M&>5eLWH5(I^~dLr$BkBczib*&kXdoQk!*&h
zI?W}dJUF(>m|aWR?Xk_gJbiEeisrd?7r0#`V%ilSW?KM5gOF$%3D*zSg;0s`ss*A;
zV~26!grP5gO+ZKt6{Z8ksG}Fa)WA@iM@sGh3rrdLeVR(xHjDZC;-pQmRSR<UbUKKt
z=C;{`jG3oIQh1OL-1ey7YYDdRnmu^wb=U_D8Pziw++AK~=Ok-88_5aCxrA|JC<kXS
z{^`oV*a+&-q6B`tRG9Vu4h?XZz}KdeYod|DsjcW1(2Z(caCv&dBs?w@{I*|85by&M
zG#O%l8>`^BAoYjw&EC>dvUY#;NZ?dop2-6vaW5#3zZkZ8sQ+byMO|ytbQ`f+wjbMU
zeD@$55o9S+yPfLU{6%#ZB;aipGGcPxT(n~po?7y`^O}D|Hw}}J2Ge{S{N!Hu`DI{6
zieEXeGBm{1q6G)}TgxN3BOtc9?g-H=?eQ&pWX$lTI)DZ@g_P)H3D3_AjU4cH*HRD{
zdP*<RZx~&_?;QStGWcOYGov0GxbFi8sfr8kt{K9YedF6U9j~#%&x<NM9WQrMdX2Ye
zDE;IMpFf1q5-iX7OO082J{A&ecRXLevXwQk%w(XG_N)iOT0x-YqDGZwy+I)<vrb0e
zpTkJY#N&dEVPxo&SPXx;sbVlaO6>>Xl9I}*>`diIo&8mC<*?8*`oRLHcfT|J8veRg
zE}h*WGv+MT^8i6Qh%^h3CL&Z@H)R>iHbn?r9d#u9z|?RpL@<=<H~cQR`nZ$pSWvg#
zs$#_G;hQ^#^9U@meCA>555DWaM<qKE9Zx=bwGO$-v)|U+YBsPX7JTnx69Y5*STG#^
zCa?6o1jPc`BQ7i>Q;mo{G?WiJE8l2-Fs<;EBXWiAEL`CtX|$S097Y4wxvdYCHAvF#
zk|0bCUHtAD-RQHkA>q+2CSiyJH2{?opi?yUzCe{C35@XgSVRDUqW;UOQgP#}!8Bb1
z!4b&Eby4Jq*j2fMwuD0=HWy8Ah1Ev$JFjIDA(b%sJ)J;qsWv>p=eqh1#mg1Hd-dsD
zy85$uVjpqJW`*s)g<Ca_{law3?|Gu$LT9>)SxLH;==f^1s&Zbf1CmQxT&{tJanASA
zi(1WGn*Q_kvXWJ&cY=hcUcc4|h~Jyu!lR1E2<g0)KDh-__wyVJRT~4ClZu89<10kn
z#Ztffo4E#ULHA707Hj9Q25#WX-lFN0iwGTmIu+qt+<VUrk_o)powrC#arN~Garu<T
z>*U(x4Wti?mQ$!xFiKr6hOF;h&%Y+d`yqv*77?r!RTDI0`v@vOi7MHujO7}}G_1-C
z(NnN`sVN(-!4<^A;%Ko|h}Mm-=asSjbO+gFaiTu-biSoHZK1fL0Agswk0mZQvM{GN
zy+=gbgh@>%0<U(ZDV=l+Iwyd;f@_L`Y>#8*2|O*kgKxfYVCXn+IOIq{eOp$dcsZf@
zhPu>=RkiEoS>cuOwg2_Gqst(j9WPdK|7upDq>_AXm~rQt$hwGg0H!UR&R%pXo=Ogm
z2166>C|I|C=ksx1HqUKbjc-r?VoGP1`jNh=W*{~^@k4klwI`(=m&d~6MdRy5n&921
zn<t%jA3B4ANM+xLU5_!0OK=LaQ?PozH_o~i61GTDUfC>A_({n{6xJxt!dA+;djz<F
zawW!Vx#*N==_7=Ziy@mPcsj=*D~Gg_<sQi5bY7Fo3S;K#V_`+oG^qrl3u{*XCg%He
z^`tHE$u5GNTfW=h(0KTk=F>!13KdS+CO<A>H(L>|1T+Q=qy>-yZLkr?Tsaa#p^%M>
zw|Y^wNXfqM5GVpI6g^M}o1WemzheVkjgZ84KC(|dfyvOnr@=qmceuFAfb#c=%mv47
z_Oh%1eO%4ha89y@U~MFl$KWE?JM*+e9}MFsfdwzyu-3cTO0zq$q|b9VfsvKkO+~`=
zJI0f2LN=d+J}%Tkj9<?fGvM`%sy|gcji0{6JY6@ws@#`QJf*~bDi8%%$W89Y%@9zq
z`zpD~NLW#$z%6Qd6k{fypz+Ge-(VacSQ7kRwK&XYNFDkyie~v5HG0v9JU+N4A?EwK
z`x?mQS7AYz>U4(?8W1!l-+Z%PH4`*3=gB1wY8bFlFp(A*m&8=~4KKNVG&1GpA`7}R
zx{Jwfo5->C;G2paLjIbY){{1;kiwuO_*hoZeyoFBhVgsaS~r~vFdYaE#qe$A2nB}@
z2LIKI>DHv43;*sk{KrmQAmw&@DnzR0appr)j=T1dNXF&~o0NaTcA+|E?gEQ_!&nHX
z3FT$#XZabl8kcFqrX)}8wqWu+jRO%xVn*GLOSEekS(H7*s=NftAR{~vjWLOdxgi6J
zXNeMSms$7{dajXiRVo|A?bNmDFb#f^;Lwe$KW#OxE2KP~P61ERPk*u2LOuoPyhcEk
zlxvH2yMtohO=O?w&SjSk_t&h|LE%pUJAd}e{z&K;CI$7iegB)_{i5kiy449AMY=t(
zfE}%`*~0Axr0w~cEigHyQ-KgHooA+n6Sny6W6qb~uU5D3=_B!8)39TcTg!;=*PAg%
zhMAgZ>J9TGk>jA4wuHxSd{k%t?uci1o*xTTZLz}yQJj%2htUew<CH*5<}x5+2}hA<
zM0pUg^C?o|B4sWCDJ=l$op)04Ha)yM+1a1K5GB+^L|h{<N<_HAAD^+GZ8UQlu><>A
zLOYu)eoS9Kr?o>ZKJh;WxeS%|q@9w_ly;7{-Jp>Pxxy5A9ljI`qGU|dF`_B+<7rhW
z>a|%__*Nf?&`mP19Vb$}UYP8N<vry}6Q%upg&=de%mN8C%p135WIN9HKv#~j%EjB8
zAG6(!^t0$ARGboY)_m0c@2@(B(VU*rSd1P^vzxqCPv}h&5l#HTD$nNxlswVKCleA$
zZ~3pv6%tbBgk&GoUK$E3`4kHRKI&7q!GR81KXq2tiJ+4T7H%Yl-fGfsPC0AEQa`qh
z`xx&n?}uw%yFV~~q60V81T0lzYLl4zG!DN&#J%!Zh-x~dKF-TYuqa9ttRt)0z7Ju2
zqjRVQ@o&dv2`PB&5FnzDN0)`gM@SbuRjK{xY}N9{<<j<avD5G-2E|ZQ3-Y${U&N*~
zH#x_W+$0NCVw27-<JKD*0gp=<;S-@6?<HTa!!4Vxv9)9)nORxoL3qLq-zL{x4$#Pw
zV4_$5MoP`=43Z}}&8>4vjnE|=Qy~4kUQea0dPft&L~+7+M*0gfo(GREU=d{Y)cpei
z!z#7sdzRPI_~791(jVE{*JSu_zuMt!WL4EZH5)16mVD6KWBO!BpGi|Ake~2e_LlcC
zC^57Kt;BQL{J;#SwOzh%EyIen)!gjsv6!0C`f<CCwc>n6V<Y0cNLxspT`|Z*G~d?w
zJ3|)0Kh{N!9BqD<uED~-ESOI|X)KNZfkL)0F63sUv+bAoA>S$l3bWmrk0-f!z>YcI
z&!ESlaXe!i@yKsiMH40I<CKFS4w9sKt0Aa}a9u_|&ELXxdCSy@gT(PEDabwjX#u&E
z7-U@)k<^qmt;sYB3-6iQbOC3d{?#Au2E4T9Zxq7Ps-4|osM!K)d`U}G!6~DqiF#gA
zi2yb^{SBU`h?^GI=a2WMt6yE<YWmKFGw2!<Jfx6M+HV&wC7qrz7e)G?Roz{fPY$WA
zkG#Qd>e@E@f!&%<Sp83}4=<-P(*Xz>vO`Twhwg02+;g`-{P|t{%SIkA$Od619sgz`
z#|u?l43)+kvhSpL<R#}l&4~?F=HBPFzHD&Ex4m~c=`#a{7+sXy<|Xjih%qc-Rj7+x
zF6{;stzf-nctdPh;uSn@57!~eal-y~Nh1dL&9v6JDY@dsZ1l79S!gyeYu!35O8&7s
zOlmkoY?+T4B|Dc|mBTNWWknPBFg3hHyr!+DZNDdA<3gysX>z&ViPl{uu|!8##)Csa
znFX{#k?%o-YPJc)D!D}<<23VK8oRyW_hvL=mj4c!gS+vpD|=Ccwqa<gEE5o@)l1cZ
zo!M>0Oz7hs_XhV_0r#gD-7Ou-G05%l$Nj0pZ*V=Bs6;XRH$-8(_fL)s%<2Oh;o#eu
zi<{kH562V5NPymIFkisKA~|CSXNTu$l{6Y=_5v+(&><=VEm5D(>@NG@<E3$;042T?
z^=pPs0NbTbYuR&T?QRDxn$B2a$Lop7@UWBE&y5$Pcmx}tAlhA{q`D^(L7uW-^lI84
zUo=~oe~C&sXvE&+`NNKf*P{Q(FN!ss4|S<X3SCCqJQ|27>8xLcdU}7Mt9)ob5@?do
z4LBsIvF<ly{6u>o`!~jiU;v4dYPW#REJxc{iuWjky{y5HsWDMGvISncw8U^w5~DT8
zNJeLHJnzZozNbtq$qJ0t&pUCL*|x5g!E^gQ2cz0@<s+TsQHfD?lvm||N5IAFAjR5C
zjG>pSxZz?hz+z^}!aP5g@#>Q#C52_s`lpTjTXIvvCBhGAqtB!u9TfFvl)m0*HQUpl
zSh!)LKtz*tu(NlO$pakO)UuvUA2@k6vAMx@Il>5&7FB=}wP`AlcNvE34~)gEcul7&
zC%Q3>)SjomMf^CMDtc<x@sj`l6rQrKvE7=8WX|uHer;8~cM0UZhUqyu%5p*?`gooy
zXJsL1X&S_$d);7}wx-r(dy}$%5L5bo&T_K(c4wykSTH5AHtN??OGzW4WsRiZqkU0#
z5}U&8c%oa&?#9Dm{8rh;(P2kmIcspPY|>D;q5xt}&GiJAVJ$GW-*Ca#Gzz52AX_%Z
z@;&_1cq%J$+F+jOUCz@}X+VOB*sb5fFPj9zRv%rqZmI=;&y-faTfF;?$`1IF9k2M%
z7(w_=A+eW$9h;8FiV@?xFD&}6P*UL*W1ZA()81)5_km?Rr-9KTnyKImmsV8`6X?6E
z?XNA!$D>(TrfXSPJ(}RgskoumKb6BlXl2C%&*J)SMsZ>cdZuJGM*nQ%D|m%deJM7@
zdb}}BK=dqM^v5C>ZSi*aHdgt_d?|zqh>lS{LTHXoNvKmG9uCX`U%gcTzWJewVDK`o
zhe<fP_umAHj|C_?-onhrT{Y6Fe9a@Q=#S!@mO3j4oVoyY4h7}adFrV51lyZEA~mne
zOah;6N-VXPrx3qRNnr9G8PEn~KGz+I)RV9MrI+n=YeJ1{u3{q^Y8M|{697B;K1G)Y
zuAholOV64ALcn@1)d^rK^B7AD+2tK1K5Fa<5%c+6$r7=V*Rtub5MUkBdbN6Ln!PKh
zyyItguJwh)a>KaKD?S#(<>G+NZ#K=~?|}YO08(ofakAZXP;rgR(yj~hPI6Joax#I0
ztFiB?*iLW#D9}Azr^(kIZzzv-_w+bb4=pb#=5cpxvCQ)pr!<hE-hIxd#(ms|l3*8_
zKh(RB!i?oICO+88;56z*3^@=6Sw^{r9~8j>9B<EgJja}@I0rg^`ylVk#H{?7@V{6J
zNTYauFtK{hWk1U$k<f1#_@tcE+D5RmP;4dg$*pC3ZdId_?FBoGKZIPg1s-(IF@O*)
zfU>tPik{rHHJ(PjD^-UEMC9wQ{6#C<R|)ANkpRI_0*ojD*C7z72wAw8jxdx37_10H
zIFcYtW(k$W|AJu_*tiSTDThGCiR%>;c4Fg8g5GNC|5N*Kd+(m{dN4VK1(y%t+ssCa
zL%^a{g&LW?Z?;y1ZUy<)Tv>TtPBZXqJEDK6o@uZSRLx5YJ6ugIOyiXe6MBCs+;$hx
zL3BHVFfQEqH<o4ftl~(dO`Ys#(UZc(HnUjbHRZM;Qx1I0^cTlYln$B>{|z5!-rNMC
zeVg6|y?i5mLxk9}->Y&WtOO?~5o~&NCgrc<m^o|UCM~QYa^>Ehqv0CoW0{NJiwiE#
zlXi?1N+BZ-5ij@fmd@BHudGI94Jf93NK4!2%uAMoeOTum1g`Ef$OB?zU##N`txcjD
z%>2;~U@K@`xR0ww?k}taTo<STNB)03>awNL-YWCA_Po>isTb3YkcHWh7R$pD7TwF=
z`Lw_NJxV;`V1$Vu#7H;SL0tgEmQ&T0Gb;chsO@1i*skfxPg=dZ5~2j`PqAE092<L+
znpXabl03E7+B?IWLxDQqSj#E-WP+Mc<Q!L62P>MW2*{6;9s2QyCd&?KOa6YFakrFz
zZ$T^^q$xMjL4A0`lDtwfE33Z21CA9YJR<c3X{n<kR++64T>L+jeN|LkP1h#wPU8*@
zX<Pz9f;H~YxJ!^A3GPng1ZmtI0t5~2n&81DxO;F2o=m^*_kU~6teKm+IBVDHzBs4$
zse1OVEziN1c*K6#a_Zrn?7q#vdKmSxTL0p;C$Iio{6XxolxtT8>FdFqA;t+aGwror
z4?6b~d01c?7o7>pOkaM=9{0eWjzrQ&`R;E4>*0NC=nQ`q^7Bo7<?UCl_?;+*2Lmbh
zm5p{!C-c&1<kOWDUzkqacJV0$+z-Z1Z+7bK7l-Jj&qw0sn7qqy?9yE;5T)1L&GSBp
z@S71~b7dq>@+j=7D!Ohy+Y^MBS@8mt<(58zda*`oTDeyeYG48#q{FAXuj%O@l0NaB
zNpv8h98+XI?fHEv5JKLCEHJ}L23)yMpeb#$rR@w<GE6j+<6&NU1SU>eI1%JimM!si
z!&|43^;?(3nHE+Kz=FQ~Po6iDNvR+!FlGmX^4gms1eZ{NA2NIZLmQa%lP3!QU`OzY
z0}wGH<<j~Vx<mF;AhFiUqF~i?DJvu-X-0u*V4fS>V*>yj86!+5JB5b^F`xm0J7NCa
z#{veOM<%Rx-oP5i!!A=fDkXY9z1@b?+R<*fPf_rvo8K3=&H49k`PYxfaHtom&AV?i
zdi#A=i~g=*a@fi2vAb%SS6(S+#2JN+zyEF|NpEjO;@Royo3aEf?D-S@(L+0eaq;4K
zU4^Yudi#QLTYjJ}>BkJ_Y<#XHXjbIRPa~FeI@&ae?k6f5|6Bu4GQ2@)f<NK){wHNu
z^w&v$>HyZw^Fwr`uEBFwP}>h_UJ^lwfBjJ6RlBtXz${`EQ%)2jw>8bLrN69b7B0?Q
z`~nL5xF!479U3h8dA9A&ulKhwj!@!bMnT9fC2@S>uzyWvN?qJvO9EzCvOzdW;S4|v
zp`zX>q-ZJLC@4D=gp;YtBg=~<93^AfOAt=Pv*$4KWPMQaz5d}s^n2dxF>?)kDSaXh
z;R=zdqi?sTu3PJY!ft-G#>yfr4+07FKfiAWlTBgSOwc7~b=_M(l;uCCJ|8~>4PCO=
zU-rJkxT1botCYaRPZ8xrpLBwLebJ=dH-=7|(Yxt&hTpsv5r0P}8VRMGz}ti>=*$E^
z<##pdjSP0bKC#-$y0iF6rtG;V=F(fad7EGBZ<OZrAmd46#t^x+2UrlB`W`~AR+6N|
z-o>_(z@1iVWHT~ff~>g!D`$}N)t=YD$j0aFeaj6CgSt`bz86Y+INH;*`W~;oSEl}4
znbZAMepT#y5-hUuWB%~;*owQg{2vi3uqyPIP_xwUTvP1HBep!FDq3RnD97a%6>&3h
zWg=JZY#qkJ&DAcAK_$Suxix?kN6}O{3WKsJ5|o}IMs6gDh0>io8w@XZk|?781x0`a
zLs{J4prDKVcB7W2jgoR-dd~yMLpbJyg}#~eRDXe$ZDdb5kn=(rf8XpWRqPag5bM-P
z`w*x;vAT>Gn#DZfXgqd{EQvD1Uc&|v@^*;>h@7)4()W3~?;ZX^l=o{kZtXGJul13x
zc}1&v{%o->>~pLx0rywQj#ECof1hXUU#D)v>2Df%v%4`y%pF80^1c+Xy>!-%6!-g5
zzEX%Jtw%dk*PBMIpJS;msM{)}u|ouV&vC&(h~iw5_F(wSDfaH|61Sx8UsalTc>}WV
z-?^ln+HNk$SQ*M5ni4Mle%k!@tPcCT<odYaC>;2)Bd4Rm4DJdrlsP%2zxHZo7ZwWe
z!@g=6J~p8n$#x53H;NxmpG*4mg<Ex(*)V@lE>PQKe3Li$_i+f*yQuyWPcfAgP)T7g
zLD-Zwx^$lfDjhudJAAfI-InYlvtQ+{82EJMwfAE(kX^pED!K7WS##f~WW2pz*kEE~
z1^Kf$721=kLC2FD`L3!xyzjlW9Xo`v?k4o=`{SK;-?CR?4}@>jDWvrMK(-M3`Hvve
z-#LcNi$n>-g`cRb??zHD3@3)ujU>|U4#Zx`bAL?JlX%Xp!OJwemOOBq-2r(3$EtUU
z74o^M5NeW|KU_z;(kVeBGUT38@dKIY0xyf;4i0>I=jnt7N!-B;9!wJ7!3x+FpR8BD
z%DVnKmP>ghttSg)u*CuN8~K7xeorKNJc&yStJ|A#1u-{Dw>Em@<#ct)2R=N}IV{Qt
z$k(hYi4|hk8Mn5mk8V;}r>@TEtk`h-D#n{EGq$CAZMm34%EJ%UEOhfr3_;hEL9BFK
z{yJyYIj9xyWMW>P1~23mH?$EIz_3A}MCT;7JhAQYYxBBUi{9BE-4a?uB;OK1C7(JZ
zkcWxVtt|7g0pwvnalyMgZPY`(f4`;&pn0~!GeKsb8<n~nZyPH6N(jfDz+x>A*roNn
zkcssrmi)j6qTy?QxEa8lT#dDK4waenu$Jte7=1M?;qQ|RkPgi94{z@jM3=qFsv4!L
zKRskLXnL}2%c;|=|Kiw>a1PV6`D=)0V)&{w4=9BB-g;>PfA<rv(^yg5`SCc^z)Y0A
zL%kOEt^Znc9{PLA2<Snxq`8*DqIY(l9)7YR_a_}R`!P;LyUA*J;Fnu{;9sPNTQ`Zc
zo_iy;u4khM?-7Uk>u>3<M}3GRp<M8^4B`lDxM>@HXpc<b?{SGyd1ccG;s%0x34FCN
zz9nC)uOFZdbz7UptLIuvzV3+B+00Ye`NKu3PT>6NG!+8id#|)4{|+u1Qe+eNX%D{8
z%aBLwEQ0V4fS*z~pHyhVo?xLef!=gJ<6=0H^y>D@TD!m2IL#mPD|oE*%u+|wfEDM8
zkx0Q;!RU~UOolzx=!@~%V3`lW@HVFBgNBX1zvE<Hf<X@5)TUA*q8AQV7<tn6BP133
zoBS_ZnVJ}XP<>uzUoiw<?*c>tY@uE6^+vnKwcyU}2cNCnzp%RliC2GjI{v0}QJEP3
zm2@pAh&NfMf7-H!p8|~+emw#P?@=Faum3V~ci&+f^t|U99!#gl>`9`NxNNyvHIhhe
z^4lL?f6ZRtZW=c85b7(sq_YT#B!fh_X>P*{f%IA8OyeIXh+72JUB5UDvw7oI-uW|n
z@x|K#3%h!>mrGUTuhaQ~!%blW8hl=*KQARG*47y+J^g{K)HJ64I%yxXnEzhU{WS@M
z@^!u}X$?P-um2>Y*UBHc;%tD&ifV_6x&J8qIrICQ@Ikzee3u<Ojv&cK;Mb+fNuDqZ
zL$UnU&;yUZQ?Ot~aI^x6{m2EpNgTZgB0z911{lgGkpBAD7aAM$O-!q;CoAR3hzz%_
zTx(WEb6?`_?BchmC6CR<s_UG}EuHKRcY%y|_3HFuM(_PEBU?lRe6|lqlD-wWU7dB7
z(GMw?PWh;diod={Kx?ex1y8JPAQD}4Q@6F7s;#bauzQY2AYYZpF~pl~;Ly~Os12dl
zd(Zm0zB*}*cWBG<*AO?lef2P+6~tXT=_A$UH__jk>>*|S*!3_u{MzY7;kTp{U|wwI
zdqTO>nN=PP7kz(Z<_Fy{9>H%d!IrV#JIcEQ-?@jWri7{eQuMtcK{UxbAdVTST<vYO
zsatse`JK*$!SAF9bcGIfk{{8UOKBL4?&|elY8hVg_<JjkF)kyAg=XKEbJ6H74wiqS
z5T*T$4!QV@i3xorL<1uZStTD@jT|y`-XvP*uHJ?MgqG0L%f=*Mt1N9!MjYUBPsqzA
z*P=Do^UBtgQm4R64Br-lT<x8rD__ay1T2Zz{~U1cNmpstkpKPGufgSfte$)^zqQGL
zb~iVzlJ#lNMkLnhg+|!RtAk_ZD$iey`Le^wVYs1PK*!a=ais85W#8k$Xqxo(Rv|}9
zs)i6etzs&UN~n+QWIc2#TW>pHbhTCV9uCxt)=yt$>o2E7GdmthGCTHlgb}v24%^u$
zCO)`$T7MeLE@rx>5Vs2Q4V6&8I(8b3*ZO3&n8}=^;ZACY^TRbvC^l&$7V7D>2gN8=
za-BxSmCx(!R$PqaM)A={hhAn&{CPe4mn~|FTG%<TbTxRUBh^>m@iTRj3_+Pg0v<d=
z?KEaeP%=KsexE02C%?F&jl7~{N<O%92Lp!9m=|b)0h&K(<pQjVdXEx;SZrM)8N6>G
z!?dkE*uZbho<#^C#kwe|=Dx<nF$p@M<``fh;l}8ma%AUcRs(a&5vjbLFF8T2sP#N%
zzs>aV_?*%3q&`m|l%J}gZXFa1A*E)=eyOZCe{pa<9Hk_mdAk2Ani{k}J7wzKsQf#}
zh=tXfY)@{P!Jz4Y>A`Amtp4_%jOWH|^v&?;pHJ+}U+<yu4$h&$DLzEZO`CiQPp_{2
zY`;%!-53>R!M|1?%L;JY&1?zcs11B(Ka3A`rEzWA`9@R{#1_d_o4EEqeXR6b7bQ*A
z`Ebf=`-&^CMN5^0kY1Y8U&)#>TBvkN4YCkb=aeFi@R#DBx5IWtB-JC%v9W5-z6}U?
zRo25Ru}nqMdl6h#hQzn#!6okSm1w$1G=0k(dI=@0vx6(n;(00qI*YhOI2`Tr;rFt{
z$S_h$)NDE?Y7#4FQf<%XP|TJvCUTb<u9!4TG=Tahh51M)9aym&3lLcS?$eA1a@bM|
z?L#8rFdcA=W8n@u5XVI7)|+AHR&v=91C?fLZnksAue)0xE26&NQ(LxJ3JPo!9Tr0?
zR82mP2P(3OGqt?N>vIr_z1c}ZNxG!JZe3Lq19>H;>3bUz_1odsCn!txv3i4tc1cr+
z6A`TSW;2VFYNnk=WlH5j2Vo)|@4qZ3?;5g2VdrTbcE2v5Ulo_;5DFd)y|YD_2Dz-K
zTBWddJwt^=X2G;cySjtmB|k^jJU{Iu<;lLM;KUD#u;qAd7Y~<@-hX_p^MEAVf0ekD
z+71xUur0~!7MHZc=5?z)iGTl=uHac_MYcUuhqtaz!@FGS=a`-ij)Hr*p`iPZGFvQB
zQuZj2&6nA46$l2wt8JSQP(kpTHYJa@V+niFs2K8Fasm3)5EYl+BL*SIkgJJCV}fwy
zXrsNGT-+pFMvaxkBCE{7jqiaE2$<oCh3_T<g#CglML9&7J#y`wIk4u3HP0$nw15qd
zUrMCp>?L_(MDKQKt?q0d85FsMxmz0I?RVqjgRys^4LFpKho{o}?QTG__@UI@0MMA@
z>Os5siSII)Amh6$!Y=eRJ}qfZ+JN372#yr6xfyKDg&Pe8+v<&`igUF^K4Z0IPKx>T
z(q`<Bqw1Ce<uRG>6dvwSTuW=-s-nAS20=F3o->tjRuPMtC<;A7v?1~$0Tf@zsE`sx
zJjzYu<lF<s%{%G)e&lh<AmWCNx*GQWDJ<TK`084?^>)ib!$5=HFl^njx!#_QSQmCF
zQeXP{Ed^3KM>T_*@>r_xZpY(HqSM4}kZ)!h;#O!;Na4q_S4ggq`9BKwewyD9)jxN0
z>)ge82fiM`3Tq-kYa<LRCPgX4o3tp8e!%@D|2=@JGqd%xq)2EE^n0KiTkQwCogztU
z^20LuF|W-6j@`Syoo_FPU2ipL<?+`E4~`ka212QC*P`B&`JE~GTuXb)-a8(1lH)@o
z5+JGVTrga^Zm?O}oI6koli4A2mFM2$o;J1m!s^2D7qSgSl#Sd6|2E`3H}`>SG#6W`
zwx1HK1a*sx+A>ytTRuOdA}{{DkPa#U{5^}NNLa8EBms^JoH#fqbI6P{1dND^xWwV^
z1Sp?45Ns2GXpY0%2>&jYoNj*Ext8raY%ALiF6UJkBh1@N{WH;rB<LGT9azvStEdJ>
zkXHOUj`tR(y+0M0Kmh>qN}+qD=&bMQt@bc;D+Qfn5MC}_ni}FI42QYFPA9BRmu*oC
z_g_<y-xe>%Kh1>h-ge?E%2QaSgoQ1p3P?=VAila<ajwN<)qRnrkqMaT=jGrzo0C>4
z4yip+)yW9S9gOnpH__vqqUcQcLwB2>@Hp8ELq22}ZW?lWacUH&q5T(E22f2VLT+cn
zKvpWqbveHWDXD-Mw_SkG{5u|!w$wbk0w&R#*r5uDcGDG3gT#fGXH&w}2FQOGsoyQ4
zOgw3(2stOxo@JV?<d!%;{3u{O?GEXGFJXr~lLN%<(k3{fC(%&Q5clwYgC5^JT|RLC
z1}&PSYa!IN@j@K1fALp@;hBp7KRp7c!q|B|xe%&u4MDa%i_n{^nLTzzL&;Ah^3?|T
z$5lyULK4f7w%(#vcRTrtQ)tBAvuKnnIhGr14C+n<Pv4;nV@xB5d>!aoxxl5?u>JM)
zaj)D2G&1@befv-$)e~fzu#nib{+a04$0$4gZFpM^mSvR;L;Xn~BbKo<YZ6G3u)&Cl
z1v1QUp3R&Bv?7;Dh5PS90V(qUF~_iH0asl`*dVv+$~*R97j&|Dq{Qm*%bH^ql%)ws
zW?@Lx2S1=A`LAYzAW>FP2Px}lEK!ra(sp*my|RjYnH)4R%o2KK8f+2fTNs2W9*r)p
znt@0FhToF@O=LrebJz(=-F!#pKuJR^he(cS8(e5kRT=46sHg73?a*Esub?NPha<ZL
zK|AKANnnV@+qYeDe;kNc58jQOmLWn>JNW^*lA)1Bk3h+5k6FCxYAvI^F8I;3*|jW{
zvz1tT;AtWv`nkPI9bE-dRDjL36pd6C9$r2k70ZhKgdQ*c1}82rj7kd3B)21<P~1#~
zg+wAHeGnoKSwTiTRz(B%{@wIVm(U^kG?0zcw^!eRGd*o&VVkfu&L4-=h+-=`5QAaI
zB{Af!(VBc2i-JLengC7sd(AtJiBBU_OgLIR;!xvoacNrNjRwF(>8v?nh(g5i2#$%f
zfb&}c*DAO6u7%o-G9}O*rU$?j0o1YI4@073cybptcp;k=7YgJ*nKh<=Youl|$j7$U
zt<qEF@?2^7R|h5m<Wz`Y=~Y8q+;P;==x0NB1)67j9U4bppCZl?rBF+k3TTrcKegIu
zWU<+f34w(n|KzB`z7nJMaJyQ|#Y5_%`lSiNPv8YN05CvO<0%<TbU}lTAsz9KC#jbU
z#*aG0fARO%IZr5<A9d+Pa)_Rz60s&sv3~+Yg)6w?@`YhXq&JaJIO*Dbo-npt;8Afx
zbq==3bEU9jhVLq=o>MQ+<RHsN6(GEQth#u}F!12P-<qO4EI1;n_Y6ETZ=4Ewnkj!1
zS|{W;Q&JPjXI&JAbA4^V5gAdiBoKT>>7zbf|F)pa{w;9{W=Rp^xm<ws+Ro>|zPH44
zCXNIV3j~<5jCqMDZIh5~?Tz%R&A*vng@8gnU$7ngl2T)@9*%P)18*M)+uglQ9L#GI
zC~(lny79gvKx|PVpl${qLK%j89YWOg42*5CxI|~ZM!x$~cFAaRF*X;;!iM(u4H;Py
ztNRI1IV(P=gYUP%!>{ZLTZLq5g^`fk*Zk=P>%3joXD3~XSf=WhTQ|}f(2JCp3sNNW
zGmW1$2r0h7{V89ZAGBhp=XmNNyET$A`@;SgB9BDQ+@KPIE{b|@K2JFmqEsG!REjfY
z6j1AkuPW0O&Ar5{QK^9y8EL}J2K{)zHAgpbs&sEyF%5O2tn{P;CQc9bU5%_5rL|4F
zamJuS1-bV}+!XX{@3R>P{cd;v^vG=}quo{u*2P;fDcV}q>8@_{p6WDACHal;Nt?|3
zaUioO?(x!v-<8q#@`j2q`i?w~ix>S!#quCn$rMwtUrwZg|9zf;=CA$HSiRClag*gI
zp^UF&SGy$ni`e~=iY50UG3Xto6~%H_?6it<M*<Ze0?SeAFs;5(cmr>PnZn*6^l$dQ
z(17r_W<1A0$la`%;YfQk3h0D8Vm3SlVJ5cuc&QenX6@dOaZnpyvEjA>Wdpw5Ojk|(
zD@kE<l#q3yN!6@Gs>p;L8ilzd9*r|^?onLp><RhDUa`g#I336Pu!So5fhg1t-iMx8
z6`tCf^he;YsVN26a9F;u^Z4EI!QZXNZh5xkxwo;tkPVGj!pMrgD!F@DEGK?fT@?qQ
z;)o0>^~2lF2&)X=PahNOC+Zn<QLx*?H=-V=QkaQ2B432sX>EA;?q3Y#r3>0;WJ1`p
zl06E0I@yF`*XXedxh~PWw((KW0#7V7qmb}J13!UKzOO7sqTea%p+JT!yFSP2#4(zM
znOo+})P*q#bS8-Ii(d)pc5{A|<elZwe;S5oR3aw5q@Ae%ip^bOA2}ZQ-$lfN5H-U_
zVAjTHJjQ`l{BJZV`~PJ`-2CceR++PPPNn0dg`u7Gct%>@No)-R5eU6c3E7~5j(_jC
zH$s5-C(cZtK%;QsCG&6+I}`>>u^Ega4TO+MP#4=?-V?k=MG@;6zXZ=YI7;Y=xK14_
zIXtSl@^qLjlz|<Mcij@ra)4loLY0eg_Fw*_)_;hUiW20;;B>yt#DmTv&OaNst}Oj`
zC~&Y}byIC2^nF5^RRH|7HlEIba|7tOvJ;n7RO<Q{I$okarhpFBdHhLa7yvk1A%Sor
zNuuzaV|L0f_6SeSfQ319F<v%(2Y8U<#rEMhKU67O0p;-0;9&5HN~IybEg=;jIoOgi
z7Y&sOC(+LjP7`Stl{{4*i*8SuJAdDrAWEy;tyoOf{}f+M{dMNogRXG3lS6Gw1u|P_
z;qEKKs=tW~xeXh9Gb~>Uri;WI0NzT|I;<7S$?@WXCDr&yztAzu=&#Avp$JwuGKFoG
zcrpxNc(Y3sQn4cL1p-Y7x_1NvCfbL$TfWw9+9Nw{pwQ5%Hv$SQHUxCBK(d`g=BI!i
z<b}I$w=m)68zbPmquwnz1@X$*+t6tZd@*87c^ELHeu7sy_7R@7afku-5sq*L0rTSR
znX%k|Ay2VW)=|H^*--&Jf&q^sQc^db1>=u!nzm0stQ^y1axkE3kT=x=GYL)y-As9{
z0N0Ol?>4eDfJ6FmxVfb)j#&Z{9cdlB)Eir052w<!9BG-cMX}o)(u~))`|a<$8@iV>
zO0P%>#ESTZLlhqQQvxR$HPCNXFZaCl?bPj*9U&@)J_c0f0V|m2eyNM>mw-$mA9zL?
z2eNsOS9YE#2UtZ0G9-ZtO!c`$C)xg;yY~;A?a;)%cfabbdd|NQR3vanOF;BX7>T~R
zZ#vt3y*k~?>$5G7REtHK)n50Y^aMg$xeWI3zpt6X)55)dGs&ue8-Ck@Z{XSs#q>p{
zd0gT4QFG6EYntfEKcYju$||z@{lwgeS;iVm9nkU%q2N2-yQZ-9KObqyW=nID5t2#}
z6eQ^_6drOP@qSTy7YyB;E&cs*%Y8raj(S{we;8KNji#VQ_bqNqgvl#Wrm$iF$3}&{
zn{h8L7E}^F`^oR=EHq_h#kpwi+ApL^C{*;|`uy+TUtRCLX@)XcM0(B|CeOOO`X{>l
z0>mb(hF-tj`MPLv_LFvHXU#=_sa{?!DVbwwG$|E16{Peo{vCjIKZjT$7$rJq2P`xU
zr!)^CM(n)vt5ipf8)U$fgc5-A(ALX3D%;=b1#B3Z=`3D`JWT6`)02{o^Vx~>n8b6a
z9X@kiiFZf!-73nkhk=}t-*8Ke{osj`D#c-WwBMwlN(|{DD`qsihotguE@B0VM?+b#
zDK{roI;{BTYTz7$hD#3p)BGthY8C=$kf|z{uYJq<WD+Swnds!BW7I88j*e(8Z}Sad
z9GX)~(n*`8xAMfONui3&Kdu@_8pL*dY*`?-@Z0Gq*D$VF?x-DoqqSBwH`|#DT|5bq
zkCJ*HgnY$LoT%fg6D0*DK+R^vQawYVkgdz(kA1Y?_L=i0lY7Jz*B{X%_=MhGoxO2T
zZQhP!@Lac`NMOT{`5+kT*vQx%o6J#y4JptG`Q+RHnNE#}tykF9D=S!&2MqGCx!M>L
zhVxF~t*RCAycrF{2}+2CJ}Lr4u*_@Y<s5(L@Z)_h{~oK#C`8r9=EomJFTMryT>nCk
z(wAK_wM~M`X-gS*2Ofsj{awHG=f|^Vs1>Jdo;f+b9%j%Z>$JpUKz-()Idn4~AFidH
zdpG#UmjMg&%Ab66#d5k&=fF{Mkp`bAn1umZ)lxCdpShAhTaNhiu7%-xsJ<})v&5zN
z{F48Vh6i7kpuvGRo3G;N#R=<(s!7!(;;jp&Geh3hglIm2tP0!;@bWGRou!dW+Y|w-
zEt#NL-=VErjVKB@|Hyp&;29%e;X6Ya8_s+H=BCo^+elE|>mPzub|{z85z+LGSi<y%
zoqW(cd(`S^q@Y7K^rja(sV_`0=GdOXN{oR#M{8l{%G2y>84KHYyv5ZwSTU4LQ`_5y
z=!%QPk!WD15rou%au)0lp;;y0Fy93n&_ncBdD#E@K<$aIIg_id9L3F5nWBy|4E1!2
z3Z7-o7jT%F^w1bHNgyDn5pZqsh&(_6fiw!_y=v*)A@?e(zpe$l8hH<7ub}btMAjl#
z(3c1VZmH2@Rk?ctJ<A`UXBpsC(W-O1L`x`eTm_J|M3-X+I*pRn)e&-KE1F(5!yB?a
zM}e2vGJ$#8*AK}BjVWb%8c61=m!vpq7(0%Mj?s2VAm)^~XXFf6Qb>cg!sbu29>Wf=
zA@uj-H2OWCh!)<wrEATVu@LX`J|J!h9rwSQIxID9TF|L)B~&cG1ICCd$jLg1&WzRe
z>QcllPaxs=E^pG(p$WX1{|i+SYh7dPG^X9DL~q@qJdr)nz*VBuf@wM<3JX}2pQ%e0
zN6J|6_W1ArkS7`xV(if2p>-R;-`@Y4u@XmDUV(-SkK{lrWJ2=!-YCARp-_+sv<!nC
zv)Ac;FLY=nJ^LC+3?bLD3b}~KBDuqXSJZ?L)-c}AOWR)>XuD(g!Tx-2qQ=eBKY9;D
zo<S>X6f=Ed!t#=PdGl!QVJ2GFy!3#uL9sFI-}@yBJ~gKN*hRx3FXTpAzJZ{>b25GO
zXq|$qlwtI99mE<3fMNQsMs`xgaE4*Fbny+Xh{Ugs3|PkFhq`_Z<+n2n-(!6*w^U@n
zVh;T%>~%z_AwxSP_2vYqS$v|F(uXv5V4Y-|qlZP9E+D3VA2b(_G2rrwt$~9~m#_+j
zG=?W5k?Vd4^^G>C%I%VWHR_AXpXDFRi2L~C2S9zV#}D0km49#C9Z|Ke$w72~R;&Ij
zcr|$!qP{OC2$fSqCD4qwX@LDMDF_rYc$5p{d8w>RHIY}87J1C!$HseH0JYA!5Bwx2
zqlv?UIAcP{p$?7srvW;{WbYDFyzqQ(^&qpab_Y_chNHid_RDJrY`UXx;^M9=UIb1r
za$7?SOh=^;pC~NiEWzd<&#zJKr2X}X-(L$%Hr%!hzTLn`!4Go$^Zdib@Z>%jkMrDp
z&2~z4Y<T1#TXdVtR)eZK+Vu8nj3oqzl5$nCoHj<*Kpk*J$ta^1R#?Di!WrgiiLvf-
zR=7C`vc^Vde7>@n;p0&x^=}N80sEoSW8o;M-16_M;btR~$;ZaG@orN~I=mN)8Ldx*
zx#;jwK>M2=$|<9?^PN3nON(;Zt4lXMYV<=exVXL*ITyo{V=`&BoseZl{47=fdE}7i
zrtJ7J>RR#aTBlu4rXY5Av5b>%#)9yvd?p6b30^Ha>W=?2A;BxN&M6ur!a-iP9oxCK
zVw7oDn%XzQ_7uv}#cxSGm{{#c8Nh%5S5pwyahT9us)cQ%31RrO%USUznna>@RenC-
zh}fEm<;x+3ql}IlDPK%K%vJ)|=)0`8*HA&I5!CM?JoGX=oCQmzXMzb9sC&Tp4pNH|
z%TQ8nZGdCGPFccrg4!g0;Y;MAb@uRqX$#vS?tB7eBTlC|W6kEoDbA~#@Smmd{9v@x
zmEG$bb;)43?A&-h?q{O@Xh7kuVCI<8ZOm;;^sX28sC_W@^t?^L%jH0zL@$Tr!I`#M
z>PSL$kDU4pwT$}S4k)O&yQn=lQ5)f#KX<A{6DzUf2nB&0c@74mB8utKSHjo3Y3CMn
z8OHLU-*Plc(sE_h282^QB8vloc-5=aHnI5$4{rz<eJ(z#yncIe%{S=s7G^7wUHg8=
z$urxjZoGwf;l`14!TW$};f565aLC^e82gHiKS5ERC54$mmiLc{Jm09_c4}(e2@%mL
z!!Sp@l&lt>NW}3b`AMSV_=9x%4GVrOs{Bmme3{CxO|I6VNS?!ENi97JEH)xoiXY*K
z=aE@zI%J)z#7aSq+?Z^aPmXd_oAu?BE%hE?bJv%_^1AE@u2@?_{siI?+mr?h)zN?%
zGqcJcCFG8=R7R=^ZoWoXj8Wf_nkP}fos#Y)!Hd<$d1r>T_jzUAHwFavR1(JLb38fF
zFQ$py)r*M`A4Hem#0taRQAIHy8oe5OkK942lN1PNKZ>IJjqy~;_f-HaRaoLYmx+Yv
zA|lHWh)Hbhv+Xx4<%sJ9#;#|6*Awo-)>BG0YZUEyva<2dI$d8~>EgcRk!xT1>PC^u
zWKQfm<Q*KJPkyZV^Jf+5;mPg#z=`v(KlE07#eaNvvO(bN;al9*(SQEmKjv2I;U?M(
zAVd<rlgE6g!S%p(6dTc{DB>(jo^&M*gIU7DwwH0>#5To?(`a|(LGwQ<^m|w^M}G-U
zG-2fgZoZjNYwbinq_LO#=qBzOQ=FJX1O4{vwF0|H!t<jupxGE6ckxJZmnqVI)M>*=
zi0MWdNiGnaZat41unJgj6`fr}dYD|`tPAqVpEEP#SK2dPru!JY7_dBfv3P)m+8s*u
z-R`4080D)z{bQ}5CIN%*Wfp$tXQPrU!CrCpcCAMz9Vh6a>d|bj3&=iB&e5dx@FxL~
zBv)Fhj{^9UyO-svu)7oq89Cs>Ta;MDZzhXJCus6_D{GNCM|+k^$_Hz2Z;aF2AE1hf
zBtmtJ?FMzmHzz{dVf?`TT)8h8O^q`IaH0a47~@wYIkNVbs3mFRqz9-6D*u3j+wI-K
z8@-?)$B^fjwzc8>x`hG%-Ym5O|J7l$4o-LRm$o1C8~H1%&$BU;45hmqNzr_5ToMT>
z_1N2<;N?5iZ!42b3!b!)qXWWxl8Egr75>KbLcanErn5lH(GVcGmP?aGl3Y1#u57qF
zu{Q&oYZAd1ElXn__UTu@Ezl;Me!>$iTKIh;%!@R7CO-*llA%puhPyi~Wu^`jm~NW(
zthB-Y=E}eL>fQ@`SHh?T;ZIUaisndA#W0%itJGY<UI!Ot-N1+*5#<a3YB%zZXwwI|
zEIYR(Ubwb3V9l(qOw}?NK_jem-l{n|f7)M&SY;Vz<hjN?%5ez#=Kw*mryPv4YD^+p
zkJ4arS2k-N`q1dS5YN`t!EM{>;@hT$Eo?bJ6;3$P$8WsB%{7$p)-|Rw4kFgJbb@40
zG{TWr1c~m(6GJX06Y!D?2GK20KXJn7?FW}#uJ9(>edGoH|6ZhI{n0>hedFG)WosJS
z$G5Wdr!T%&b_^I~*1JI@M?R2Yc4cWTc@keVqfO`Etb0xbD1o*7Z#<%T$*3;nf35;?
z+$|-p`%h`4^vsy-DX$<JX|b`LCs99y5^Rqw6D!JqKZw~*FG{qM@?W<ywr0uXkhbiw
z^(?-mSbp97GPjpX6&z?Yr8?h55x5QPPu_h2(qJ=2$)Yrm42V+`QS+}6-;~9tyeCfB
zQR>GuRuy7>F?#e}MwKa{j8f}~1^A&{Rn9^-3?lLp-%x1dR5q#E1a#R(A#Gi@^Xwji
z-<##e=EOiu(^35tiDpix6-MF-jOFWt59V?(fHo1>H4{jBC>CC<`koE}t5}YDChM#Z
zITApEW*%8IqJ~-q#buAAoaEB#vL(wztsH1Q<y%U_(dp^6sE|TOA>+^)_13l|JxM5i
zu188RA`$8pdf<u57(+CYm$Xi0YL~MJ`qauw%<p*0IRVn50)CPuRLtS=1m4FKPU9;N
z+)Ii@f^@<VA)}IAUa8eX@h+TCn3r#mU7-5#RbeafTK`Uq-UVpT>rGt3S#h;egG%^~
z5pkusQF-2z`=MZkZ!G}UUG?a;?;$Kt&&rNf(dNQ;uMk#EFN;QR0IKAc($W)qr0#N#
zyL@$GSIWP@$RPybk*|q{dbpqnMqhf%Z93msOif3h{UL4iTqx>pLz=&3F8{(VW&JTx
zgqUPL98}AN5$sQQb*5SOYeA%qWVNQfQ|n5&2UIyCZ&2N6*?fv-w*$=@)SMI0DX8co
zH7S~lj3`C!h%9vy;yu144~RekhtLcmB_SuFyq<eCF>@zM>z%{o{1%;g-O=6sO+i}|
z<!zFwY8UJ}3n@i=9~%pzsS`GnMU=9b7UP#lKN+0w%7K=mxULkvESi$h>-T72fvc`<
zs8P7h3G>E==zc7ibAMy@bbWU~It&K`<Cp(Ig?|R9SN{Vb{|Ayh+?M^)_$aOiZV4Jq
z(VVxz-p!i4d|(W}S|-w-OD$|K#Jc6YwLSU(zLOM;$bDwD+xV<xeDG~vO&n^@j3wwc
zo&`Gm=FJ0E1w<(#_4(C4+9Yp;bco>znMjk<QuOwkb3Z<IOwX?DNk_)Uim2WRBIPrP
z;M}ZPXXw!UAZ_OgxV2L~u_;{tK?9py2|g1au?)iZMf07K0HXM`n(@#p`AaUpzzltU
zZLKrSa1So&$yLwdEEjEtN+fN*>0=7%j12{@A-5<;wOL|FOTQeZi@Gc4dfZ~PcTCL>
z`QH|MY0w8QbaKCOcer^9InOjDz6r=D=}In$JvuwNDqKMi_~_Y_*dx&*3AbPS|21U)
z3^-x%U)vs^+_EeGXMnwXKKUbGVufYJvje{!KVzjTFfX9P2#r?suAs%t{dkIpn(Ni7
zJq>Y>V}awFUdwI;qyz(ER8=f*{c0>5hXKG?D2D92Ird4PPDY+JXW?9DksQWVYR27F
zrKkx!{{`k^czWQ=>Oy-4{=MRfO<(I-nE%AvRjCMB13x*`XI&o^3_it1w3Tkjl&1{M
ziy3YOG?vd)QC}-y@1KcK)6c6uGqyJNMSc2a`5~p}jiN)|SB5Oawlsb*+8Vm;euaem
zXKt=mfzH6q1E2nr-w6=ZVpYm>P!#<>(r>!!2hZTEfw{9+1$!|R#rAquky<?4iHI21
zcx6Cd8o^Bz-4{`^E9Y665DXc>J(DJ-QhCLx9qtv+{%x+jA_$7HjfbYlyV9Y)Sec1B
zZx{DQB7{{Y1m91U{B{dXrcZ{5A42~6mc7`?fHyPU&c`%tvwS$l&iYEMGCGM-S3LHU
z%Cv?qnc0i}EG8W5!l@cv*nbYqBgha2ZQ%1i4kLOQm5^V$2F&8#^iXzgl%!fL$n=Tc
zntQ&k)zQGbHp3iuX*IFz_aC%!AE?{;f`EekLyArC2NeEXYA7qOpOA29YI*k^PP7X8
zRosz6yoipmG5Y06=dw_UZ=~d<zFQOVb>EC1srO|haEuepj<!l(=;8hKu>FEftdJuo
zyAa!stNHn4JZqw}?^VwH$?G=N-h<C(w{d4(XAp0c*=_uHTRf*-s(7wtof|75|2%!8
zBeOOYUlZ@`Wr}C=!86T5$n!@AtUq|Fv~Z%5ecdcY_+iu}kGHi1`9h_EL$z>}pPf78
zkFP0n6#bbDND4uk&cH(iEb$lSiGS96cpLHw#^1`$go*IEKc|^H&n|3Jj{LgM_Z)xU
zos@vh>~s69N5z;3B29!(s-$Bgw`2NZ#x{hBbLWFT5f6jPtLBVsbP!mTxxZ0p(?YH(
zUvcYDg=&&Al+k0-KNCxk?P}%(UXLqKP4CE!Q#$5lE7>F1Ob0K6eah`^j5rFtZCgQg
zXkQQ=zjjfU>GQ2a?&vBe_w?B$s@NeyPrwjs$)V}LkuTADTPi&}+1HlO8#8#6wm=VU
z)hbvZo4~Mi+pjS1xWjsWnO^%@>GHeo^TSA(T^hKLv)=04QQt+BQT52?I4&m#v4e~P
zwIe!&ywvp-D}@e9c+3V{)x7&uxdqogKf7Z1M5N1PofMXQoPe>Y(JbcnZ|P+5AQ_AP
zwL4l|hXQ82+wP&VfydR@&1+r#{7k0(hYYhK`qce2B@Y<6f<@$>uS`wurWlUk5l{?|
zY#BX*r&l!#XiNZJ9U&*hd6=*vcih2}J{D!0O!#tLM*y|BNT<bU!R##SA><;EoAa?Z
zt$LVs9!FZ>p+k3nF<6sN!MO}^l|{iTL<a)#X-8@C(HSk3NT)RmIjXKPtoL(^BzbZ{
z<%Fy~?w8d=+sl}AkPEB|mw0DL%h!UHJ@-DQ_dPM7s1>XMcL_z5n~t3A&kD$#;yC8f
zmZniqC4%H@JU85P^lSfB0ECA-hG){vd+4W+th1s4`gfnG#T`JBD>wP3!5Mnk<DJs`
zqhz(YSCiv-{=XfeP0!c34!(le4xRtVPnbK0>AzQBi8Ty)oiVF8cFkNqP&taZo)NoB
z-l+9jLRZ{XC74#@rgq-mRq``jO4StB_^=!fiVH@&pziy~sjwgP7X<l>G;Rc=1~}sT
z%JhBdi`dPi3n%d9;p3PT+RH-z=2A(}B@1uSkI5GlzoUrmFNf;VkH$!Tf<|hwh>t<}
z0#wx5qr$`g#0)<N`c$u%J_KYJu7nQ8<z=IZmnru9LlY;@c^!((O`pxHWHY+Ah@z3+
zvMC~=>SovNwyy`KG&dC&e5LTY#T~A7l1elt6KpD~D?~-bRTbwqnpij)?7(SXwL$q(
zEcwSqf40Lwe@9@zO#Jy@NBMJ0##GodysdUacoO~e^EvKcxi-hJt_R&Ie$41G1^LG`
zdb3`KJfGS%mc9ejI6*mZa#JiedMbLZJRMfXD~U-`<+XJFrh=ks-1*#G+rv}Yrzs3y
zSw#GJ3S>Z1IN>O0bjMEWaUU#uPExcj!0P)h#+9P@d!GiiRupv7r0wCkB8)s;AeY`z
z;<F(!&RAc0r%?l{#kR?M6v8SSq^^D(6ShA=f-^LHaF-zfsSBhXad??cC7#5H*y|2O
zvG7I-|7fC6TP5r7La~jdM5w17i_)gX!K$agRW0Lc5FUI$Wir;513MTS`@c^L57&38
zM)RRPzF+62`2}CAIEt(r99Xgh<^Ax<krqeV3mEi&{I7}AqgR9p$pgpHNcNz7*oQXv
zmENPH$c!#nCFiNBS@5IYPL8$>r)7aiMzxXoUtpVBmTPlZVrQv>u;y-#u4(l6sJ)f8
zE<<sVl1Xyw{BOJ>EtHpDa?W&1^4;NFsDBo$+ed`~i$z0GKcBe~wV%?I7{k=9Cvu5B
zgMJ_Tan1HnEQlp4CtRW2Yxh7*HF_waC#XCa?Q<fEDqwu9<UMkP#qPBq+~LSj3}M0A
zuRzah6Z#rpi-B7GQ31Xvl3-!GUqq|~nv1kWoT~@IeOt%`Tx-aw!PT>&B8wdK+-Ei6
zO<ay73-<^A<L#5O+ArlDL>({nzD9Nz)l_c)$Kf|Mgu!1vS_@sq3$xQLSFKdja6)~J
zDWJ)Vp{$Uif@GfWqCB|zGp%)Qm#t^}6#G?F8Y=hRB|k&JwFWjz*K^5q@dBlgmBuc$
zOL-F-ieL(paoA*>2Guy`T!h<|XzhGssIFw-4A%DVekCM+1)@0{ldJeuwHC(k(NW3%
zg9DQ_QHVweZ!U0^142*!@J!nPpK1W$h7$F)qI28Y;qke=g^AcUmU5!zO7Qbppf=uH
z+51+=IgNC6f!gRgXqrDEzE}||IDyvs$)fs`QMkaLhhTxYe=gY=G;jdI9IE6;1pWLT
z!m1;~zD~4n_cwf8lnU#h*HNT|gC7|?jbt(wKM`@A(!dZEv6DtC6ZH+lSNGrW<Gr2B
z0tNDdm*RYoyn25f9Z8#*Ajf=ChNY(`^!GEiaizNPUj2HgTe*hin*~3Mf&&?_uwpbc
zH6!ZlT|KzCD<$2uup`2(E|OgxD8c^z1x0rlil?bwt23)#*0tWtrxS>#`|1Hb7kCVh
z)K#X{uk$fysa2-J7zju)AyXv1d=&ZgaTHJVQFNS`YsjIXifU<JJ7LYr6N~dhaOrHZ
zh{tOjMD0@w>A0z<N8aLw*=ljPDYY`UnX_o$&PR$a9)#Mf6b(K;<7z}6*%|T10q*-6
zuQ>TYj7+vgID`f>hZM4}&#ehGIls}XqxgO>VBTi8*O*$5^Gtv53ModNrHLJ=Z5Rnr
zD(UFZO9@1snSGs@k^+szp>lQoH9Rqqdct94V^i_O(blq5pO~7;w98=DR$6LZ?hGU~
zF%gULMoCCGfPF5!$xPS6dycWrnf+x+PEIbRqZ8+w@2>~+eR&Bb&R@S0-u_Le^3C4v
zB639)pwiX13{Gh{m(s&w*ZG*oZ~rTyH+3+87C$CCJ5f_NCU)63<u`ue%oezsAT)xv
z*s>vcHmd;a)z60U43>Cnq(AT!DxgBIKfn#BddR?BsB6J;cn&egr3-7kbqU3>y;#R;
z=#lt$HP{(}nW+dq{Sq@=A+Ju92_1&{CUQ4%)vhKKtL|!47RaSIdis%R9%sSWKq)7*
zkY8Mcrb@9&ImG!Ynw#0(iF(Kk&KH(A!TfU#Ea+$X@MB&=QUAN2VFbG|SKM4|U|HEx
zq-s=>z0`6-SuGs{&c(q19a)l5EBe%I2l;kb_y-1jn$z4E?_fKW1Rvph+G?|1JFg%|
zAR1Ttm^`Th5t;_;IVU^2QKE?IFE;kd-L5;<cVz=d?p1Z4U6^{7==Mn|Fa)y);}Yy-
zEDT+j6F>T-d~l#vy8}@d8ykG^_nhB#rf+Wq@am)vpPxwQF4AK(^zkP*(CH7LKm|G_
z{uR$seOU>a=D2>9b%S&m3m0C<RUQOz$rg`LCm!^=Zr_qce;|;<T-?9lwjlEWqGo`^
zDLSh<5!cPCV#p~h26lxoU6o171z`$!M6p&&p7ur=t_}w<=Ik^E_h;Db=e+ik(GCmg
z&+o84mQW=Jtp@N-z2BoLl`Sl$$}AFfZD@cPnS@5Pqc!piu=77n5Z}eA+7dOwZBJ91
zEQU-|*cjN?p0a)U?VL#X3jNCY@_@$nY*6Izvtmz#Y09~~$d+eE0I-l~WMpJ`cv#ZM
zN7&xMAu&Hc;oCPE02x_vPmh_HvbPoNgK6zS0*-z(bpEfJkYfy}Rdn#PlJxc>^TAA?
zg)t|)w6Pm;OfJ`4bT*MtLvWs34(0+6eAS%e|0{Yl{-cO>wyH~XsKE0Yf&&d)hyPVx
zhXy>eAkeiL%7O;O%mVTI%1%UaXimmNX==TKinMW4xX_n=rQqdD;yyi+FH6tXe~9XD
z%>-RIpu%0bB%XUFER&BW!wRbMp1NrXpgDC0G|GLyq_E~R-P=wUtXyyr&v|4j3W2U{
z&057TJJo{z^P?lMg+(DFrs(4QJZq8$1X4IG4S^8Whm+6LHZ|#l&xU<dQhMGyko)7+
z&-<#VSFQgxR;quC=q?Z(IvZLQuNDU1u3eSbIy1-)r8@!`a4MfZ4je}mhYZQOh&%Lu
zg&9cynwPlB!U=9akozeAI0iT2A@xxP7MlMUQmKnD0cmWx1%qWLJyc>^L6wLp0)>iJ
z8V&fWv_1=B5h9DA<A9Sqa<y=hHtjRlfraVtuw%oYMk~`CQn^$;!l<;^5S~EWesW9$
zJE%m_riah;(sD@SuJ%v9*ANqf@b)Z2egS?q{slo5Ndsd4vn++FBA9f8rxKgU^78zF
z_n`gQCT~9a2qGpzVe0G2$Gd3$Lv>}OYV?YV3M?Sz>FH^CZLJ=#u&@xEh}N+de{<sw
z002NiNvLi)f{aMIMb2f35yHf%X`fzVWD4ca*wG>qHH;GKX83k*eix~&K6oJaxY}l*
zR!NQ0RawBNz5XBZ-`RKR=<nd8INWz2E{I^jWjIuT?sXrfXQ2jnIn|ydGM4d}Hn(e8
zpYlmaPB=BcFHVxiIcd-$xqWVN`K?L>g96}73H9%8MBt(TBiyz&g@%%o3od9^?3wPc
z6iG5y2a4JMmMJVQrKwOH86F>&)R8T%C$e>wJb^}J3fYb!MawpGVpoi?+B$vIdIH6|
zp^%F1-|`S6Rj1tEgf{bBs3d6^8h-gqY0FD*K@X-Ew*BxS2O%1%8XJiDCi^3lV~VY>
z)!p#%MDoO?SacP0=vNd{;Ugioa82NGE=#9rTbTiOeHD_0wRPRyo%%STYcA4=6#di{
z92)*Vwgmx?LVrnpK0P*Rk@+B?XtQ*cLcS?DG}RuwRmb~6U}PL$UqhRySNxg)mC$}i
zH_7=#rq5q}22N3g9dxfXl_i6N6;k!(i<G8j5+hcpql1Ii`=Yis3K|-k^2$nS4-bK?
ztSmstW)`X;tq?9aNR`w!cQYlT2kr)of0YU88U9>G>$_*Xx)$m1of)IHO6E`RCJIEu
zk7XPQKmgy|#BiMZ^B;kY>L6|d75G)%PZ<Qa9UHiH3*i6FhG2)c5rz8-+|pkVhTG#u
z_x}V!$XysqD<}wkWI-Q3$|qo4J}_gkf{UEdscrVEYAb%Wff8r2?Ck86E|W1}D07&s
z<rNi>MIaW+ngS7qA=Tj|Pfo<}*qGL?6t{C{M>NvY^r3dq)GNpDCS9$D`mraPBfkqR
zcHTOlrT40*+k}Y3BOvusvJg~lz4ZMn$gmdt$59-9{^RYyw`>oUd37jU{&&xkAvL0@
zKttmc;rBLDfP$$9Nfgb!#kH7yY5{xdNg9epoAeM{u(zW)R+iDU7!yQ;snCvpOHRh3
z*#Q8R+1e2+kNPo-FY5gx{8JA6voLq^%2K%mh+G=GnQ16$0*#H0Dlnw=WSoofr{(2k
z%=%s-ZyWE(0p4(wdnTm(4@H{|po;^Y@J4lg0M^@f!YsXDP{rozmW8&$7JIm&_9RiG
zI2=F!G1LEVYaJxmYlseiMgIj}E>WC%jnhmS&P8B`<hI7a^=w#?W|UO;Za(%G_CZB}
zvBF3D@AK5y5CVy&@8Ugg=w)htSo0QN&P%_V(VBr-H&lF&zHRa#b|4tH0-K>n_xIEJ
z`u25tN*WQB@4C6V!ctSi>+9>IZ!v&aK=ek&Dc|0Mn-t{eP}8|`PCWm-S^VYtsrh+<
zOE+{lde~G#CH{W*9*+ir>UnJLzYg3glr_V@gr(_7`;L;z+$*-geQwd<1%o~)gA4e1
z;HJqp3IQP)K~V;*{r~k2bNDuqWRQ2@nfAg#F_L+#tDKcODebXq5?7P6w2&B#a@Rxy
zRPiE$Jfq<LwC3mv^xJvlz08tQ9{D03vQJPCUdxNh$d#bOL{XCF^@HHMM`8s-qVhRR
zHL(oLkUYn!Ph^THho2QgGBs=~kq7qn_u0mf6wznv&T5^@=vv@h{Hw*oiSgt~$)EHq
z_&Wv|WGrrKn6Ut!-#)A%gTt?r$=LN5b<Wxj1PQ8+{xOFtJfm+ggZ^mc-4aJ$S$a#H
zxrHYtWP>8}ec_JSMGG|Z_&e5r_L-C<akvudUwASf9qkKX5TaPW$(zTWe!|CqwZ~X6
z>Mz3(F4JcUlIhbg=DGB-f`R<s;fuXnlmV+tT%4e>d8i3oRH7y!i{%#dxK5EGLl=RB
zS^PXzK9o}GI<|L7NkmP(iDnwHv9X|&aG%i~HE|nxfcHSO7!j&xy~|EzBo`rDBgnY<
zfayy&UYn+{wPl2C$Sl562<o?=9RCL}%t9ED!gxA#Vvqzo7GvWJb=m4{v=hQuP`e}W
z^p3FKqh3pYA8d%(I0CoL#?=$1Bb~Eeoa}b-a=zqfA{8fZ*&v$)R(AY;&HlvdbBFw>
zDq1|cof-T<;c;5YZJIsy<C)5%>_wD#5)Elq*Q55JpP6>utyJ`+YJ4lr_hwu_B0NI)
z{LgYE^jz44%i+&_m+wU7aokf*-7h)g<a7NNR);Q5Kx_rF51ACsc=?U<O9%@(8k<Rk
zKnSpKRUpO{(}>HOn*pxQjV&3e0OEevD-BRg*U($6p;o5>X69LVWUl|?nG6HFo9l5O
zog%$(-8y<1t>ZcPdzF{!+${du+S+l0yqX{Z^}{TsWVkw?Bs;X35(a<?*&=}jrOqpQ
zy}i|odf)q0-x+UyRxz%XtPFo}z&I%!iIwR2?!8I`IZRVa+gPYr0Ld)a74^nX;5oTJ
zcVO-@N{&|C`}e0gYCCI-TPtOL(oCL4CNtKFLg4nIQmR`WaTaH!?_Z@i&_V@S7$-b#
zcIaM`Z<X^a%PtX)M+P>l$my0sUDIJ0pC{b|rWOq=GS=pr)HZI$0p9nkz-WliWvcX0
z;fsN(37!cz7E4jVY*Eh_iI&notKvvo0^1;uBwO-Hw1`52Oxhhyk5hr;tlQcdjobaP
zfg!YFF@ofW3#}pX3yQQt!^c;=rvVkd{M&^F`6%EnK{Lu&^|G>=99<`DWNF9oM392d
zXxRS(>Od90D3nRqGEw-&K9q`}${TSYzOE5r*>-~{2+5ov3Y2T3KBAx&Gs<}mUp*+I
zkdmqter<Kl#2N%MQP67^f<$3q4?XRm*CzD!^?}NrUpJ(rq^M~E-qRAmg^N`F+M=LI
z0ZD?{x}c{S=*KYhBT*nB(EBd%%q^aoPJDd4TDw33!3B=mvS7wtPZU(AWv6!=;Jl&v
zY;~KfzdyIR`ulU6tH0H)jLL>e$fw9FymTK`3Wy4=)L|$*KErF}=2L>&pJ#?q^Ry&g
zD(=w<;>EZp!Yd(f`0-he5-IdcM%)4yN_=tizL;)8AecuTW>#SNm^PJ*<Vh)LpC3nZ
zjL)2RRer6^e9DRG>1TOwC<ULp4^!&h7r!d6sz0wHKPvye`eFDAUz|o-H-0aZ@6w2?
z#L4<_P1J|Vr>V?Fex~McVZnAJ@YSJl@2g|BA=a_mr~{?&C*F-8D8*}BvrX}u?`N{@
z`O;z?``+L5db@GG&em-<{)XJ3{D49^;pW-{AqI*ZOrpZYzG0NBRO+Hs!j?$;FOvHr
zIhTl_vI|j&3lfF9_Mjpj9v)VTo{J45BO?(N6{V&JIQ2j`5(mAuK$8XYGz5u(Uff7x
zpxt;+cP@tHmd}ij@$#DKT)A>Z?ajb=Y0c16Aa~j#Mt#gXQ79G966v(;xSTJ%n?S`)
zD3U~o&?=|k)6XcyW}wtLs@&8FN<C-z8*%ua6D3eQ;z1FWyi#yp6g!RkqG3^XN;&(8
z!YCC1)A6b>iWn#*V5C##GQfFU!Wg*)f={SZX`7S}-C0KFQ{_wYL6rK^D|bznU)O<=
z?qpplh2@)5E~B7VWjFH5^vq$IZ^o_ScT#cs>Wy)zc&5LL8$ms*;?#9bqG6=RvhkW_
z(s@~EsQl@7rP`6Ne5`A!W4?1<YvoTOK$E+!2VE9j9zMtNs{2u+zS(As`eZxPireSs
z{&>o*pyUSS2NV=paGRhAf`M`oKqLz+V~K<<VL0z}q7WM-3U}>6tAgGufl50(JY0cf
zfd~x^MMy}9QtX^AAOWzhSJ2SJK(9yOv$P&WL`2}ig$s%pgoTCS>eZ{be*HS4qoWlG
z;d%uU1?Gk1fR+Vq?YNVU+d>qI*>T+zI(HX}l_D3#X;ON|2+0b0p2|Q8aHv(<m190Z
z?lIyi5@laVWzV=&JU&6{OG_zFw@>kVeL~)4kO{4HCln3+nXa3ouj%=o2@GS+|70FU
zRsJ-IDRCP26aK#E)yPm`e1cr)XZXA-uP8u5*Wa}Cd}Y%0HqC#QP$X{DP@Fn_BR#rP
zAsO{=F2_Q{AcV9i_{gTttFNAvpU$te9~I909+-Di-Kg@p4P`vhMoAXjBqKhO!S};<
z;+>wKg#u+pv9z}$AqB;5mP_C=P)0aO5R7xF2%s_-^DECwn<$cS#Zngqf_$l$LXl57
zBTmE!QMi)rTcZ#p3U}3^KZoq??Nwxf+cR@ofZ)iV%3LdVPDfDrbG-u3g#N-ogKo4=
zXg^I9NH$13;^N{IA)$4F#DgS(@eK_PO;{1kWZ_P-ECh+dJVFa$t@NnqwP2sBd<^BJ
zpQV+6ZsnY+@F@lDM}<ITU?@c+9kYVubA=-=6mWXMm&T+LHI#(Tk6960^L`^}MXK{_
zEsHrH6XjNA*J&Eh>gRPl=J?HFwV%$nIX!D$ihMA~Hxu|=!LUoh8;aJPZ|!E3hk2cS
z9nCk`ZkSKzOO5bNd8MCfSDaGvy=(g2=>2Hu`qXWbZU%vze8=XrJ`QN2P$&d}P=rAU
zLWz$kl=?^lQR0v=&M`%Z3Wf9(NmyDF^5s5H&IKZevPT?<4q6oMy2HFiL0@y7g84H@
zt|#Cc0xEV|0Qh51ngD2v0m*^hve|59(C&<bYY}2%VpMn%2NDvJ2|mY#k|Zg5je<V(
z0!wXWxD$?fCkiEFWcVVqEQ0-RfL1VCpi|frTDWT=&XGS&^Be{0=d?csrdcs)g;ne{
z;$=E!qClaaKjic&K*P@<7L$slV3^8*)(MVMX>Ojq64YhW3e~K<jl3Fp(f;Og>vEY1
zfH_VbuNB(e9Nrp6r={!7`Y!xIhhbfoDoY9TGfD2uWwPdTAz^M4yw~-n->13U<~sFP
zkCSc1S8u*>$|B*jMwkhNH7^T^V##Bn<fl;HO@T`YfQzz3+LoY1Kr4a<i9(5!<U*cx
zjG}<yND}01m$K!Ljw5S$1W~mOL85S%9aO%0J7p?lt`Fc^1(F3SZl1X@5~mY5@{fy)
zQ)eo8y%Qseg8np;ZraaG7-%sd(V&Hb&vW4-rx`T(I}%Q(Q-OIgTM+c;n|Co$kPa&y
zsYp<Kmw{^v)CkQd)b(gr`}3Zo?Gl$qttT+d-zLT9Fh+_>$kXZ|;JsGRY82@s4m7zc
zSd<#qhH#WMp;Sl^Xsr;T$mxxWQDg3#&jf-J-ln`y<i%GuT|OhPEVn@rtqRMmxK#eA
zoK#&H`BMsNB91YY9_vXfZ)KhG<%#i6)~ip!nDRLjm<H=iD_6r>!*~s4sg$$B7;R6K
z<>P=Vn=Ye|1exksm08!n%VgQn^`q*JgutlRa#5O<V+MKDZK=#7WL4S&+l5izK0>GR
zFum?>Hz+R(6h!H}M6L)4C=e7n*;d$}43Heql2GhmJ1{H|HzEqQAW^t04{b#tL7;-B
zqNe$u;OL$|4Nc-eWlm+!wFI;-kRWJMpe+ZyCkfD?pFZ<bND>7uXe3F{@pBIap0!m&
z=fg}4f<!?o!07N^MHp@sI<7kbg(8^qMc^9nsQecTc_{UAq1BiYhIG#zav-OF82KYk
z6v>E|{+t^w5}}@Nii7bLQelyNh)`o3#csyohJDznP(Whgp%V1v!Q~UW;!ZHmG6`Gi
z6=BM7gCokF@dm;~xfrM17kN0^8&&ZaijvBkk`F#Nsz!y(?*tf+uS|LJ9G{_?IB&!S
zyVL`bM?%A}j9=oWUmi{GtUsow^Ca=`S^J1lzjQD5)tj~5_ygl&Jutsn{X^=^G`X8-
zk&ri47D-!`Rh9GO0ox4UHS^5;u-@`Hz2qwc7YplpRqvASs=hfA_o{NRjj8t{_oY6f
zz&4USFpP|z0c1-%P;HN&6MAXx*L7&TcWd2QVQu^Khp9wClLbu_G>S|_AwNhIf`{qQ
zYXS5Z23lF`eH92^a|0$$6_6<KC!;k{&?G^B;Xs(zDri5F41Vdr9Uf_=Fz?%7UXx({
z(!uO@M-m0!X)00Bjs!c@C<|-!D|Wapamy2;a9M~#gmjc_Aqre^obRL%qhP;vFdh}3
z5+I8g`JyN@`Ua8K-G_|c0c43lHk6LnH}dBw$e1QbZtcXCk_yDuH6csF&=OH4^~sT6
z0Tq@~hAu@Kc;@;8r6h+PNbl@LY(opKRa7HP;s}>B7i?upx>T%6iIb#Ik;=7FDspBz
zu?@|LsH#J@kQ6HVf)UA&AdmTScvW2!yf?d1c~GI0N)sp*K}p3zg_bwuLe9VlvipXS
zH{d|wpi_NqVSL#^E612xl$keZ5F=anfI$|dEV(M&5OM_c=V+D-6?wKxTy}9&M2Y#3
zICG`mvLuX6;>naS*>cUi8w!qX#TyVLHd*~r4^6FzsHsPMOB-@Tp_YsqgoE`>#Y@sQ
z-J-zJHo+0F`OJEruIx3e<ZCui<VV^>uGAIVQhHCnlz9+2Bzel}#PUeJh<~2sUt5j1
zHi%^;39tzfviaH|<Kz3w9U74`w<EH)5pm7!$YeWUKHVhuK9Z{HV0zt6h0#uKU%xbn
zf*B+WX3&bDtPP^|^W-|8VdOej&N)&ST&IvJ<&CVZM_5*nDBMj4m9Lo?XvM6RGS3|0
z(*mG>Vw!6V^!^BX119q{1ou$T1VLLGxF&&%A{mxM!Ms<3l`!aZHEFry7Bfz;9QiYo
zgh`?>Zh(t1R7H%b{^AgHNk_A{cOfLN5aGhyGel_Rb3u`%lg|q%2tFp{`O@d8g+h$?
z6i#_ms=OB1MXB0Ed4-i%V}D{QPTK59Y3~+dAS1$l88!EcV(b*5-_(Wu*JAL;<!iA&
zA|A2Tjfk&pLX0TzTv32j02G!a9#k4s_Ue;M7ZvUZVno5MJbWClZTk>=qvLQQ-G&Y4
zL*zOhnO!~LH}Qp{K#I6aBb6C<Y?QERLg;p0xrXOfug7^?K5`^KB@V-co!#dUveAaq
zSp_&Hei_|E$Q`7DCh?H64SA5>(T9}QE~ItzDnwM&<BU9eATAAiBNA~iG7-n)QgALM
z3n7_yTohce<>5?f7CyQfg$<`KO1gPSZSFvkl*8WDhf`@;5;hK}QfvszE5Z59JQe1A
zMlQ~z=iq#n+-Dcye0CvDi~GKWRIE7{io^1JVoRs8D&+ad43!qi%>+T^yBjeG3G0Cb
zB(AX)hf*@|VMGir<P{^eqg%=;c^M)ca_vycmvvSk?uFu3#L>JcRJ$nZd{MkbLe>ff
zhmq6Mhhn+r-UFQC$scwhw|_*%!G)Y^9Rw{ww37G~EUf?}JtR5VOv^{c>=Ksbkd_4V
z=sH`{iLPtFzW5|;zaEJb8CkesFTm-{Y@Cwob2)i9C!^)lwj7+z&XqD1;+**JOGv`b
z$QYcp=PS}c<xfJ8BLpm=sa?VqiGRF$-?pA1As(aZ9p_40RpgK(bO$Y0M!m8vPCbv^
z{(kAC9MQ7GEK`i@JO`}}w1kXH-;;MQVeE39Bj+5Ki73<riNf7>Sc!t!U4x36(+?yE
ziHV8os|Wq7k$P=HU7cY~(EBKu*C_DJ=?aGBPLEvsFk7NvUTArz9DgEN2f+?8g(MIY
zM1ds1D<0CI;g!E}j0ifUgXM^@rO*wlZbGsMqFfK8(?UA)%*b<aBrr=jX;Q?;0=r8_
zDI%2e<Xj+SQ==9UR5_wVb45VeDWK$@*YrDISc)b4kKlz5_u^!R9f|dAh$^i`h^-Kz
zS;aV$V8hdIt;A=){7t;IZ7&W*CgFo~VOV+OEUp$+iDHvF9Cph{a!`#VZK9C!2ZTTj
z4k4?v2cZQ;xbLZF@T~`ah3#QiaVj$lkF8vTM^~-EiL?wPHZ&o+ss<VD9cq`s;t?k*
zg*_*WfO>1kE`03=_hDyfB+}akQ0g%DJILuC#DUl}yeRp3bMJ8^Hg}8SFh-6XwPkh>
z3mL4yk)$jk2I<%nnT&O3La}7mAw0hF13dWpay<IRN-UG`Yxf+(l6Bkg$dYAPx_vL+
z-E{!JdihO!^Op}{N61wq2`MTU1zgb4iFZEQk3YP#0`KfTggsZHu<^tNY&~-c+s=k!
z)9DawJbejUFNR}F$aQSIa0Rb@bO2v_@NvAd>mZ^e9*(+|<wFrRc^4y8u*O0-5<2^k
zTUji)J#(gzwtexbcy;$dymRz4!po`@0pk}Vw(fq!HMA%td?YzlDd8&x#Yk&zgT1>C
z$wGq9q-ElGLJBU3lD=M4f`sZ?6!s6Ic*u#A=1znaSK@Mh84?=WP%y-ep=ebRa^PSZ
zgt6Wtqq7eo1!XvtoQcat6-evsSMNMe;whE#<U3qy>P1<WhDQ)uT!QDeZo_Yuy^ED6
zPGS3%aI86X7OPI4#+J)r_#h-y-LE@y4qHR7V2j|{&0F!yx8K40$4|m0d9+I#p!JCP
z$dY$`KBpLO?>~-r51&@o*}cP(2O&CxLKH@r2Okl3XyvTQfpJ#-k#Nm#zhqyVfHMH(
znS2SuuN>GvbDbm!<H(kCHuEL!SwhC5YZ`?p1V4|w8xL*rx87@I&UFOZqClcR>w$Rz
zBVnFuuue;uEehPP!JO77?f4Ta{@D=)kB=yLB*Ykorx1k_AqvfkDCBt9;inS=E2fcw
z89>31D?;Jp0EJJMgQFCk2Prd!5``5PQpw1LbD}x4Du{AQ>mI<q#8f=AVl9>(K8X`a
znb>zN4zGQ%3u_LX!qTn#@$Zj3i!c7$kMZQvHF$2-X8d-^yLf!X1{_XEN0KO=2oY{a
z(rwtAkc|Ct2{Q7|z=f<FoJ>i_ZW&oV@apUM@iWh1)A<k_Pfo+L8#m*D*WSR(TX$f^
zk>gl?_!v&5W}r|;z}%*{NX}vTg;;aqG~V91PZV7>QX0CDRM#mZ`ymvIGTkU6^~Y9k
z!J5;dqP&EdxcH+wq7;Tlk=f%AC0d3L!{e~zqr-Uk-F0|=^KQH?q~evWd-40XR^f5M
z+2~YUPR_=&OIPCyU;Cd}BhMbW9*^hOe1Ll%c^apsE=pyD+aOIUx4jeZ?m393S8l-8
zvzHNFT!jcxwAbyW##wMBw-k{@wYZvJiA!?5>sma%_3%@8bKfz<3z;Dq;E0kWfkchg
z1+JqYVaSmYa={3{@{ns8H6M&m$6KNtm!CY3ONHgglR7C8rEHhcJ*Pe{6_ns<smCw>
z;sN~YL%+wHyY?bXh=WZO!UZ7?kG%69zV)l$;@-!f!qT0)CBLO8kvQ^%WSq0*;mtjV
zvEtZSAyg%5Gc4|=nBPBw98towDskTeo?~j7@b-aY_~yfp<H2`V;e2k<#8)u1LgdnV
zF~s!)qS&1-T(79YOCRpS6YDnMP(l(S<o;?=sUkAhO3LNE79ljR5ZC28uC^ZGrR7*7
zq~XDL-<R?p6tdZ;tP_P&H^n0c(%brQGTn|h_8i4a+xOveL4}&apk*O%$RG$B(=2;F
zqM-WZM4y-+u#ag_@y`U^AMHX2ve`d_L?L)sjv!H(zhg$CFu@i`6vl2q6l9cpKEG6m
zLW>Xury>fuLImt212e%fdoaEn*T(}29uftf^}TUTVI-u-%jaa&J?ud?M~xyx(p%fH
zD=H3$6VpY2SK*W>$QRaZ#w#1P<GB@^@Utgg#J7I>TRiZ`*Kq%{ui`-&eJ?+B0#{^&
zncUK;rY@fU@FV<j>vk;Jy%(=+--&0|ZN!sn*5k1itMSzbevL2x<mdRqdn@qTj$L@<
z{gwEgD6*&5ZczTb-gx$c8WESvh&!jN7uzm{;nC%*@WKb%@zIqSY&;W&clMsZj!Th<
zsjQa~>18~<eh1c{zk>8GPJuvRe4dssWFfm}5Q&ZL*bx?uKP=yXP3NxST2VPdL`kkX
zcnYrz5sJtzLP}X3R(y02-}}|WIC?!63FWoec<MYJdh1=BNwvY=(=VfK<L7^u?K_Bv
zmcEN6+dsnI@JQ^r8i}2k!*M{u9gPu^bS)kSB2%y@JOMke#A4b0llc4Z{<{#P9k^E2
zh%6zd#sW)uAH!bc(tOW#Golo;`dug-HhwHCw4hum#U;Cs2uUbI;oz{Ep0P=pGPrI+
z6iQTe176&|3;*@o-@$+R?_a@lYd0cBlx~qI+7Md~URb*cfB(&I<FjA;rjWaJNGPjB
zr6|`bAsb0`4cL4!47(%Z5L4ZVLLmf&LWnB3c0lq}Fys{S;8C!3_G8Je{rIzg`a1sc
z$3MsRun6S#4o<A=sBqH?#3>L5vImE7Q3&2c@2|j*Uwm2K(Rmz<O~AqEc<hgeQP_Ju
z8hfrqVQ)k<4#g!%9-{EtuHE>_t4r|G&Rt09>{3J_U&u@TAh*GmG@MdDl8+CC#67uT
z2bLW<g9yntryLAxf;Rh;g!u<Y^oCNO-e(pH2Ekzel=ew0pC$^--vm);3KE68^av7#
z`8(#FC}eYF;Gj8BI_o@u@o==D1;EDvO%(LCaX+Sn6iGtHkQ+(eLx^qdLQH)Vu9a2D
z2)q!Hm37Dvx5%POY&vls@9fxzmsW4aeUCniFZ|oRctA+Plkcv<%Nw_=Is7Z4#In14
z5nfh~%~!8sm5dCRpE!l(M~`E}sk5R)LxoTr#XV0vjeDPY4(m^!!>+5>6}DWwjCJx1
ztp=OUaXmneA_!a$U~BKf22nD9cyFbQl=llsxP&KHZo)5Kep|@Gaa=F0#fEcN@cQn<
z*c+3Al=gmQf>w%y=6pF<OQWcfrf?~*6tC|*h{LgI$Z79GT74U~3AuPeM#mo<KZ8A@
z=$~7&QAXdt!&@Kj!M2N`cxBs8JR~FBb6GhuVjfhh?~{bYyt#Kje)h@|HFdK3_$jPA
zc^0dVp1_)8r?LLz1;ItEI}svf55?M3m+<12J^1FY{(xl%P9Uza136OfMWPUjq-oNE
zkTt+n{>EC8T=BCHxMcL)jZGJ>;#nawn=f5c>kPQAfD15fqM%6<?1MsZ`v%oIk9!_@
z5`X@gzr(LzUZSQM$|S#8jm<a^9)*AT@lWxe{`#}{!S5eKm@QZQhEXnrBfh2{JB8$2
zEiOl1Ki7VUVippU)zOVqDW|QoS4~5Z2++##&i*6#%ddVDU;4=d*b#aine9Eu5yE2Y
zFy0r}J`~d0F+75hf+GBS=`wuxiKp=P-UC=G@0ag=z0{S)$|EO~C27_1lX&mQF+8_r
z8~(6zwX~nJNbBxV3mREQ)<@wWf8SwL?cotq--=adLvjCG%dtNp1GYYgVKE?CP?iH@
zTFoD5L1Q1V_LYT%VO1E1P1>sNqx!7e<sC#<2Z_SndIX8W{2jN2C}dN)`;`2xg7H`d
z#K(aw2L%!>2crsFAW=xAh=7f5?!uw;9IQNh5wGmthd1^f#IckNM3q$|G`mm~O$@fn
zsC|Vf;|KouD!%yLALIE|n?$*u!+U!U<K-<oWwd@BX$?&>3U#WlC&Gkq><Eugix%Un
zYEd>YD5LmNJhyR+vLvK7wV|MY2)W(;I2xafw|4DO3l`&R8c;IqLKzqLi84!WXc6)d
zg12_>$FamToJzLgi52Vdt0nJXcX%99nmV!e^d%XI9>Af*bTyC85onGmmh65}Ffu~U
z6-Aod+=_iMiFj%AM_7IA9F8Ys;#hnJ-rIWwzkF#4mhRkxHKMd0eCr*2{zv!W(dDc0
z+Rokh-FxrjS4)@TVnHDaoRTkTQ>mSucw^sw{Q8|`cv(iiJFiDzcVv_r5pTPE6<aS}
z!S1Uu*bx#b=QwN)iNG6Dch5`O$J25|@rlx-wS(&@xNby7>zRFA-{D1}$5?clCHEou
z6?kg>cD%Oxh+LPdg^FCXXY1!z6K=H|CKvAUs}wF2eR1Pf{N+D<0bl(7kFZV%OI}A0
zYKBG-m0yhS|K?%*$$$D&{MA>!ifyOPt51XTgan+m*|Fu)RjJ1|RC=ZTi_*VRRE|^9
z9u6m@;(T_V5SC7Pue9#;W9goQ_^W^Y4!-`tgIIg)3{I!mus<RWdxVUzz1VvPgiLW^
zrdv%tJh^@oekFCf`NCyo8QK+gO`eTZ&+oe)qwcqbT)_wDFJYAsi8qB%tT}xi=W_Fe
zK#i!cCzM5D$Sdzr-f6ExEt2I|635c*`0>kcVM9nbVx=9h{_KuPLZH^;SYQx@kC!O0
zKk`hnpoxO+qdaq3BtwWoq!5MBAW^t0k04Q)zvH$L1=We?6Mh86LSrVPklOD;qzKv7
zBCH>j(ebw)eFFdO-uv*zNBeOwI#EW|SFrlPaqJI^Qs5%L$KGBc#NiSSU5mxrJNM%^
zuP?=$^8C3hJ2HFvlyK+gj2lHcEZutud#^<!xxNM0ODgf|_T6}C%MOH#GP1RI<7#0!
zo>{#CU%vMzczW$7xi6EEsT0LCfs3%bn4OQ;ckab|hmIk$tqZ9#l6*yo$x9!6h=iJE
z8S(bvodd`4izQ33?BG#kcXT0d$oLeIpCxjYeyEI=*Pp+PKde}bA3XUye)9Y)cx?GP
zJhNsq9(!*!o?rg~uI3jZuDTZQ9yo;WJpKd@B_yiFcuS8S#&1_F$JzWmWDWL<V)r1W
zvjcA*IgA%S+J)_r5eO+N#PRfWQEs_7la(z>HVYSR1vr_Qg`;s9iYUCj?>IgTk41cA
zoBGipuA#{0NO^?&4ahqYVnedPd+z(6)jO!xCfxVZTUdE21j!wJ$Pj{%ElM+wpW(Ur
zd7bfz9lyy>Y3ah+Qy1`e-}wRl<Nx~^JpT6kh_9@Jy{#J;QZn(wUq6ih?LYoG{^GAb
zi)Y_mg=A6UnN6)YB4pr@z}D4+LaDc-LdKq2vk~jhhG6}fi;5U*l51L*Y;8Swea9aB
zU;p$k_{_Jyi$5$~j+ZuW$NeuX!M%?^i;br*N*y++&7Zgr!u85pMLJ)XwsASP5a)%I
zT*%B-xM<5mxb(eHx@Y9#P+T%LNqbpw^c0RIrz1^BPNAE7VDJ-J<Fi73&63(V;9D^1
z#kqnqJhf#P-aT<1=L;)j6z+stq&v-Wa3f6bD+_@@M1k(<L85S1A3>rpf5*HNg)BuB
zJ~^<Bj0-U!K^U8IZ3rV{%>s!-QqM51)i&Xzj2@RBIgal=^{gnhNJN*{U~hN~UR=Kw
zEBA|{yKn_N&W2*+v9s8IE)=T{o{&-OHZ0k(8z)k2;NA+^GJ02=COMpl5=HUEJInFY
z$DYACQ3kP9_44dqJp9f|?7R|zeKHb#Y~?!q=FMeTdH5ubCuJbLxeIp5PhRg3@_Gi8
zHQ~PJUlnrkA@chMa7~EC)2lWrg_Y6Tt<rdD`$wYOpTVz}zK26esYnsBP{f~Oc6nfv
z{9LQ3!Isc)Aqs2oZ;w2MU%dP}UK7H?^##9w=Y1)|7G>>-EUUn)J9gq*4?m0@*RJ7Q
zo?VE-5&UNPavaObL|R`r^4%^ZcDCc4lgIJysS`Mml8ocFOuT>UB-WfihYvzS@xjF~
zd?59-;pAnkI&xk}*Acw7^C0#_CJ9mKG`^>I85;#@qF|R1d%Bc6qjyBrAEy&`M<wC=
zPrZb-=dP&Ha*ilLHA?1`(Vz?Iy~E(At=!lrSK9B{>;kFFck!S9=5zSrLyzHDd@7Pf
z*?c4<@a5H;@Qr)!!~gOB{8#+=;U{n=HW^n$N$-h>MOaapjMN7al2?RB<b8elyZ2!C
z)kvI7%fh3}R^Z$B{|2Es1t^g8mJ2ES)Ia|#KKGq_vF_*@TujSR(^CKVy&vHl_dkej
zAy-i#BrmIP2qF0;Sh9OR-r9E<7bUHuLP&O9iNvNeAy_S8*NK8(BW-DoT)%(lBwpWr
z080-X#c^p%{EU^>6XR1+uObO*EypnTT5u{WOiWWdR-O;VW1F^PXIzT<num47d4Iof
z`rw;_V?VI=nS}uRq9zOMe<TRHfAUQCw0;L7s)CCd@75zo6z1=kSE7(2g4QNPA#;Sx
zes-`50DsWWGTscw!XjM+P}<NaGDr}7c~B6)ED{ANuZ_=&(9IX6l`8eI_3Cx}?6o&>
zSVori9#I}y1$chLRy^_kTD-A+57r(ztrWznLnqW|{8z8OrK|=~6}4(F1@6MfoeZ-F
zhLGCUg>4r?vGl`zIGvU&iYFTnFI$Z--urX>=+UR~{(+NtXa6zmyc&g+<__dZ_!7xW
zAs3c*52}3{UKL{TokyO=Q)@RX(>Bf3FN$K=A_^kAvkzx8bMVIxw&96&oAByK`|#-c
zP1qBcgj695_Mu^<Ntv>`dl6Y#gSBTb;<s<Vhqpu_adG0&*d#o)axK2~>)+v-wd=9u
z!(F)dnP>5t?|mN+y!AGo-MS6GTe(766pm%vkTK8)yUT%Vb=7$N&_TQ><lszRE~4t|
za5ya$CxuL$x98z}wjF2F^AKVymeFz{PA2EdC^-iq_Hsm3w@Tgyq<&nY@I;{wa)T=4
z6G>VW(z=J$MolCNA4MhO2Y-AGYtDu#1<9{eY(fk&<vLyJC|#6E4&R;ASd$T5-7IB0
zh);k1|HD80>-X@=mXB~IISYp)<8kzQ9G+da2LI*nzl6X2$~W-*`|Gju@--YvND+lp
zuQrg{a4{5L{>lCL+kgEIwq3e{<H?!$<qNOiQ~&rSA&FtI2{BtG3jI_6{4IR`dq2j(
z@K{v#kKlq3fN$LQEBwVjd|6o-GCTW`$xj(`i?Q_JajZUl5iydtnDTmD&8xtLjC`C<
z$->!GsV8X{=QHwfE;ApeGVC~)U4+o03Pja3Nj>!oL2x5yke}Q-kSXP*g~7(XJvd#{
z)rSp2IPZJ&J**46uD;~SHW34x1(~d4L57e71JnD=t-{7W9{@_m$g`Ow1VR)tXzinX
zkbcVRtRPXi>yIE&n7`w;5QPk%GPRNdf3T7QE3{BxoJ6`~VUZ?6CuPX1&KXWjxTT74
zN)thu?xb)VQ_8161W$ZxJJw#fgkQYzHjXA|sCntDBD9}ey%9f`QTWrVHsGzD`|zeH
z{<l9mfS<kaDt`3z3wZzV2_!bOs1@=w3ug~GklsBYqryIA62DShjgPJ;;Jw4Aao>w?
z;xpg=U-*araSxX5JC3X3mn)-a?t#yRbfqHD3y0iDZtBL7Bpa4|bO?{G+=$nA9m0;w
zk)r%|$teAlnxaT<Y{jY*XYlfeyRj!G9;a-%cx3GcJh*fjb_n4i@yY5NKpE%EC10m9
zawNWe_~=?R5^5U}BgA9v@zeOli?8CT)$8!`*6sM&i?86n-Sb2I>g}a?Zre8eaoZNW
zedGu(mzRoC9+pw-FfNu9<M|Ii#8aC;z=qIEI4vFZNO~GhiU2)h%T^=t)1m~=rx)T<
zb}24omEcH17PelF5~Uf6{Rx>!Xz5kTFH4V<g)C$ba;<_(DgBJ@etZ~_i2GhyiZy3K
zk=8SW9PX(wA|ydZ+L<zX&Jx&!Y;Y<fPp(s%d$A`X0ss7?`|+2b`wG5w|3i3p&rw`V
z%|T*GEq0u`gm3)&FY&*B>TmG5um2lfShGoOdX(JKhUB(Ry!_E#{Pp+l!RLQ^KQ>&r
ztfnE}*tQG5dF~ZOHqsl~@&4W;_{%ST6<_+{PjUEK92(@EB@~w8=TE+X|MRc^9*-_v
zj-;keWD3bVZ7Yy>vk$NA+%H5aTakea83hx#m|2L6wnBsmIS9!q!MUtLc}MwJbK*SS
zJ9rYO<UXy7<WtB|?=X^tIB=t<oFQ(Z?Npmkt-N>z4=i7cO+p~EonC_!NL$Kuvd#NP
zI@`X&^geT|U_T24<2eJWFOC>_;hD&EjUz<}*!8LgTo$5G5F`qB-4P@T^LNY-QOGMn
zXjL<k`<=)%5rx^nI#RGALy%5_py5Zb+)fxofr7{oV00sKNEU^}vl3Dq(a7j5&ohSD
z<~FPi3B_;TUx5=D*~)}`Hq(v=USEn|y!xgn(p`A}&<VV?=OEracudH{8+c&J+t?+F
zH%k-)NdmWjCQ;yLemVUvHOk#1BjeXaVZE?zFMj*ZYW(PhH*o(O?_t@Y(+DlBM2;xT
zya6|I`<$@%bMc`I*UKBQ`BDV7hDGCGe5Q<WBk<Vr_4w%vuVa5?0<vW^c_PJzU%&mX
zDBttyCwWskdeqdz*MIVJ{C3G3xKdt;B9|NdEd*`@eLOu2uL)7$V!4BH$v7co=wxC#
zu8E>cZ)!zUX$4jsI);0md>RL0<8h^=6#L@hu{S;eQ4RI#_dv3T263(+ACGU^g!`5(
z!Ecwpk7tEYJiBEJo>;dYzgxB(4=r1T=QeyO*ol|6>{WPd<!1ck<)!%kGq2#4-A52v
z*Cz3K)#rLy@-8x2{t@n@VC>+REJ|@_WHNs7<_fGn8-}>nUZf358|B7FBP0xlQcUf0
z$SB$)VY!o|3vu<Gcw)^KeELgY$EQB`Pk8vv<v5>`i=3t&gr*nZsby>MXP^B7{=;8<
z3J*N{62hg-#ls_rsHwx#Tejgd|Lb0SUg~dGL^PtR>JVGqpw=hkcMrkdIe<5J?8Tpd
z;h*u%2Y!bmLP{#+okbUv<JZqG!Jq!s-{Db7FIDnt6UDwaE)~C)_kHhkuj84GAL7|f
zJMrv>9eDKJb$Iag_wmH?O?YABF1+x;F6H+}!K14_z}JP~eET<#VBN)VB(?Ra-xJ9h
zbRbTyZBkF1vdJ76!O6T*yn6T~UfO>Qhoqe<0!5N#B?czkNkrkA5QR%~Bnp&<8Z!}v
zbRh~^nKsl^RV$)EGN8|zD45BECJI#*l@mmvt)&$n>0d#jF#ku8D9qn+YeYf(vOBtQ
zHn$j;DjE>qBcotZ>}eyPETj%kzfT>eRY6}H=1+c-6(^(0^_Q;V$FIDBHRmqjT16d>
ziZcGajM#oB%J02HC$Td;8rv>k$NF=jc<8;=_`}Ne*c+RyEC?Lw>EAR+?&!rCsoQ5Z
z@4_#auEOTfC{eoUGD_d8+_qkc!OOc2;q`sTus=QnNi99d8*&RcAMHg<eLD^&+7MP+
zhosg%tT}oPfB%i|;K`L6a7oDBC3_Lx5W@1pww*YglP9BchbT)2u2t9Kg%5Y(fu+mv
z{^_$w>FO5cGNgVZVRKkGe)7ue_|fyP;E@$;MM3RQpIq*_8if#>9S3Ao`slKi`0{-}
z$LeFJvE@=I9$B>pzkGWc4pOiV3?NH7)#0=>{9(;{ym$Phlqo@wh>t|EKKH>k{P2%2
z;<rmzV0U-|4#Z?&M`%2@g~ke5O2b~>Ur)wS8BHg&^&{8G-7!UR2sujb5fb9y=aJ*c
z7e$fT@5Z^j3OpnPW9iZJ2(N2Fwg~xjAz&G5)GUfd>MB7-+-U<&<Z)eyAgR4ik*lx$
z=zjd|KYtr<et1Bc{7WRh<my(e*n140{>nG;l^^^RD-NGRs=TK{AyNtQ?qAz~7@z&_
z5Af-K`WiNegdtP<M;?Fsg9`|Skfb!U<JGOZ@u{zV8{fG9cQ|-G0hNP7>g<KM=b<O@
zr+@R0cy9G(WJ_O4=@?Lo{)r9S6-hiKWba^XI<|&H;un8hf-n4!d-2-VeK-)ECPXs<
zA6&SOz0oPydNl^?&R-Ftl8CDnjYwm?j0iCp5^^i`WaFIvu#j9KD0|cGxbK~nc>Cl<
zgx55}E(AhNw>hRFRgmI?a#ISKig|i}Stv{r1tUKOQ84^S6q1D~gp(*_=b^AIFi{vA
z^NJI9o*kWll8l-thzJx%MHD((I*^f)j*PT)RFst~B0$1G>jDWuOH;Etn~8%a3Vfaf
zgJJ3Jls-4EGBo|5LemQFldOnt$6>9rAW^va<EDv%-on{T6yk0pQAl0HP<a&LnI}Rd
zxw{u@&RoRjzyBlr;`OE29vO$-GV*?O-3KyqUm>IMLs%ySVdbfdSabF=9$UK^kFDQ|
zUC{|hZ0k{@+C))2$FuYC-l+?C;)9)dNJfY&PF_GleKW$Po}b$Mkzf}>imS0*l)=+m
zcH@z?Td?BvC4`pMsu5&b_XyIu2GtKxQQ^c3iQr<u|NNzY!5=ql!|up<Yz@7J<;Ttl
znMgxIOQ)pmLXHTnjJ^RJNYBJGLKa@ycK}yvYH_xp7;hXpDg@|t+#{ptr#EfE4j~8o
zqZ6^|++}PP#dIh#0lS0%J^tPreDOy=!`r(LV!NcV?BFrHBe+ypqJF*7*3*vz3CS{2
zUXBm1MIouV9m&m|xL#I`=Qi!Y<Eu7`;)_LcLkFU(+i*N3ABPijaHX^fu?^j7-rdH1
z5QG%jXceH681#s;_o(YEQHnOXw+RV|Y3`DIpTTod_PwcD$Pz`EGAv46ly*|T6Db2!
zo^GVdDBC8Al<OS0k<;nyB7E<$=kS%E{2IH$<B{ChiTpknayy4`Bqjyl{N=-HLFqAx
zlfUsnYf`qug&i>o`1T`D;?Mr!i}?AHrC5II9CluhR-bfoIw3>e#S$S3|KZbri%<Xe
zuVT~ji-@mmRQqgv?mIum_kQ;zc3h59Q!25oJy<61{aGP~+oe7-yZY6h45vi7zp!y9
ze*e}=oE5^9(cX{vx^~HnUFtI)(N%TGk~&V4XA|0bRXvf!vW^m^k8%-Wrqolc5Tp;H
zl5x+HW!M^<iZ~%NDT7XF)1!(Qm_dS&?1OUS^qZf)u#ljvF^GbIq{YE&!!JX~V^Y5Z
zSF0LlO%%q*L=KKmk_1H*_}ez(H!AJMD+F`Q$+O!a3aJ@LPfb&bzqPpq^|f`VlfI$}
zfhGyO*C2t=7KNOwZ1tSe;Z#b7zX70ORcac+WA;aoD9qn6&qP6#lXTw6k@ox{d1UcI
z2~8QH+P&k5@94st`;OrM{>QK2htIz(iX#zw64LR9b(`_Xx-D2KN_A&U61Iro-x-~R
zm-ZaOvpe?ULvf33?M9{u>Pr>1c=PBPeD}Fm@!;xB_&}bGtZz}js2C;6^Xct-@r00t
z@R}C6Zxb?-h$rR#7fV;+_iMI@VmysKiJ77#JJrsG>AfS^8JC6!S8l@peCnnDpS|}C
zj^xPF1pDXRk2O29voqT}yB}k>w_`SUx3jw=c6875%(R&9o@q7RY{h1?NjAx*Rz<B@
zWRWbE)>;dcE)=xZT5Bx|S|gDFQh)b8j|?E-89*k8EEK9bgZwHY-Tk>gcaQM*`E!qe
z%uu)Ei7$5Hr2|K0CZC5w>BAa+>UiFbaxr$*GI*vB4P#3}65fuxf-5cUI9^hLN59yK
zAHDf5-Z>kGGo_U%8l6VP<Sf!;*2d2*r`5OOmfQ>P96E)s{_+uQ74neO)Pcn2cHC<0
zK=$on^%o}#g$V6S&BTN6Z^4PYA~eo<)ZZXDB}Vtz9sBXcl?3GU(x^@$t#b(b(+cs*
z-V@lg^C+&>cd8F9aZdr44)Vl!=ZgU}H?S3QSxCZi#2^++y5gBR9LOyd(sLNEoVth`
z-Gj&?L7+jL7Fn5D)7TWstdxYIkQ@Ib-$ZHK$G7jtFQv_{*0za}o<W7o#;b%_BsF*A
z=`Z$T%cYx0Xz!6SxSZiZr7wW^?%R0f*eU#vpFM=H388x6{ZH`H;Zr!6Re+rSF(FA#
zY?j&kfB)w9@weaq8Qwi|R>)Q!HtjizZ$JJ5K99SFw5|b^iS8*v?p{3^hnJ;4&y?4y
zKN`hvT<l87z+1=TurDPa*}dZ^8FL~_+G}TGHh%u@r}*MVA~JgW6@keXvRJH^Sv;!F
zxdJY?6i7QAE~~}k`;X(%y+?4mz75%8SQ(!uL?PD-NuNW^8{lsPBo2X)=V85&&q;|`
z{aoq0T=fhFgaihZPKB<(s)>T~C<HW*f|V%D%g879orgq0$Zb(xfm%LjYG_nT2)YM>
z#6e$z;JLNAMUjLhM8UU66wE&+WJeTYgdy@HMiioVM4c#*&F9T<9Y1==m4`n^27+uE
zn9Q^Fn&;KV+l8$*ej$v56WzHo0^RBvzzYXY;Q#s7_wb?+hFfCbkCjxb&0?>dynqY!
zEl3kWaJjh)$4YDP{E^f6-QL64lU*prc|wfW94^YB{o=8+_|B%cv0Vs6h8Wf~nHgTF
zYZsY1JR%0{F@B?8W}>A|8T`fg9GCFNcOAliec&Pdh0KJXJA4M0n!1oT;lR0?7Cg4|
zAb!623w)lKj#p2d!%yD%5Wm{I726Y1)!z?Dml;vg?S3Q(lKKa6v%43cCZ^%_3zu=G
zrU6%4yJSXQf>RaMD3dY^CEv8(A(`RR8!(Ez?h#b<k0L_|!Mlgg;cE{*hFv$)ByJcP
zUAGZe(SYOmWk~NGP=Dt5(`yNMSq$inhGzA3#B)WJ`1QLV;~AN49~8rRxvCk5vrBLw
zvly=(yNIto_&EO4U;h(cJ$4>frQW#{^ai-pJ(n{r27b=ie3v&vZ^68=4CZj5QV3A0
z==Ju6>-hDy{dn(s8ZLJZqR8nIVqvVa(@jmXkSio0TgU)+&gV(~$4hH*P)J7h;H2^T
z<s84;AZZ3BaJr-hR~tHzJ2s7CAv!r?l#5(qkX>F}m-=qLnS|GbP`w>@UHY~N@tu7r
zAvuxs=PMhqH9ifyQ?ju$DI0r)=y4AUmx;3bxQxMX7)U-H19<-MS!}+Ms^rt9Et&q8
z?{5{NcMu2COK>c&3J0@Gu_Gx5PwzU4Kl%Bi__JR<j!ma8$-Oru_mc+&LVU6&*-o=c
zKYCKm$-VJAY5yMz5#3*0g#@`L^PJpcL~`Jj`&!cROo%R71UFsI8NV5yEo5QE=VBGl
zk{)jtrpM<=pXJFjmo0t6-?{U~IFUoof`n&H&Elqz*eekd1)opGHW}kM!kO^O*yodY
z4uOOO2vP80sBcj1QOM2CL49rAlBEVaPl8Dt7}wm`gp#6S1^%83E<NbPKsRjG-?1b7
z5hDuGJMIus;D8++<Os5z91Q#$7bG&=vmgUl;=nj|W)|XwBWG~FL1qpz5FL?$>T55&
zhS$zrMPlzDvgvvkL-UFZ=3jsLE&SlUE!dS)B!+5MrO%mi;#%hb&T^I~Y13sE$@DLs
zio-8I-;KZd-HZ6?C);sBjB?i4jG9sBOwZ$%<b9x^99t5zaH6USDMM3oZd7T1BShh_
z5SE<rX(Y;wb<6c6_3r$?zx5&houuKj?Re_oQ9LKJ;m7wK#-n=<;2W>LiEqC87CyX{
zjLU7^NE0GcFzrOO7{p{L>(iSlc<uOkym$5r-af`p317eq+YjQOAASmd@E8Ap2jBSw
zZ=Jk|XZIYzPu|*$@4fnt@}wLoEXS*-E?|377Oph3<EZHT(7RjkhkyN#_`&n9OZuaD
za@zqRGTZU+r@PhpM{j(HuRZYs{=c6-jMvX!N9O3X+Ha8Ka0^NEDx#L_lv%S}=LlKI
z;bv3$&AkYvGTT2}(}ZVbX8w~;cH$#xpSZT$NE@9M1L{`y8Q0r+&gI5czKhQp^u(-k
z$8-Neg&5FMnUxoC$zsf*X6jj@L!lVgQkm&z3n|Hz8Ek>fHcQ+>CZ-)o8X8BE5WI9r
zn<J#AKu|L4MiFQBLhcHspEHLhkv%en!pRxrjLay4QYiYTO4#1~ay-2K0Jf#&;kxL%
zB|aVh^vovw(GPxsZ$9@rp4)#CPwqU72S3`5pS}M%9+JBKV)Hiq@y{Q@ci#8_JF<!t
zDJbFVkfLMW%sf&g-%B00@x;NC_{G-U_$)0KX>w1HAmoVw%$jk*AOQwUa$pZ%=(Dhn
zATc0O$eK0u$eB0B2@(Z{X9`icu?nKVr3ZQxtVF@>6G+?neL=DyZRweHVRT>wr9~y`
z%?A<%lMt9hfgpL{nadGo7}MAh1>K`yU4qcP2{ED&*%2cO(L16}6!Pd6q!%Dc$Pp-_
zu+brUW=(t5U(n1No<N+;dgE`)Oj`#1lXWfl*=M`)?u``O>>Xa1(Y<*k5kLBHD<0i@
z9H;8ql#wYAW0WbzB3sfF&GWTP57NYd#I^Kdn-GxS?mMnz-oAVjIg``M<((_WGHcR>
zJTX?qVz`pUIHe3baJ_pNTV$sBMqE6OSJWbFVp{T*K9U)Ca^EOUl-1(HtBH8}&`CUT
z;20i1a1;;kK7gNnz5~DH-)Gpi8_%9RhZD68qO${K9w9?wZ0He*7qYQg$i|aG0-if?
z0-I#!`|^QPctPs&m>Bm5Ui$z~(cORi9G*XP3cr=>M|bYW#|dfJnwEoiug2p_YY!6p
zMzA-hM7jBY^y)ie{ElO5LMHZQm0(XsG4{y$WLY)h8e4F%s9XroA$)K%9ap6MbiVFK
zVj!b`rVxV+sehhJjD`>d&W1@KvbcFq2KQXYERIz+;?)cB(hq6aQ&^3wT_Y0DbYgg<
z@3N=4e}Oyi4Nn96AX`X6ff&VHF`!wKPBkkpoF%z%sW2MXe91r0?L`JX99-6ra*O40
zDdY})7uV0d$m9|U_n!!v$efsycJ!*Hs@y5=m2jzVa`5{E^n}o>L4$svq!w>oPQ;~#
zR%8oF`y#CXKYI65{OIj1(xzweMN%#f=2faT+9hputhff38e8#Ed>URneHmLb3XwYM
zRBeze_aXNl+>(3aQz0Ht9zKIlQ?lfl6_O&xlI_O!OP4yBB*2PH4Jv%r<~dkL<Vg8k
zX2_ahpBrIW!HGrQ9FQSI?|Mt*M8SCLVd)+PuQJ+;9)*BMMnLID5{1gL3T5oM^kD8w
zFg*vI?Z&1?k_7Xu2>#|01z(TkvIF-iP{uVkzu-|YVJ<(!h{2aXVniW&#~mRGH15$t
z);)xbY3``^p`7l}DUZx3XT+Gfaiebn+w;nCq^bpp!_&x{_ajx>>U3i#wxs1_cVQKh
zWp-M?HDHGq>Ekp?Bn>oPZpp)iw6Qtd>Yu>D@&++-6}Tib{2~_(l9VlJ(#Gf2+B;wS
zD-?pk8SM3*Q5>&s!Nu0wYV#fqRm!N$Tqo&v7Xu~)BffhC=bPGbs<sJ-Dr!WRQtZhq
z!tR1n94N2FnWhfh8W<H>w^5cDw#0!6F=!546uHA<ypI-F;6!O1PVke<axa{(Zo;X`
zIvgpk#-WmGwHAK3q5(&%8*sLz6DP&+9j|Lf7H8HnJG&^ezWoIiI9^_jW94<Y(%vt#
zd8vyS=?o!BxuQG22FN;{s%yu&<{sP>9g@W0D)+b4C3RW|755y->@SUSPPbZDPZuMZ
z!w(CI?s<+mT<hq=k&0#^KOIOIm{dFExwOSL&zSTWq=Cy9(l+VRN9mKZ@>{MY&vYSK
z*|YOP45VM2GV_);$(SKL$P*HkEjp%)9_f-#7W0vO3s|npFS0`BM2~doqg1I|mJo$P
zG0v%DvvQv}MTVXcpCTXmVyM%lo#Q$NaHgRP>BCd%70$TkUhEW7uwTf*`Fhcxe=1!1
z-PnxjQm;1h_0Lr4<1>xjINRKfOhsPYa=*<hGL<atxl``NebQG+gJY<WnR4dL98x6z
zbcf+hP{d%?K*qB0OT63<$~fO0m}DW-A*4kJ0>d&L#yNMEeHtVR{NPfAL_v8JWSrxY
z1JBO+c{m(S%n1Sa$#dnAKA#$yM0-=4+Q?X3Sfo4zBmvyeNG}43f=LcY6ikl-Nr6ce
zND}zg1Fy$N$0Yw*csw4=OL?=iv+7K;U>-Voh#ldN7*UAc5p|-#O-5OKSfd0!_zRH1
zAk(>V!9goqW;Yo!=x537G>0=C>MZ9}ArZ+kSf_KDz{MG;fn;g3R55roCRt9dwHkvQ
zy%TBUVxWX@WX{kqan?k4upb3px?Md;mBF0`CtZj_2E7X0<<HsUEU#T^hRc~^rWm<Q
z8Y(F}lZI1_8DA;mcOY`6xUTM3Mk_~V$COnw@OjP}{gU52;)f<h2e*_@(!v?>yvX=a
z!kzv+OE`^H3EvptCPT@maE@)@Qih7N)D)J>^>3M-We8zOo)*I-W#x)tr%|V2q<189
zVn#@jQ;fPtecK>g%1R%dRd3W}O1owVX<|FD4YP%CrOP!9SE|%MRSaFOl#wJe$rPz`
zmc(c9GsV+}QD^=o(k>~((&l5v?tbo1$ei+uab+8MR68?$s_4r)XU@zcd2&X|kopTT
z%anShiP6Y%d6eGCH2iE^dLV?bWQiq8SN$#Jvj3Hy0i=mBOJ-lvZO$^KkJIGdND<lO
z2^#8oN#jMn7$bTpIBQRpyffK0)JKS7hJfwDKFf6kUt^SWo`Y@AS3X7GaUp`zuOtQO
zqI<6BoGbY$Z-Lw|B$T&=WMxQu7rFVWqmV}-eM!>hnd}cYNr2o_(hfwL4vAA|sayIC
z+c)$%ST87#hO~Ev=wgKN+K6L#+Ls^-UcVRfJ{R0F);Z>9&^yqN=H^y0{GAx;9mZhy
z09xvsQIc1TjI?w`7U)qRIUo@rSukIfG&eJvFv$WpGm>CrXJ(<Yyh8o%CD9ldP{xYJ
ztG~Y=Gcz-a9MGuoOd?_ajve8T7*UAcaYu;465}2vZ~#znZd~Nc>@k(@&R#LBLKMne
z{MLe38Hr3~K>SFOK|XQ9t%yUeq^Gf?ap7z<QH)oXq~|P@JId2045GkUGu^=?0U2D6
zmwYqC;3bUBD1tyEoF;}KM;S&hQbY&NfN4x=B#JyFF`VUkP~bAW6xm{+a_DNG;SO=O
zvFJ7G6dfc_8VMPEX}D6SsjExPqDeTCM`o3GgBu9>N+>@(l_qjr?^hlW(I;_u28m*@
zxB)JQZ6akSh#|~iIdU7Nh=IO2>BLo;DJPIjaJj(EHu9>?cG)uXPZ*w7GviDl26W|f
z|A*S`&h}Cp>_m4V8OfaK%kNaFTe7r4mV~E}n2?}2gR^3ZqtQ*GUW3!3zZk?B&fdjf
zPfB_r2_$98g&j<v#=Q^Jf6j%(Ne427WaNlZNt+czE5Fm{rQLkJWl&sA*Djm@gUjG9
zgA?4{JvfBm?(PKlL4r$=KyVA5kOT=fSa1#Q!QI`yo%?>?_j^v&sq=>^c6aTWUcGwB
z)k~lp#S=wT%_Xl_N+(^L@}rgh6sPs`;jMq5J{$^C!;wmX+}XVTXo;c({*&6jNk@6F
zc#-5EeV8V+u3;G#C|`W4)m`WxnN+HINsc_e1oMx*e-&V#6%(k=cqmhtF0R%TLe1O1
z*v%NIvr!V&<&>oPS!tRj!(P`0;`@Nu%@PCZ$3nqem@G5JK{$U`VegPvk*$b#1Vn2q
zoA<5&S67$%(P2u_VS~rLC*8=e94eD@QX+q+d8Tb-<hSJGL4imN@W$o_ll15ex$r`K
zE%(Q45*2p1;8e0qW5iS$^#m8?v3hlFjTqEhBVFC--@o4g#TfFds+6&j8WyViLStq%
zWj3P30e{^)py#0~T5TMJrm@;u9&`dpA<C17fKM3pIT?24@id5j-M&XObl&}dq=g<$
zjq3SQj*$5Jg@WybEfu}U-X$j+d$B7$BO;SDA}6NhuKOo?Icl#IZXHg~b+Vkmfu9mh
zadyobB^Y!@cWG+LQ1qxZ#e5rT73+$Ai=3X3ek!}h#`rnBnM^wIBbTHsh>3;8Jncv?
z`C{>wmJ-cwDw_p6G~D5YYc|nCP|6ceI-N!?wtiqkF$F#*6)1F|Dr8kwP8kzfoXwHM
z+i#Vynu3Bd)+iaqwbPlN<%xrW91};BNy{mtSSX*eldWt)bH^Y|%+@X|=JvjKfaB<*
z#g!@K9x+<E`J8Sg03sSwgxT%E4asoLp(PIDMN>^{Ca(9fc$?GtKubxortAzR^I)o#
z0n+EYn&Y)>EX3iBX6$e;CK~ZME%L@HleUudT9d*ycJ*jgMq>)n?uMIPJseS)xF?Vd
z-zH@R{t=jbE!>Dv2o`^xh$2csi;9>6vh$1?<W6DPWKebUrcm#u3e6>j$SO|K!}1~N
zLh&&L+Y316V_GHbT1|LeC78|g3{6PkhwMVJWUZ{UZir1hB5W7B#R|(UNL(fH+_a*i
zZxDUd>Yi=1+b2#Y)+OOgK?}dBP#uq{!rWSFFSn`ek;V9x%pj<Xc^pys333KyBSd{^
zCwLIq3@D@FTNyKj=rBS}**+(fJd){dR~87W=i#6aBQAAb4nrw}x|U9C@dloyrDb7F
zGsUN2@*P`ec>|A1YGj^=3+l{4^j02PoYI=jp%P$WI4Eq~9IWCCi&JwYBG?!7;COeH
z@YJlVm~Y>B-e_x^IXXI;Nf$N2IOTAt|26A$Zl>$LxJ9)=SK(zC;P#cbI$qQoBG*Hs
z@<=|A>QHZ&6v)#xI@-c*zaqh&aW`o4sQ<*JJ_58BFiVWHgU`b5RBkWeWP+c?%b?6p
z2dBteSu@w`Xqz}Jk<-59QRZ4raN7;x)}x6#oAxVHbN{qNg@q7Y7T3I~eAZz_p;-3E
z68!1UGE&1SDzVW5t`wPEw@<X>XueIPRl;N=LU*G?beI{7mfYe1d<xC2n?=5)`NL})
z%;{ZBnz*~q&Hcy9)7odFAOB>-Eq0)OARHV@^QZDRw%p8-3S?*!F&(PXDitgz?d4LM
zAc{;wRQXdbKKOy7CeTJnFxJX<3g_iYh8lr|!f~vfh%Jjkx~8p<Vn}0?TROK}k&_++
z&daT?hcg-Wy-#8zR@BbcmLiu7P3IL~^^VgN*$nDF#XI1Xdy+88qHm@Bf?9bHWOGSU
z_vi`VX9&3;hna}N?;glUVdBWyA>kl@_74O9=yvnt3hNbA7)yy*Op3ryvP4Z*Bwj;Q
z!V&#Uv*0&z5?5#J`2416d-m4=t~{||S$UAzz2fXQw>-<&!u5gNb4NvsdDyh&6-U4Q
zv4z}p5hmwFkjBHBpFN50N-D0B9hwr~7@X$1r-Y0fz(YJF3c(BsN^Vx#<-{aF^|Vmh
z&_(ZFc>=ot6&*1okt{GMLKz&?l<OrlK0X)o5Eft={gR!PRW_FBGPj1p;&XmGB~4cs
z5eb=0A`vzTN$v+ofriEo%;`4p=k<>y_;8U64|e!|5Wg5I%+z>TMWt_aR7Wm$IijYf
zCaDA|m9e`|%2K{q2ExvcH8nL=F|3H^<Lu(1V{=8<RV7nUTdM};<>PyL0)wy~IO-Je
zeh1p(fD#{)^vDdI!&%BnXG}NWGomZ6I_lA|@m*GCId8ELKT%6jUQm@v_jkNTCYG7T
z-qm8Jp@~+OoW7X%oZf%5I{y+rz+7IYZF8<aCC_b(_Smz(TXI?7iLPU{8~A8dr~G76
z5tn~tEjsL%?Zsb<GKDy4c4Q=+X;p>a?1sMOFthAuROK~sKk+eYF5S<h;_T8-7EbF*
zRl)(w!w}M>O#KCKFz;3Sqz?hDLaPf(%I4j4BO0N>y<0&G>J$w;5t<K`B4iPhD+Si$
z6^sL)@Ge6C{RtDo#yqRVa^DHE{r+B3)+gxiIL{4yg8aAEDW8^N<+^jsyg@bvEqpe)
zJba>}OK7_{3p^4$0?I4%^Y4L5RJ3$-Ohr?Ri*e)Q8s7`Xc^sRQV*!gqAsP<lWqhED
z3WgB0?@OK!eW<DU?xQt;O(ZkcweLJO9mj+j5WW1urICb|;p)ntL7C2gs#s*mo*tEn
z#kIykVJ=)Oh+Zz~3r`cDsZacwVCRe!<E@cOrkDC9%GIFMb7uIt{oMdpez4t+@7~yC
zZAAW&U+ZE1ys3VrKdr9HeHB9MBL3Nwmx(5l)Ui^wh*bUzGtQ2$%u8l$&~(physCBd
z7^#OeRlHXbj2C7+tC6%&bPZQ*Ar19hty+>}py4%Fc%GX8-b+R%c4@!2^eK~?$y!N?
z=|2dpl#xmNNwC6tBXU8xO_1b!bRw7L@3#iYs4+HvBqd>CaI!dG>+7cu(smgb7^b#l
zE6wVuy(7e_A*i%=dU|?{?Cd5xN>?amY@&6wL^hFGk2(wpDYW4-W`2HmPxPpz{E|(7
z>c}+m<zWsYGGct+9%wa^R=>g&W%1aMH59-=+@jhVtIdnk?y8qhs$kk0I23O8A0h49
znJV+bDD{gG#K8#2A69I2jRGGaXV+YBb*|NK<0Gf0Y%H#=!ia8VqP}?MqX#1oJt8eq
z!c?k^A*f<mNzpAisS0Efy4`AQbf|8$s3j%kBnLgwqu<jQZ*EbGIZySdP;>BnANPI&
zHIQ*tqsN^O4<x=MK{qaVXiI5}^2^nUQE^^)kS`d{@QI=}zYCRt(c(QUO-vMupa3bv
z3aYAa5u>;l*VfFex{qwS>M7)DWnj(np)=EM7QtCc*w#73y*{aou5+EVsMb%{3#a&P
zu(~?&m#{~aw}q=1M8e_tlg6~D7mRU9jOZvDj0_q((k)<UvEb@f73EA!Q%EO96Fm_H
zXAa_@@NLk}?hy~cz?JL^QefrUQ@;pb1+!addo?5jWYG=`C^#cUks|nGcR{}R!XXKY
z*JO;K2%~P?<&LQ(Lvw57-IRn|q0UMdp@&D*0P`hrtaX-5i^<}>Lh_4X975ATW&wj5
z(Dx{K>nz-MA;^As4^m`1+L`Z~I0$IbWTgl+Cp43j(n1OgsjUu%OOQNz?V2m?E>z&9
zkHfMOY$COCX+vFvTutDt6mc5)Lzg4&$5*Siu~9TkDYFKVTKHN)Zxh3ItvE7bkxRMx
zx%D$BjtmN^v{Ro6OyUhs7+D}_GOmXS@h>etxyVeU#Vh|Yq>JfvS|rPo?yQnTM=xA8
z2qUcwNokNsG+{T)yR1QNevk{VaS_-7nBk%s8qU@}p1)6u2|Nw+>xEt{y5A({_ra~{
zD7>*@$AMDOo~eM_=sFwhet%bs4kbO6B5_tp<w0(ge1lkSfO{V8u&XD9XKi`$F#|SC
z=X&m?;B3ATQnnnhy86p4F_nh0#ThGrVm)<$trp2bE7kV+NHZ7Oy+K=CR>qw8Vy0qv
z6DYwqHmi$~;6*=hL5mWA0pxBvyOe&)%nX^_HPm%q#WrxiIRiv<Xz%g`V`g#4+66(D
zF{EB?xQ!<!Y&U*YGx>Yf{UMMNCi~SC2jr#pQARRUIonxiUHf&Ayd=;}5`sE~A+Yj0
zoU}`I^G^$;p777zf#zbJL}D!7w8%6_6{|)bxfBE7g}QNn!A0ClJq*XaMlxrCR)8-s
z`25(TFjg|ixVv{&@D~4Y#e}K#;yw{@t@5m4H-@i%znHubaTfA9)Hyq)&gLPMc(`F<
z<9qif1q}TNGmZnrbdoi)$JT~>4549q8`|eHKop34R0>xw$5saNUu;2H;?&d%>Kl+Y
z@i!F|RbbTy4QXFi^{-b~^SP*b1bBEZs5#;`LVKfnp%lm?rt9nL_=>CaLXqd%3eLvg
z+Ti-@?G`<02!%T-lfj@XQWM1z`KU+hOUx|bxcNRf`4Qaw1Zu)wipEeVE<ZkSR)Gsm
z*+f~?@NR@kC`YI?7zqnqjj^FX4?)aJ(-pi@mkys36;~=<i6rGJ5<jtbWL)5W$E{{W
zhfLq<iO4<|9+sk?Mzf+Cc~hpFcWj*&#s5&PHp&TjM(L50595z(6LdCwN1`4fuMqYU
z%NYQk>1Ea;<?wJC4+Qr*ZhQF*af_BYCK46%4Cn=z!O;AfH%12W^(2Jw_TpVb4`gx-
z3}Xu`WyTrG3JU6$p_EG0D0L$ecIrbI@h#4%z=GprX;Bs%71+CPZf-g&lS(1$05I(!
zOihQXr`KyOm%8|+UHLf4%Oqy5L0S6b5HCe+vdGm07j!-t_wq7t%~y*frW0<1()r=#
zbA^5qqk?PCECSn`86c9rBOa!BIi6!MfT3`cPPL5sD<dLzlst;?R7=W_I^;Deb^AEj
zH_&<cFN09m`d6{fQ1X{OO4&a&a^ZGpgT!luFboM&T=f)S_%LnQCUN53@V=51UQNoP
zV)H&NzT{VIegWvD7i*)QHgx(6MBsr!7Dp;3jB|$-f+}fIm>($-&N$R;l$n*?lV(98
z+A3;K|GG$RT@9zh3N+c_dNns?)nfi@jxmE&fu+$>QVp(aSCJ!ww2HPPfwnukb1wl<
zvi&bx;S8k;qdG1SPnB^blU}6YCGDJkJVm%q`np8{I^WNl<~q(;XNJ8acZ})O{7UtV
zkd6b@K&ipw3;5DZK$t!6TAvqO{wuy)F^DcP@5?2-Bpl~=<Qj(FO5UCiFrK$fm))$N
zf7#~`y727WMTWBlvrE?+0HTBxqq%JjcuIRh%%IV@hrBw0?%J=|cUcu0TOR~%qykh`
zBV%;->7ULtw7*^i&F7^4Zf%IHPFaA!3V&$ol#0Tt@Yy<z>)EkDd1BA)DrN)@6gnJ-
zc8?!M8!9K<5uZr?>k*ZLe`{--gVi#$IE4Fk3aG6~Vl=GD28Ixit_Zh&J0)9MMz%EN
zO-iUDZ7q*uF24b2mCy((8X9R<@v)tAeC_?LdqSU)fdNf3gf0bC;$E>5o9M^B7L~8A
z?c|b$5(q|)1eunSOL;H(INAqxG-N{k@#H|?an~E)>LfNs5*Qv*bXTttL(sSwRS+y)
zrH~tG=DJld_?49%>WUi%qC#$K5t~~uoK<Tun_E~tMLQ)k8p7G?(LDpZBr{B~n^he`
zbKe2f;v3s1_`l3ZMD<)c%paUxja>a$+<Fj_^di)QX=Iq~kH{#u6atws1Wha_+kL$-
zDSQw!mGQ>asxw^cQ`cT?aw#uQp^ZD4hxv{XS3*++qmN+uB#}oL9uL_7m~@CLg7F5<
z+Rq)O-Op)a)BST6ZT}0SnG3umj<IOhBGN9qXa$N!hENxQBwCIf$~T2>oZ{nT35?we
zoqLHNqTxmtaVMsxN}^w&khO}=)EISrVAlD4yEUAR%J00W-d=0cUNiFG)Hd;2u#H}^
zHt9peqRX#W(Qu?0jxjQ@GH*;ZWPLJB%Wv<fYf32?D)!t80ws_`O^C1eQ{N)E2I^D6
z!+52TJ3f3?H>5A+MOd$ignj6r`iF410FB5!vs}kE0jflFO(6q+!)qq>^S8<WQZLh)
zcWl!se;@ll(~!p(5Sx|1<?lNq8CeS&rhIcdYsmv7oN6CT50+)+I!z3QGxH%~Ll$i0
z*p*x?CY-tbNY{!<Q!nsl1xh2U&3JUw({X{fWw~{f>=x%DG$t&uPRXR9`vSdCf<5Hc
zrl3j8i4H9w8}`7$Ve^US6)~5?CYP*@P1zZ3l4YjDe6wWzUcF4i?3W5@7k&qWkM+S<
z<QasGaq5PKEvu4Lb2PB^Uv)lCe%Q#7oUEcKhVNG+wV&)x?r#&ls}+FKgUDgenKCfa
z6I5m_Q+>Ff+gs|MKe1*UNL^csamuorT?4~N<KPAwO+KbX`F19rTNvly=1^ut`MsvF
zgrE^xsW<l3gY5YVXfo5o`$~w+qu1IH@?1R71=QHXKtdV<>nH1RaWvayRxH?tYhQcP
z)D)5l-K14>c8EHk-dpFq0%}Y@Q^{GAy=Nq%{DAuv2+Zy!Q=ma5uoWkaksfQT)M4n^
znY@`?9ZO0g0?Kcpz+bZ^iMX!Qtjo*Er424LpB@JBvXNeL#K6JY^4~?>10_{L?!m}c
zAG~VeG7^U#QR$nToADG^f2CJ-9|wuFg@qs??(ltqpa$rMsYNT|1*GI2Q&o!d9$w|E
zk_c5d;g=~fyA?O1F!=v+v$w?DW_WBAu;6(1=)4>43lFfLh?+c8&vQd?)u*`9;zm?O
zbn7HWjpSx6K#b-PVD^m)XZsKPe8?YULo#xv+xhA}X7%rh#8ug`nv=}XbJ@9L`R^eU
zw2Kztq&9R35)+P0-Y}muM6ic@D03^Sg#k?fZ58`K{7%LPdA-Sz#s{^IT^bP7Q!Y0<
z;_U8XB7}wvi;Oj5^<@MSTi#ycNDCAVWC|fgU5T;A?5{j{JOW$U7@kU#A5;?IL^0?U
zSBEAIo$H!AEq>jRPX}?gN?}Gxw+42KQ8)IdZHywU4{_gTaa?C+(yl!j`_(~ExA@bm
zR^F)R@odfv+%V|EJBO+T-udd2lrOBwC|)}mR#*HAO(AitbcQ8dNs>|IVu!8v(CNHz
zbIzh0LJ@TR*xeC@3zwUSmLM1?VBg~iR;780=<4W4Hcd$c=o1mn<^r4<fJB3m83riL
zRsVbHWN`iT0J2S!HjDiqLo;xq$H2Limf+%4={lBPM1Z8m^>@Ir**3Ds{P_ru9kehu
zBt2i9ZbX_vA{UtQA@xVKcgwFM$k-Fs5aCD&+7_|CU88OLZUq5tg|tO5%J^_pH@OYl
zd)g`p;FcJCBqeHk=-{WY4HyzX>+ZUcTO6$)`{|{tn6qR?hf1%oJQT=qz>s^pU}#P~
zt79#MduM>j{K21{G8q@TYNK*%Qwsm`Xo6R)rCXd|^ysS4$`VemdPzXzZ4~P*{;cL)
z#3$BPfdGH>GC3%R^3eK08mUd`mYd%^R4Z(9@@!!ZW(WIB+>jJWl|zBH`0D6exE)Q`
z9I=}24i}*0768scX+Cft+k6|w=73~GPv+?>yu&pfVVn-o?J}}v^uLF0ze|h?12f3C
zEzzS>PuB(-NoRg74&0cKU$d>gkK7L<wO}*c%kJ%|;WTt4?QFVpCS$7TdKxm%Vfrj<
zJwr8bb&z@S9$P0hrzhTVoC=kPB*M$-BO<iMHt2oU@$z|~|A^`^uj6?%HdOds0CAxy
zNq|GUZdcXyd-98x;|A&IFlOq)e6bZ4EKqyNi*|WQR#}CO9FYiVRl>a}hNRyUP-!Uw
z@3fh<*a>~;A^zp8_GH|n3c0|<a`-xsLO#tMP2*0FiH3PeB+%zko5O0_m~~}~06Yg1
zG%EwT4B!rc3_r;{n*c_dm&`yxGFrxLR^}<lumV`BwP3&gzlVZY$Ida4jEsRy$Co(=
z2fya7f^r;a5M6&baYRF4uHcq*pcZ|O-9b-G1s@q;X(T_qA{%Dvim5U;>|>YL2bv7Z
zrxKmsa2}VLVY2wi3a$ZdWZ9+hkeT&3;?ZqB(jqRRs6_y267~b}0PL_C*J#wTj0F_r
zHu7$wF??wCW5I#0TK7W54?7%iqQHezC#Rz-{u>47B*6*VID*jcSi`>R!d%d_5iy|Z
z(Ymf4>(%B5Q~9@{okxr22h1#8Pk&Gka1Yp6de~qig_;M*=E53=@0|!Za&|Mta1NMW
zp`rZ`J1|RT7-2Rqz8<sstGxa>VDuly2EPLK!1CCo-hU6Z6YTtzSCnwXgje`!=E25H
zm>cP961j1><|o%oZ%kc+N;=!9Fp+^v_*M0{D3~SN>$ZLrBi8uTZH+h}6(?H?qMkYr
z3Xh;8dE^8$$-?}OkX4_y6b+Pjx;FV+-xVpUXgf)qd0(594$Xc!GvmEt{$BeXt7=!-
zcd6bqWBQfFz+BJDzC5x9hho?VmU6#rAe`@IOD>hqVG*~~V`#si8FAOS7*C?G#xj58
z!Im@a8@^R{GrEz%7p{Cikr|*IWJ;qwYrh@I6h~oe=uIO$t_rS6eFHr&(TIX*yE?}4
zU0I@wvV6@7CS*f|Ka>H?Qut|GDv-M4Qy;hHVvKh?ZuFa9Q#-_Vxs`U;3g>Zn8tlT-
zNzTRmy%8e5N9R@|9CaqW@quCRVc}skQmCpMcx!R1=FZs8$a8&F6|yS+gwBZxX7<jQ
zY{ZqnvoX+Wg*z!=(pb}lgqW3*V+Er!)oat=otHS45_>nD0db2wQ{(rnXH_jDdCa|E
zFvym1WGoiJ*od9ZICd^YUk3-Yo!8*bU<hF<qol!QTcq&JuXaGVWNpwGAB!p6v$o9m
zP5nI|PLa!^FKNH(%+K=eZvfZxEc{Ag_m>f(5Ac(;-!{DZ=V<&#-~1nj4B&D9yW#D|
zW0$(b1!vyK9}I~9F?DPu*?(a+$B}a(>~4A~R98rAdWojk?<MO_h8Up6H|i}EgH0Bq
z4ZdS2Bze52s;ohQs#KTn9!PDkf_qDED(1-^0ME&B5&32jwyB9}Stoxo7XEz)8s6J6
z!fi?vt=?rplC&8&Qs{UP-D~#a9j%<fF%7f1jM=H~;*hPLU!A$xZYZHx5SnNjW9G4D
z3X7|iRIXYhlx0Y@nNyG}ydV_i;yR(Q%pcjvC>-^Z5&X`^@sXtG1$us~je0@+wz1$f
zCbAD-=g%;^`126&;q#=8{(zVunqZJI(x4W{y4NjxY8kQhaOziU<1Lr-`Hl&ZONXB#
zm(8TjdR|z=^0l?M3&;kl{0_Rdxz=r0X3Z@|x!%nSQ%-hs$=`nJjhy+iMeg3s?b;C%
zkWjY84>{y|i5}cdeEj7e*u=w<au>NrJRf<rSw+@9%ciss)~9sHDhQl|%v4iPdisMg
z0;S7IiKMFYtxW}@vEN{!ZVc_;g=+9%#20$mB8Xb76L}4pPFo#lUi(MTHd<q6z8e^_
z8X+ngQsW+crYDGx;q28b>;!|_P9=)KuaV<?FhBG@frPmVNO80hXR$wZam>a>2A5cT
zPHs4!+`Jo3GWi%~^wBjcs9lzHT%Zj{J)1}o2M)5LP8Aoq3WEQQYwClK{PfmYl;+Fp
z!Fmzem$f3w&c3=^t**n(ocpd8)_xS2u%T~g+}zH}!iI1`+<}-{3BI9jxoPz;*Zu4x
zkDETaqHKM0$gQ>;^2x29@oVvQ8lEKi(JWF{M!3(-Y8E@ApZP5`bZ#}vY>RjFp_S-|
zZlv+brYF{vlZJe{Sy`F3NoDTaCFNGnrEoK}Gr#5O{Y}rAeS(Vn0k8VONs`_(y<_~n
zp9t8!3s)t?&WB2!`uweJeoI|bIxhS_MTR-{{-EyVuh=B-v>CS4{H!T6GTFN$HFH!G
zyT?7NN*wUv6xse7(w<?i%)!)c`kG_?%5<5zK7hm(^GXW+!FlBEA{P?ZmB#1zI8+$t
zdug39j&cZ#sVj<bx!Fh<v@U-!g`NMb;Wdo~CBN!NGiJ$23)$HnT;3fkC&2k+3-4(|
zTgKwEOP64``6O8zC~)KCSdahelcCQ;!7e-r0hTBsZow~|w*#(<rD!Z2sF5JG-c9Py
z99^_odm@{0$R~5qU&AgXXd(fhq8;9eup4tP9&-Mf%Btm$IS>tnHiHYiv~08~>s9Z*
zQ+P+2R%YW5?lu`_=8kgto>lFC{d;!Zod^j+hrS+~5%#XU!+rZ{s6NPv@P}c*MaP#=
zn}!ZL3t54_lb4FkA#{<S>H|~YL4!BN7$(ihV<?@k$B^zX!)oLKJ^B4F{>HkqS;g<E
zStp_(2EV6m(vV~pHuD~=*dmg?*EALr79#<Ujmqtm+4;hvfh?M?X7^|XhK9fqxA@u0
zT819p3NX6HCpt)A*NH-@*4r5J_uJm?+{&Z*3GRc85`VrlDg(ajm!I^E4WNIGP0BIe
zD<S3*nK!<xlQ33^px1-LA@Lhhm{_8q+%lp7HT?Rys;DJHZJI;pi#*f<P!bw5wyuN&
zs*HHc^wb4F^7X$}Iqz4)okH4GSiC@NSd|ZQQ8oAa1>2N=*FoqhdW7itX&SAWVjsgO
z4={lIAF;VU_JX@a!=`XR-=nBIL<wmJ(i`k=Sdz$Y2u#}Ja~LDia8f!&rh$sM>NN6H
zJ_O}Py#b_Q`{9eDfbZ{&u*h~}=y5VK`s#+bCLr7lJan8J^8fnAduNFmrbwbAts4<G
zAH({SrtSFQ<~=8hW2qLCnny8sd#w^(YjOv{bUM_6tOYOvsGf@!#oZbtvS=s5K2sy>
zQyk_DL8_`6WE$tzTr+J}FdcR%lA00J9~;yIyoBTbtnVFsv+7?G1A^P86>vqR(XUAY
zlDm$*!@N^%=Ep;9ygz@sL@HP|=P}+iTu!fjx_O_Ql`uvFrbVRhvoAM1VTpKgj@iL_
zGD324dSHl}IH|Cn6@w0du@N;M-|{o+0Zp-ju_ILdUo;&LGam5^U6+@s8~2s{N6Y*}
zZNMUrM>o3uE;SlVzGei<T;Ar%KMIZ<51JU^QsEe3-++y}(CC#tIfze7;3=Rhr<jH*
z2lFYsD8+|6QoPw_Sj{7cx>zHK{o-ip9;*AT)M@>TI(*~HTERXU#!!4zdOZP$cx&9H
z%(wk|k_WLFqZvAq#_Y=&yx(qs8xGhwi+_J6$ZwgHxcSHdn)@sV^^j@oh;F|6N#9+g
z8q@!Y>!2#b5?0snUVyQXiq8+W-+n~{a5Ejo+d>I<iISbO{QdA;_>>4mQ{z{>zNF{U
zPMJqe9hNq%atp6GXAR#kT*~fLGfM<(p&))7r0z6Tx{Zvg@$dxekLY(iNDb<$MeKbu
zzIg-$krEH^@UBowI4Y7j(0SUV-MA{sw|bCtduq#$@W;H*&$=Gh`@6`QB{t(xVRzB=
z*akEMr<TCXn!kb%&47ebU)46Nz-;Z$Vdq=YcAl!*FS=%p-{Df1E;Gp;p*Dp`nZz%)
zB45sw&n}^KJ>6}G{}2?&!kS~NGwnY-^jGi`Z!?d_M7pePB7|K~mw!+8h4&0>1PFZ8
z_29}}DpbiaPy4}vv0GP(sZ^*qCG5*IR~%o4so@B&(<WzC1ke(d=tyPJCD1oxpL>pe
zy+6gnHuJTTsNi%tkRM?)_&vVG&Dbf|+pIFa0S)(Cmf!pof6I~gsnUK?2A~<)mf0M?
zpYoaUHP;&Q|Ew!HeOJo<?>ZcnFUase{W4Jcz)GHqa&74k%4xkkiTef<pR`E=9b3Ah
zP~Vghhxro_yjVvY^5(!amX*MhN=1MTW1}6*fnvg_fy)aD1WNu_s-2?Cv01r75YQ$O
zAs5HIW?amb`_NKNluI#)=osvYIv=W0$clVEPtrz2sc!o{r+UVO{-58aKbyHDL@&fH
zD39|aprw_<+YGxmQDbz>y>r)$(gnp}rtKSAEKiWtQs*uO&JRQX*>44{z*7HiMQ3-^
zPE*(s_7B*Z)!!5m;C*%vubcI{s7EG$JRfvk1YC&xU8oD;^pECke&uJq^$hk&HWtGc
zqgnfPr_RnPe%fU=7M`FUE~l=}p1-d!M$0~k3@$`lhRF&1tn4X8^|fV%Ma<5AzS11R
z;OPWP60Z{Tx1cT}*g3ntaZwmE_W!`UjrKm^r!LHVoiOL+!*@%{LU#8;(}&M0sCv<G
zied9IoJG^hi|Y-X;~G#{vxu1ko$K|C(&qeH-jS5)YYBG_No0*oYBQ>Nn(&lZ1aiI^
z5rf(cGy}FEUgV52quJM|@8G;QBPP4pmT^k2XI>+Z+X%9hMH%TLoHkR8hZqSC?zu6T
z>Lh#uC^y)>?`4PyX|9Su9yI10a<AV1O7=Fj%<1oX!FGavz~`&=%OAQZXt%Ps%sT|`
z<V@7V9!(rSZxpcY{^6gQ&hAL_3f$0S>zgQp)eN!ogde6qDsiN}=7=0vIu=b+hnAw^
zA5n8!JS=FOcuY7>Qg{Fl3d*jj?-;<Sal&RQ3pBry3Os?Bf<a$#FF&S8;=$D@`q1C6
z?%2Jl;p8IIap8T?#8yUQa`hzsK%TnN8I7N6U>gmfQ;<mDkC|Rv>@Zo$As*@LGl^`W
zxtF7+@TFFoV&iY3`=>PpkRoJ;5@VdUj6r^Pta()VOF#{)N3GHK@GJpX{bjhIRBEDQ
zBYj1<+o%|5+=CcGpZX0ZgI?^ff@MqB3qG^r66HO0$N>MVEnL%0JetB-`B#GTEXXOK
zNLf;rV^vA^LBLV{kC2rIfR4ZD>|cHSAL|_W_^UwySr!aTvH%=?K=^+NXY=6C-~R@v
zf8>8X-G9fdKdn*PN2uioP5uOsGsE}PdamB-7L9C#T`D~%s#kEdXr(riPFVT!X330W
z*`{iEVb3hSW-#f(x=a?$!qs=9l7S~M8z0<7npPsa>TU%O6l=fzFeP*+)X>wnpOs@n
zXba{{W!5DNJ3P=iyTQ`voDXf1zB4r8YJDL(`SdH2Vc^wb|3dPYw}(fyUAh)xcMk3x
zGcyR!Z^TzgkQzWhlul^RaNOGz@M|DOwNL_Y2#e`<t9SLlrAOT&X2%3&wC;^5EY=i^
zfLq~4A5E1!M#}bghk$JgqBNC8P7e=mRFuSyNG6aadw|0q6%8q>cJ<aaE&i-9R5`nb
z{RQShLr@4d^c#zYI~2jrWh|#uZoWuO1a8osQ3pJBVZU5d>RlN`5+KT+)8=(;VD5(f
z2wKlqiEvqodH5uDkuGU61-uI2A>NGDW~KjKqWRik+$M})Y=|EcAgwa+bCr@SI^0jt
zw2FMWKu(~!!g9hmqNz;|!5Xng&f_+eoy^sv=oC`A>DZ!3@VosAXlGwzgaEowRxUJk
zwBFb!kis)e&7|DbT#k5}4-mMAu9Y{CHf~VKgnq!e=?~M@i0scYGlpQd@J)W)=oB!h
zJp|+qL9Mj+Ma@g4^XWl!jLFRz)K+Kj%kPskhAqY;`gPx0T>WODtdzC?@J+28*1Zpn
zGP{l7?Dk(-9AuXXOacIF{U0^*v}VZ-8pXQt&dmq<*!n+=w<b7@f&i<*Y(?%L`PM^f
z2Ec4EF|~URBkyWtR)%jw!g^0|1jb8-h$)e^J&1BUMz$J1v>)Gsm*nPuSEhMz=^a=0
z<9Di~<rSHrU%wfvtOM@ndG4P|qC4Mbv9w%rAhmnoaR(0X)DG&@%8Xo2F?&nHndS$g
z1ZZN{zUiaEzeJy$G%e+x)VHcK1LQ?!5V_Or2RlOVGE*H@0nyGLdD6iTxNMFkH^MJ}
z{uR-LE*J(FfS|2&J@uRY1c)Q=W?7sc6n=YFduH$8rduw*Uhe-y`FT}0ISJ??K=krD
z@{XPBu^p&V8D@>M2ak`T$#qGT>>>y0NJe+bWJsA-X(c0yXFSja{Ai$9`k<G&S0486
z?uV!bSo#>HbGkQJudrifU=qB#5_-)F1|463OMjAbjH!o=mr4y?PrdT4pC!`#a*F9i
zkDem&t)f=ZS01Q4isHw7gm>}vAb(Ki?+O0@&-H(f`85E`6oFcE0AuNSP-;{sDtGzC
zFR1IkP!>VNWFXVU-SU6TuK&33fMGi;nGwS!*V)B>O?hZ%nv?1#bx^Tm9VXK`rxjcC
z)$=4ab-ACSoSpY?Vx}n6`OB%8)h{D42x<^%Vg6eTN8sxC3;NFzBxa(m%lox+KUNtt
zFn6bEZv?Ht{QK42N;%U;jYE}_#1szT8h{GZx~P0bb8c)zm)TK>%KjhZ2=}jb4VYK}
z)HwZ@sQ?(e8k8R3L~%rioE#5l+j8N40G>c(hLz^9gSMt{BEFzEeXE{#Dj>BHj!6G5
z;yL%-)XT|kT2OQ6Y+S<DzY6Pr?x_C0`Jd%oY-@+V%e;To$0+PjY*7BOBt1MJT-$=X
zzDPPtOpE%N$b}g<VT}CY9*a)~<^Tp&2AX6sW*U&bq2=ds*P(?46LNDzOGyM4Xaue)
zMoV=Fvd9z=gnzKhv>S-5ZNLjH&<8q%>)G;lc;PdrqnXg$#Ow%zT3P<$r+``ezl#Fa
z7}CrDGTe?O`0cj_ce8+A->cX47A5@)x_~PY$G)wxK^Nir@Lg26vAi(L9xN*XA3Zfd
zE*r#!8OPTrq04S-D5Fj(&F{hCXwq1^%}I6<>IuNx4xyj@O^X#fj(b?JEXWKoJ{F-C
zjY=P9Uxqv#0Fe*?2>w4Zp25`d$wY*`Y3l~IQq+4c|7R7yFu#+S&%T9x?Vv_R$BwJ_
zqtzd_2&q=;&rdw}B5>vnc5}C<GW<@y9d)PQF44S$`}6EpxuDoTZf0l*Gb4Js@{>W%
zwilmuC<ERznmXfgi}LO;H-T&dNghO@;Atv&L($*+WPJQC=$wnJ076k<TST{~OGONW
znGbX9Q_vw0M5`HqTek8Cw%a5T*@@xh_7T35?8W(%qV;!$xWISqq|)1k11-ScU?+LU
z&>tb(My~<siMey`(}1;eE-YKWgulb4((R)K5h*%+&v=5-6Ea%;gb?1OUsv}#KL<gn
z|D}be4U9`BlnqI%BibZ^Q2@$#fu@mJttOja_JXKf!n6)E6w;*8gbw&QqzIu9m}ybc
zoNbZd9fx9ceDag#s?Jg&>XxGBBnd*T9sx$V$TJP^VA$y^BLxb?2T243u|XGL-vHR=
z@K3dwU+!T44q(*Ck?RF>9!Y;6huZ(#fz^WV$huvF!;EX@YTPf<X<6t{gMbs1IO`Hj
z1gID1v4fyE#_kh;sIWZV(F-Z`bGh)TzVk&q^zDO2g3z^(Rt3>vT;G({no2BT?7q06
zt8=J8^nw%Nm6cUz52+A8!es;Jl|yL!7ZWsdnYC-QYYGjb^3dQqV_hFWr#d2^Fk6Sd
zgr8ki_tRX#z{065UCnCWhl#!pE!d-~V3~RQn`l>{Ab&_ojGlzx&b|n?LjyqxH=jjv
zD2#l;*^NT5!0|fi$7W!yI2z|--l~l4kNN{3qH6O@LVFNHpJCt^xU2U?jDx8JqB-Un
z8hj8>$HQJBYDpPaAt}*owI83&lHy!Rf=NV~HOhahTXkpmYV>FM>Y8q~!s^CW_<Dm_
zbse#Om|cKLqk@Aa*q=n@@G4d*Ih-em%x5{0{JF;1!vlf?@g&!c@BL9*kEYBoqARFg
zf$&L)-dYuFmye&Vx=21FMox_X4qgw%<+b=KH(E370qzP!@k_QARyv|9RA&n3a?wnI
z5}Ds{AqRq|<3fdH@s!t3?~x}Z#&5C_V6-TkgJ2Ns1$G+e`3^(H5ymXhPJ9@skOK(5
zd7OK{7KD&db3|S^W)dl3BKQy}MX(Y29umnOWq)INwS~J*!K)Ay6eRksmhC;&ZBnS7
zX9CH_oTQ01p2p`ho{Kn~J7rPOqfi9+B18T~X?<VTt&=Ol9ZGi4f+=!fsd;0bq`Sa^
zhNlZQ$ifu0)z=~#g2Mua+NMCuaiJve13r<{Yf93@v`e$KpnXL=YC4o_4vjjg<DUT5
zp_I>W=iG%23c_*sM&K5mlEV7~Wh|x|`@n#uiGp6J{xaOxMSTY=;J>07IBq~~%cwVZ
z3MBTwzlJ8V@fl-H6VJfY;!N$$GtVq9;GYb*1daWo^UB$O6{)ikD1C{jvBMo5R@)#4
zW4>lvJFd;(0s-;Wk<1q<$O?<<seLoBNu!edplhY3*1~NkX&cJHV^$rT%M(oXHn?14
zi}2dJVIIfl0{u;|bwr?!@31Gamg*%IWzc5>wXBMw`JB=Ll-|@A2usf|nP{l|R=q!j
z+4Z?)N2-kMH9(|qd?`2#KP)Pj2i1R~6}{B)%d(>rzmg8gv$0t~ob-`p7teFM%!!3<
z)5}i1a~B04bS+r*9!sYG`oYB887)SWFqrlVi`N?2IfGeGmMpU-%I-G%vK)B;aa}e6
z`GUl(BB1H*T1q0<0lc=HE_<*R|CLd-y-u*&uDQ^MXY<?^zB7y~x=W7pEtmRQJvO5!
z*l=`3@Z8GQ3kq}_p?B{-H}n4v?DUsuy@mO^kKgZ^lk9OBRvKqnQoPCq6F)oE2UAB3
z*MDdG$FdG8lAPfu^St$XaXi@c149b$=98^Kp*n+10gVAgpOkOrjYJlAWPA)Xl!-cG
zz=bDbuLVbHlOM-t@?KUg5q+d|ZL^mpFQn$Xpp{7c%ipZwt@1UZE$NceJ&mXI0woDr
z)wd_=-f6Y+6CA0oJRM8gOugB@A1prR3AM6DuJb7>w1yc(hZr0=WE9gVfNy5jMW}^m
zj3al`&4;jfI+sisHnsa!Rf}{=5QE>THNDaz4jq>(84Y+B!!=;csrhhN+IHsOR*7()
z5@fu$n&QB|FVp3=Kt)c$`TIO&nGSK@0SA;qoveXq<g18&25a^gQbM=rbS*u!@}G!y
zqlD)4%ra9$io*_JB8ue!DU|1>Kuy~BoEbt{#o;r#Y$QHirhdgW=MzY|6kVpie#Mxd
zK(0%r*eu!`p|qnkh{H;K-(BkTKN)?JTJ+0I2-J5@ij;&<P;c+zFCi&lZVvf}Y=m_e
z{?uKnM?Y886MM22xfV!z!=c*AxKBt-xuA~?3QxKTbAN>~N=t8nvDbF$-KX0#I>Kyj
zvG^{{OlWIRZ9+@FL`Mhv;bHh}_D4hfeSF|>kVpMe$*56bYIbo1La2;nU_ga&vb2ps
zs6CP~khU*<kxu;h>pp9S+kI3Bx;mmrZWu^A00&{T&OZHU38T_kD-bu>hmLXD(EVpe
zxjb(#L*odYpi+3wK#=F`j!c0BVzFj83(K1hM*#<T{jR^>{*UIH9#!6q*J1TJbY@$Z
z?!NO-=s$=~fUT}=;M)p=;>`%)e>6g1D$lZIADPH@cjMTnUYO5Y#MS1DdfSoa=+isp
zp&x_;PU#^9dv9c^7P)SOEb})d4)NVriAy9Iwdw_VX^L#jS};7!AGUjLuHRY}a;>o-
zzM5EbWW_GhsYVXZUXDyAxQYCTXP1c&cwTyDV9>27<L<)wIwze>7u|+M>Gv0^<5q9c
z_gd1p8Q^cp6k~}nqjuCf|KL$`yh%kxy0kPBisjJH4!vrrELRZ?Pd`w~wC@jhDVFq=
zE#0e+a9}XkkGpK#5Z6yl(BtH(C-33%RqOF_DkVCkf`Kh~rqg1dCJ?6RBkD_DoFB>#
z2#linc%vn|zDq-%W9n2^61yA38P5tP=N|TrB$P=;gGXCNNdes+9+o0W&Z`XM*{xG`
z|40(jR-gc7lu$aq7T;77qs4({+K*^QCehleUbw~PI*-GCwUKXWCK1gzKM{1z8`18*
zj%!DO^v*IwY9=F-xC&10_zR(N&g5X!=HMq6zhtn>FUYu`uWcKapvEJ6$4KKh)IcgU
z-uH6>4dKk7q?T`h+7}$Q2EpE;>1Xb8R7#K}xDyO#*P?}VtaQ1X^woFyC9#abOSp{t
zNT+{;@hbCJSNeMz-{m>g+)0`)cR4l);?TpsU3dk{rlhQiR*0a%)0XuRRVhnpZTWuN
z>Q)rrR9HF1I*MWIqOEVqkVb*IBVSiR6aTV9`}`^68?mqM|3X2_$OigRn+M&mFUS7@
zhoG?x8jRpVa4<U<8sMuC3!>|lu9P6myR3@(3q2hScH{n@1hAXx)4|REMcus3=slN)
z>o0{S{(0+PHk@1+G+@=Km-NHOvwU%cujzUdUgqZZi?m!(j85)J;Hv!`f$cbm^ivOi
zPv3N<q)#OLH}pnT&SF~3oIsB&{uNdm2r{=*iS0mJ<YBFN?60Rw(#B?+de;TKO(UYu
z{ps6m7)2Pju3jFIE9I6s)Y8<PY-`XAto0$A+9Ix9vK(@&LT~C37k_x2>%fq>^Pfpf
z3Sy^%T<izw`%4PKt?;K&;;>USW0~>qU76snWAX}I;Qn)s(qd&nZMF9ai<8ANggY>i
zs9+!hclLgIT|wj$bXH3yQ@Y`{-XY&u_lVJb7(l8WQ`Q}VthlqLDTm?Ce)uaHD_3@F
zjvQ5Q+Z&=YFe=u7OI+4K^Z1+3Qo&dcCnMMm%YEdi8(LlaXQ+(5NOYTP%aXn@8g8j{
z;HP>`3yOV{S-u?l=d>PTo&}8>dD8k~HYAy{>m;uyG>ByXNjW?F#JWZWI-Sj&;gegm
zMvnau?2T5!o>E`jGV^W@`2^+#9Qymy18j@=;gZ7FUHfBQbN(f124p#kXt(>N4WS6(
z#Wip4v=w45j$6Pl2FmFW{PJym>~wohnm0ulBGWAg=<byHEjyWLBe^eqQQrO7s0h%l
z2~P5=)*O6gKb(;Zj`0}Bl{hOjzOQ-fwfeYGmZ325ebX={$d^3hT`TnWqzTpfB4+WY
z`S&f2qJ6E629WKrMM9ih54+ln?I2pRTOxUJKZ3dKcc>aFnzvtA{Lp*tHPyWzU*KQ`
zN53bHvJAk-p|^zQ5~m=hWcF+`;#6H!{beRVhDBm0$H{x2C8y#33-nHNbgI7FzjXf}
zwvE|tT}}^91VfJk%x<}ME(pxNXsG-#&AqJqx3JDXDD1z0>OaEsFB<-L<R6hqLb=1L
z!7a*f<G(lg!^{3KePeagB!Jw1IY2o%B90qqP1W$MoE&vD;gj`QhuMNdNt$kVyF350
z6>3(s+ce({OwUVDuA<)c=5hP9L+2Sm{AoeFXPG}wYAb80(RUU1z<-~K%x9bU&5{sC
z6c~w3+vk3tb5g%h1Y=T)=yff5*U?O#`tHwI9Q9A0B*!9G@CQNb4XAnTH{gVT8?uDp
z2OP|{>$n_~H|@dK;q6_Y)l9HEQxT$u4oK_S&CVyqdmOL=<@-i{a>d4R$Hfrc)Ek&|
zX^B6)8VP!OHL#voBy`J?lIYTtphNlLPCOw1f>?j3NeK~8*b2zG*`RAVnGEjzAbQMH
zsP3~FvYJm+Xq1vi!~#JV#K~oDM~h%ACR++~Vi$`}48FGb&5+lttX1=+yW`U9NIJ=Z
zJ%dXDFLGa-Z0Y00h`>h9J2yhrfCn<R!yx$YpBdH;(&n0pzTO&J^hYb<!fz@v{`7rw
zAwcWoiHJX8gWr%)Aa)MtXEiNCCpS-HnH2mCW9I&%mvxv5PD%3-aL`eL^z@2h$l}Fa
z`d`tVZ$DwB5cp{a#NjsX2JUgTP#QjEZaNyHiz-@Z57-%Er|411`F|DDVkPAWGLELp
zc%!UYarMG=E@aT?ca#vvGnFKVD3384slt5oZ|>RKd6(aTzWXQERu77J?`tTMg61m~
z;F7%(5Joyaj~b^3Jrl~h`@eQp6y5Pkx+2Hce04aM?nUwWmpCkob(Cg%kq`YXEh83s
zE4i_sz>XqH?8&J94Zu~dr>_}hx?j8qd7&sH`R3p23gDXMFBlJi`TyYW|3E}>zSX`v
ztZl!drSdasU_|D+tgnBgCpfHK;2_A6;%St>774X^daOj`WNZ$d*pI@~h!(#n&|lbm
zp{m1f)Sfe3p;w6B64W1F?^#M*rJz9(%FuqT{jlNkY~mPrYGycpOTp$Gj5PYZL3&dr
zewTQ2`0g1Il!0khS_0GurOBXNlp+b}8YZe3ctZ<0?b|L_Yh^@S<5>28Sh0G0OW@u5
zl-b<oW?Db=umW3d$W@mUKiw(wxiJVXjh6Ob_VOfH?D*bFxq2FWPug-*@3J~k^A3s}
zkT9AXtiE|Vht}R%wDPEAICn2Le_m@*C5FT*sFU{aWtjavOcdgUzdoUzu=WxC!2e!R
z<a|9?<}9Y#cBmyH_m9C2xGC}i&EB_w`<P@tBJ&&C{MU7LPdiHQmNT%J-yeC~{zfWz
z<<R+c2>|+SL-?+&Q5E-Po)8k5W|uS3%L<xtJ$YPN8zRhB&koY}Od@`lM`Xq6nXr1+
zXX@3Qlz#o?`BNFVVciH%A=@Tzg+|6MbwXUJZ>)GI==T$P7KU%*+?PauO$5WzBoRD4
zD!1KrmUc3>qxhXanlFt`424#4q^iF(6s?>fj9m^mu$8#>ca2*oC60gOA-g{z7P+ey
zhXrx&G{m~RpuspnCRSIX8MyIihib5SsSk24{_f{f-z4^RM~Rk!-cA_E7S`Rz%R|w{
zXu5Zhn^EVEw#U-_^;lDRQ8?{~n~FOedW}||+o(}zu3Do)_kbqQR(nquaZ_k>uX>a{
z_=G&xU9TnyT`wLPG~BI#s_-7wO_fxrcOLj%kLW3&WlEqei*k3g6#BKeKoLtCj7#20
zs3<!Vv6z(sv-Ww<K!6?5UIuZdG|t24e9eVs`vLPi;s_6!qwra6bU_P*+bQeI6-j-E
zT^47<wlSymW;R7vtoUPkUyuna(Do}wGH6lq_7Q00rxsioEgh^^p>MBFN_M~Zdl_UC
zHMDG?#4(-3-n&L^pE^2NpB49&l;LE{r7e;9r+CNdFuU2pU?SD|5L+?XN~8s4D{X!6
zb&tYP&!qT+e9q$o2IQ&VT*i5Iahm^hG4YvL?QxZ|?)G!u`q=#_Wc`9|qldg>gg>_f
z{`utB?D>^eV{<U~pTvOoXi_4^{x>Ui$DhhHKDlGoEZh4;l5kF^B^FV(M{HBvAdWZ%
zlYTCHM|C))O6TFVBG2`6iM}}?fi~-~l;R#QtE}PAKuyERY3g$VtJ)(Gx%t>{Awdi_
zqifH~Ya&DgY$OuPk#C?SDV&<)Kpo_c^>RY#tpg@l+{KjRyBPQLNn5q=1k~$`&JQ=0
z&lm<KLFmJR{8n2dCpg79^D*I+Vo?SR4d#AzB$$v0E%O&yi8lF~{gv@KIZdgIXTt=|
zH{mXLb$LzLX{4Nwh7{QAhe>Ulx!|_B!cG}$<G81sB+_GB+?I8foyyl5gDk)vE;KeC
zdZB+{cy+c;P>ul&aInr)(wVY%L26~NR|B2z@Gh5{H913ae#evAHgSHC35^WiSHdzM
z^bp4lyLq`I3W$_sePac&r_X0>mbptcox3Xe3<uo|?5ibt&-K*k@E;WI*BKO(l;$TU
z9UMP;4tlwa^B&A!Fz4Le=%J5Sj%k=W?w~_J-eY-{L`OD2-7yH(>NTDpDoB>IyUrc~
zAtBQ9o0U;g-b~NU_GexjoRAsHJA#p*s}xlBChr&Qj|Y^=L3<vYREB7yvb&ezvrW5@
zMWG7_J=E5xn<$>wvhZSF5<*nFc7ilYy}Pqb?XSGy{Ynk46<%IE0Na1r2WRHm=`F3<
zk9bm0Q~f80KiYdvQO#*+3L?$;Zc?<WL0?g3u7V;yc6;;*{Y1hFd>lP_S{KKDe8OnI
zoi<^_ao-3h{EdS&D$FOE;PQC-9KTd69{*H<jy|<H5O*&faMBI$bDvE4%H7R=u(DiH
zC~A6fUkY`(Csq6b$<hCklWgUyVsyvg?B!Of&m;dzmvG`UQA07NRyEf>dHF9_BTP)>
zexD1IXT*gFgij9#yg5r(>C_l*KbN)qNo$URkTSemn6?|-oJNHOnr;Oh@w>ctJ~2cr
zm}tvsI3;XYD~-(C)d@QM7^+jGwY^xr9e(HP@$A3D6t9zgzEu)mX16LA@g|<9u$G!!
zp3kMz<O%kiz)x{YY(K$f@k0syR2@y|y;c%aG1KuL1cGuw?<#EzvhKcdvmV9>N?lz2
z#d|NdJ{&gQjE=5TQW1z*&w87g#N9;}@7bjk;Pr8SRZy{W%$kKJZmQU#j!X6^Gyp;k
zA}UvqyR2TfM=9kz%t^5_wkKdOwy1(Al~7g>8lDglZKS%Cq*V&|*+p(BPbiM!XNb(w
zU)tH6CWC8cf*+kWwHsf_y!R(iAYns+2%q0F3;gs-70SE2pd)*}@pW9eaA>){!RoLo
zMQKvIjr!UsZq~-S0)WIG6n`{TnKV@$Vaqd==|TQV7b8G_#^@IT2^TiZk@tkOX!Weu
za2mFRg&i(Tp4&(obzchll!<n@{>Ehh!Mc3ZGNWGx5bz8ap$8rdAKryzPtAL<uT3FY
z0k=2!7q4|;C8AuU&knR?PYQ_F0qAKAj4oXZi2;PCNa7vez;R5@N6Fuy8CTS&eGIF9
zj}qFYTu-7<6fW2HQ2DlV-iJSw&u@H58q-$yHkj>r_xw=;KBTlO;(g>|LwkAq=FnpH
zV(^%8J=e<_s{&`_&&`&O>z{QMoF}7z<I!iZTF~(^cEh@;W$s)NGLSrnh83Wr(7)~a
zEyLn#wIO;xLBQz*&CSiOiTU%wDAi>*rsqZv&H90{<NwFlTSv9ob?t*~@!$~LiWGM*
zS{#Z)i#rr44#llV@DL~zcZ#&QI}~@PxKmt$JIUmE-uL&-nl)?Ie1D$Yxs#*Ub?tr5
zKHFz=-ut`@x=~<5(`!>H7R_biN15a7`=Prd1`5BXv7G6Vl-A!O6PD|o3KyeXdLqb%
z-*;|Iui+;69pJff5k_eGZwp^=QoUR2YyV7WSutv>{VCaRGe*}{Gu|tZiShFc_!i!b
zI&tlb2uej=?^>)U<rG-vAm+WK%YIlhRmy_=Y{)txq31$%sxii*w7I8O-LD)42AK2&
z-9z9MFc<`em(%_v3S1Y9iTlPM+n8)#B7xh!^D~vWKut!N;YXFob1YsYm7?S`DBa_d
z1Fz#kWZB?r4TXY>>oSG(;o67!kBw^Rnts@#rq5X`NNDjijU>gA0b~ObzSMHMIIPk<
zM&IeI&hVzy0)usiN?EpFeS-wDGPox$HS(;*b9ht$L*l{Vqry8L&DBt(gLU;V2kNdb
z?%B~^7)tw<Djy#uzCoN4o*MG?6mixSHv>sKP)FMNawOpH$G*?_I~>gIu6ln8HZCOU
z6}na?2iq}!GD+&nhJ*z(<d>d>8w73|zV<&!;FCTb+w31t6Fk&lB<!PDxZS1qzD<A*
zQXWTNG#vc+O}uI$)&kw)tAvOn!U>iKCq4d&k5WTdT&x{iq{w1s;37aF#0)bJmG+V7
zewVWN-!I_P`l`(p<z6iX8ZF%Xx}X%cn){O;pow)p|4}b!k%I^Dcy@&gmq-6?jd0@R
z7HqKIblfxJbUY&eB7~IAUomFX@G$fJsR*&(=lF(J!lRCk+!>KwCiW7M*Mj0{-x*HX
z3EMT@oY@NmQ9Me@_mykg4z>JBM(?+3kXZeIUOc)s@Y#Jb*<H2J=e&6R19jxZoi=IZ
z#DKT41nZXicA`xnD5CQ|W#MU->-#2Gi<?U1SgSYu+!Q^^M;A+mZl&>P$~c?0ck81=
z&<>A-&kgOd?}-wE?}NKX6kJu%2Vy$!aIyn8C>AcJon1D1NL(*s8fWhtCGW^#*IaN+
z6Q8?*!FFG)xHz}i=)efcKon<j7~w2N+QE0S0G}=Wzv!CG?H=TBUD0}NPZWl}BMsuy
zQ*!aGYV($=iZ`GH^a=g3mN?zmlb5O&q%rc{_=ePu5zRb!9Y1=5+xf^~^4uphnGmFJ
zz4g%rL(}C8v6=i*I)#EbQvK&B+UJ#*{_xVEVEAPaEaxl*et>&+QAzVV+sovg(iTcA
ze+>R{MOZ;AWe<3<$<qq6q5a&@XysDSiSkL&5mo#N=DyFNil_B4Y}CE=EI&Rs=jl0!
z$nweXI((>B5=I<&g9}G;6<zP!F@|m=IKzoxs_09aw3yF3N~w6S;$5vpaf0qLmufW=
z{c#MlgU}_PAK`IS-xO?IL*mPLlUBrn5s4JB2EuGzp}h*~&p<>Xuos`dg@t(}<#y72
z<j_3{cvLc4hvy|dGvc&8CdD^Xkvfil9N}2WRl<FlLeT=KC=iE68+_g{#C<c5J0$M*
zp>Q*;cXK$~>o0Yn>K0BZIM2v)!#*L~$?~9URkvadJ*`Y#cLeK-j?xE;(RR1pDI+tC
zNa>gaiVu0SA+He}ANCdIP|kE!ZS!{D?Z1FKhpBaA<UZ$%h^0mxHe7qHNs35&Q5YFg
z%Zb<@O~wmbA=PX${Leyo+0`{R|1mOQm?7<DN7>4X5ry-R7(})6PDCx}fvyF!GEXn^
zRSLCMoO42OJ-Vt-O5Yjm{a7j*8v$5%->OJ(-89OTM={jmovr_`Z)zjQSB`DZgScni
z6CIqWTc3Vp-n}Z8^drj1fxVRo+}-1yfrFR4Q(Uc?4z<QhE3?Mxh|S+q|88pv@V?ev
z|L8~N3sP}e@7DN)$_ZVI#m&BJjt8N+dQ2z`C%Rnqq@1-vgQ(ya>oCQ>nUa|%5+jKa
z+?*#CPlpE%iJ(pMdI#5yEE^(o;m#A|W1m}nF@}C<ZhUCS5tBxm+si$#b_g2mK>hqD
zX~VCinAFc)iTaKlsP^vF+vUY)!<C&8MJp7xV~~MsnVijirVJOKb!(%=TYM*Kykq!_
z6tA}6Z5oNtc4x8t8+NRue#;upo`n;d6-CAT4b95U@2En=<m)B2Dv~kVG-BXY3*d4s
z7y8=~P-BiW-PyG^4@`RQt^wngC|2+<o!TM%xf79b$rL^k^g9S<3P*w+O2TQpVO>y6
zo`vw!Un(lMbGdZe1k{i4ML+1i$hXJw`JfK3anVQ5^40ow=k~yxQ|eBS__^r>j^!E$
z{p2_L<U=~?WOn>-Kf8^;wZX9ow@Y<rL`37hj30a*mFYen%)sk%`P>0*Y@ukf<wyV8
zi`6ydm^pDEUszG`t75(JSLq|{*stmE$W)$A;po#(QJ3|JPJ1k0f+MR`i+p|$rc>C#
z?OEUY<11>!@k+hhSC{Zn<D$Sr-kWOn`K>u9q6shr>wsZnyUV~Hfkpmt!}zvy$II^`
zV|3!~j~*)9l3R<S74jYrfo?A<SG@>f_Y-hZg}L@I&+5>VJx`;@vC7H)PEbYuhaXP*
z!3veFfQfY<foSH}>JFw+#ZEBV?B*Q>X3-8JLjEfh{yV6+oA|f+&bXrEXXdvp7=G(P
z(T*EFwR-0p17TZcaI^`Fc~OYA+1mSRSCVl`gNTF&BYFb<Psj5|`QmSOk#ss9*i#{5
zQ)jm%G(Ed1(0=8{=NBJYGB)i8dDlHs36MGSQO6kdZofUk9!6bm#oagK8Z%w@Rx!OY
zC!%lEHJSC?es_DT%GDTUp#y9%P+B68#Abx^E!#=$Ipn!SGp42s(C3R^j-^F5SQ%=t
z_eSwywrYwBec#Cz|MOGMz+F{ASSKg6fYRK_?^&w$eJ5=IZg$6}Y1QSJ!lWzfOBA&E
zjgFirDlNf|sNk9pe~<6+pc39xD81xZ?y^4-w+k0m%!2^9l|t*Rdhp=@J@`ey@o&=~
zn}J<z(>LQiLaF#(m<pl3S<dr*>RSgHL17skk3=gySCT&GCP|ErU3g%1nYqCJW-9nY
zJv^An`RS!+rFSyjw)k-YKKy<iPUQ65C6rLLD-b8Eu3^OBdUZ#T-ElDB4Qt5ZIVmTF
zvJc$%zp^?pkmGSH;PG^pa1o!l#06q_P3E?ZYVI*DJlxFO?KF12NAkcH?0_LRv^@i{
zR|W2t;CBIS@Y#TUb_pdUW3ZVnkqBVsY_s-u5^iHHzv-_^{j8qL17%*i&=&4i6PTFu
z!-V8NUYUQ{q2ZZX#3pOi%%~yC0vd07r1f(jSSmbN<lS>?mSV+SBktX6VW0is)K}3+
zov+t~X<U3`Sp#E`K6#7o_185iBlyJ;&urkZf1YNH;v<{->jaO>g)w-v^D|VkJLu61
zjs|;lhOajrn0AJSm9uFY#z!M%tPk8WGr~@}U_igQj;PV+BbR3{IJNHc9}-uUBkn`>
z+GDQ`wf_6{&fA<bV!4k)Q;xQhSz+1v{FeckV^3`g=U3`M506a`(2mF%Gzlr0T`3@=
z123kU0tF@u@%RR))wz!*XmdSdK=8WwTS7_|b|dTzL3lw|>+v;?0^x__8d%4@<F_WV
zGB=uaB-y{0A*-R4@N=52gXIdTi{0-FwHI$zuASkLGy&J}o*_rJ(e%h~y<qPnnCZsk
zu+5ZbdUq-3@)Ha!a_p4sM}qR%{*;#AhU%T@vZLQ74}Vqp$3iC|cn+I-k6yV1<M#+f
zb$oyDVrrRcv7+cFi97xeY0+8ED-kKq&l11B3I5hi8TSLxNyDgR4KLXZ#7^6Vb4(Y!
z)T&lXoW*n#V}Ac80HC}Twdj&fzer~RX1Zw71E0dA&Fj!CIpp@)grldv$%Y+jF#~zG
zq-n=9WexbXhN~s6%Ns2hntFgKUHw>L>AVM(+*l*{zvOHF3^ZEy#N3)49pTc#Hw?sr
zMsTb5R+&b}a^cYX`AYhLqt@N}PI`Wr!PMHYnnCH-01NOhXLWUgo!C<hbQ8_=nNZAU
z=HtR+*Nk=7qI=^ry4Um3x)#5f0#Z9bLDC1@|A;U4P>M*x$0Jb4j-LnF+7FciFQTcW
zepg?Mehh-Ct_1#>XJ!qIR5uBH!IslO;w<rnuc7T6omI<=tRT<skOX>%QF9X*`!cR3
zBIDAo&Mnq;hApmepdr<nt?kSFgm82KnEvmx?YOA4<u!Z7<6b3idq$Og-=%Qdu18tm
zrqt6Fg=v4kP<H-H5saYL4oQtq@*`~7ZG=KWaOdisa;Ah1djYl6CsHO)|1iqvxGO3)
zyV*6F!~Xe%i=mOh<;$09_~k!>b{c3bW@5a~8&*NNy}`t9+$y<Vqh_3Nk!iiVvrRQ{
zyD{I!^x7ITg_Aliwz6R9r8tJjSBPh9@+lI_+s{lI`Xk$vYE5Z>58tYDT<A@>Dwn*s
z@jt+Y(ZjAf17CW<F4p4{ny8j_I^&=h=^fYgTw7<mxEk*?tFE*5s_wzXn%^5p_DX9;
zEkpf+0*N}F;7>Rb{twh&lC!HioTn<d?2^+IWCkRBM%d{PO6or6tc$QQ1Eo|>p&?aQ
zKOpPle(7k>jMqve{5mIyLVe8_o0XR!9+6_l=()VJOBc3}8{Z};o%h0~RK1{;og!4M
zVqE2S&%7yE63*2bs!P*^qW>uP+6FEk-9u7!U$3B<*0$QlYmnAPR0)5u+5I>pL(^$C
z$GD$C^tM&97o%ZpcFdXHa`|!aN5;}G>L|+PGt{|G7u@WENR`}FF<rOJ6VsjXgxBEq
z9E&d99J@I(tmHSAmzZ7~X-6HPUzRz)6)f?-Gsjn*y<Yle9~IW5aW`gxllKCEqQPt%
z-zh6CwX9O@!XqtJ3rL!9C~@5yWmrj)GLIJ!_(+_WizQG*UovGUBSL2_A8nEMmIM}V
zgf;oDGH@5C&39fsVR-y{M>H@tlr2YU?|`29y&hyB@Z6E1+>faFIO)x6{tTBmdXa#8
zmssh%H+wHc4{lw;sO}7LSH4no-eQw~Gjz56bBVBhj?PDdp0rmUYn{#ZS|Mo%oAq2z
z>GaR0nlGM+bi@J+e6GiwgD^B8LZ~dn4<lM*qUT&|=gy2P5kPDLvgbm(!EIPpgmZUo
zqlu$L+|`n}t|c3&=iOUuKO2m3T|-mmS%@L{kNaO!m)QOtxwhwx$|?x`^szWi9=9u@
zU^@)G;_*iJY)(cfUFbD|qz@s5NdR!(|FU%9Y-xL+Q%xqfAl8Sir}>wI|JCR!f+ad)
zy=dA&@;9yyg=Tkm&8_Fd;+?&vUZ$4AE=Q%e=F6qG7V{an7H~g^`40X3=DB^R-Hpdj
zL;T6Dx6w!#C}6Al2a_DtxvjSWZ)%IV@k?{sFmU0=P|`rm5Gvn~TrqT9*qd<<bMs2b
z<h(8of6-aL&FAg*>R?T6-21(sG)xO0MJhd?RF(Xl1BZ1E2z6dC3AgwO2)c&B+AHBG
z9oM=+;W8QP3WnwY6rzzP-q0N%0vmm&??7W*_{G58aL}`{|I?`WzQx-JKUS6xSLB~)
z8ObkwD#X1XgO6B%9bZd3&zbak?B@+xAFdj5EPj=;W2&!uQgz(5!tuG*p4mQR3xBOU
zDRtS#?TF%ncR?+0BPuiGQWH<UM`k*9yU5VKhd{ez=AV&GAGl0^^LZJ?<Xg6KYkap^
z(>vf&<~w?Q_4atWfMSsoj;#(mL`bt0W9x+d{*=?c^kQcrr_Z&b%o1Lmm!y4*p$ktJ
z0sZi21*hLglFx!SZI=v>lk{h4HP)?69sTUdHbu?2<3!Y5Elke833Y>zz^u2v|3s90
zm2O+4E+eyEk8qWU&|p`Y&1@qGlV+u`ZQ&qR)Xo&<!%)W3ApMF>aoo#*)y>as4ge`y
zqFzOpi!|biil}<!uqk(ilR*0oZ;io(8SA`MHEY{Y^9(l01`MuM82z#TkvT&}AU?(y
z=c1Q1W$%R`99MD@9C$OMy$o^+dujB{YAf&P^Pr6WVM5SO)JE7yO7-(tgv;&*Ywb7F
zN`uc?Jsj(gyq@isB|bY^bW%CAbEW<dsxJei)G^s~CH+Ki+TdY6;_A-Gw&Vshd=DGv
zqUZB)D0C~r^j_vN`5j5$*Nc3w%kOa=_dyMGRK>TI@=HaHXPbmV+Z{PD@$5qU=Z$ki
zW(yNuh-d};#xxbmw_hOVTYkwBCjq|+g1yY{d^Sj8a2(KRpB4qV^ZycE3nZ9WdvaDZ
zfTOzIlnKt9irRfWZ96>jeqJ-(xO<q_OspZQXEBU#y%bMkER)-*#%308L;W+9!TljS
z<ehe0niO{}`Uy~>ycp~q?}E4YJ`p_WeUY**eVzy5>1x5M>hPz0jhr#PSt;42$peyh
zeFa)>MR1*V$<TtFl=jybBd21O0qf~0XCu((Hx-Yt`S`$n!ehN_0Bpy(Gq&>%3MX<F
zKewN?VbU<ll+Ot~qLUnYDgv#!HNkD*A)Qap>s{$KP<b@D{J^&1N-jr&lL%4?^FJ|n
z^OZ2#j`MYR7EkwBGX}cnL9rL+lwo=>$!QxR&G`iU<;2>J`|Kx5>HBkI@28@i&6v(x
zQSaRw)2*v6Rbj)dh|OdItPi`n5|`YF`?{>>c1T=KBm)=A4EH&TBY#dcir|>5*b6NI
zMlGv#PoJuNc0M>KBvI-+cj%tKT%JObycaF=KbF5tEjybu_<MSfSBzlbE&80)8^f#`
zD&t~Y%hVl7P37tpSMqHEyVMdj0cUnuADS=L(0q+MB9qo@zkShq+^Hf5dSp(OWDs$x
z-wI+*2Pv}0>YB1h=domA>s$S!)iF>upSY%8j|vIbsRd^lhQSB`U7P{g!h~|iR+pYZ
zUoFTRiz^;&j*DIAYHywbXtsYI!O76<;#n6D=5iK-dEzdfs2(WKSg37MZJ>$Q$@_ST
zsy?LoQY!1`)C!A@Q@<r-d)!G2>ammy7JLu!Zg`(@soR6IV1P?dTSB@D*2m%uIU8Tq
zS`KKgPdm5yHKuj&4zk?feKcW-WHTmHV;lG*WxJ%`CB(ML<XwbGfo0&RP1qa3mT1=s
z!I84krtM#yy(jB%*1&5>P&ftbV4^zwob_8{K3M3X12?;mO7h8`k9Q8rZ*^*<G<D8=
z`ZP7q;sgUYi{G(Xo!m$6jd7c1h@EX-${W@FrS5g{5PW#AmC$rU6b+#v=gGguco3A+
zT?+&r8%8~~vrQGDL<t;Nw`f7gLMXwg<h5hKJ6Yp!e5~{boSHWIt5BVfcEas`C_0j^
z^f>KsW&=J?Zn2|EKHSX;?K90Y5c9=D46Y?q6tb}ndr)3@*d-J;^>`&CKvq%^xdekH
zdLOLWSH;mEHRJ=6Y>s={JKF$3S5Ub6({s*2IVd8b?Ht<*Y7#Y<i9~8n^-IP1e%y4M
zBIwQ!_^~mcHbCe|V4w|5oA;V_-zI>B$={-PZfyM?v({F70(QM<W9lxkq)yex*Ju<Y
zd4B>Q@%Oo$?GUgXTyQq2ewu+_q4*zo!TG4+e;{M?yzVz;7F0|%Ml<nkFpib3v-Jnl
z&IqPTIIU;rZQcE_b^p!nsNw4es>qP%(z7+0&fFJ<!L@}fMHNTt$K9g0rmE&1Id&PL
zM0TVW6hDjfL{$?EzPF+Dd}rcTX&f?${*)Y0!h+cqj)i>0oasa9IMTx)*MmqE{=47C
zN%~?y-TViC!Y%eQ^9#<=V?VC(z06&#8y`D|qX-tDTg8jK+=M(AQ^m}6?^y154cjC$
z;b3lsJU4|>Y6Yu|MNrf*L+l5JnW|~UnWn7b_Yxy<4gBWV)DJ`R)t6&vq+hsdY~N8o
z9IS8MEv2|*7px`>^T&;9z0F;Uu_o^dwjj5Qi@ttqd)byHZ5Em3u74r#5O_`P;P)&M
zr!&v9!h<z~j@k;C>PuLi6M_!3*f`5<c705>9pdW`$Si0wTPBMRPZaLh^f0<Duhhg_
z0d4izt2XuinV?VTe(lj?KUnm;M6AK*@Q=*cXWQ!Zz~71%+Yb7y7oO$4qPRx(MaAna
zx1ZYrZ`EC+!#f+#NPopS_le?~K%h_e(Cx0ApqP+d&*OY<efXAm(@}(J4|pB6?!8ly
zv-P*Z%O|dYxp-<(2B{2}C96`zE^x6**j2ot4fYzR!k;<|NKGgPZ{CvqK&c-i?z{pa
zafZe5+(-aI&=sl)&<q$zZ0m^s{Cr~itS7`_(D*Kxo~J9|_5g`rZ(^e$qEZSr-pE4z
z4c}>`ivgS=8#<Ss$))ygu0iO0wz30q&9wr~TzvpX5h*_W{dnvP#b5}$0I<$@rs6Uj
zqzDk&dD9f)cfix3ZdU<>2tMWpZ9eXEC~{X0?VkGLI<I?SQ^Whb_HWV2XS^)R<o8B+
z>{-gv@ODo|X@8Ujk%@W-d{m+sa}V5J_l{njHUU((y3T)G|NV$-44I~<aH&XgWOc<n
z+O!5VIB!ImK4A)q!R`MZ>jekXH5C8C5*!ItyxW%(3p|nBZl(zO`bT{&oSsG;a?y(|
zZ0MHsDLpLn1iF=I<1B{>iVrNj@Rwt)VUexBDcJwbn)&IGoLM5;DO$sLWW>t|yypaK
zPFp2o7ms@ZVi&n08Wf97rU^CWdnJyNS|Sp+6~I<?Q*FAnv5cE5YD41xk!5Z)W1yXg
zX`B@FY1s|~^hvxRUOLa^oBV6F%(uDm{4-W!$yGpn>e>{!y0=KM^leghv9Cq5VBy+F
z<IKg@S08^GYNXYWMd*lyw|2rmmHFQp{BZWgMjRW$^D@0AatJt>XO_6*879!7w^?3B
zxP`c?P7e$<+-wCD9`*UB$##*{z)TIiYex$=OX3T1JQ^+=GFLz<LAIew?~3kT55=_$
z)a=$B(c`~R+0`LOAfTBv4?q1!!ZC|j$X^dGx7mk)rw4`g-U!HgNWIv^Oy`3jb^9)j
zw?7+!gg>gj=$e$rv^8J7sZ^+zn=LkW@8jUo0}cS!UuC<NBmju~$8LF)eXxs2-RxRh
zs6fPrZ|QBcL@kuQEZ{~hIxMKW)C-23VbX!7Fy9uL<t!dT(Rsb+4NIokxGNHxO!A5^
zKqDUjS6WW^LFm11(e}BN<cSo@D`5}hEASa-eaVozBP1(_K<tS1Amn9}79_S)IGNM^
zfMh>k=N;N#hk#JjOJ?kH`P%XPX@}UE*Qz?zfx_M3Nf$YT>#0Jc=m`E<YQu=~iS_8L
z%9W_-FbKC!LYONcrb<>mpoPaXtJzOO5#Q4q9x=Fn`SS8iV#FJiMl`Ju`hm%p@&`@Y
zbUH*US$p@!i@DB3eyR(1s_Tw^XNdGu%ZV80+b4WAXds%v(9x9F?u-6X?XeO=TVvVy
zz3ejau8w^?1HJ~!AM8VaMOQLq)bb=H6ZZ6+tyza5PVdy$Xk)eb<FxeZZJ;uo*nWpg
zDXzYIfG<|ih@5^yR76rP!e_YwmvoPBHK#;#o6G!X%iOZ&Z@aFJrW>|49wFvJ%i5C5
z3Z~|-ZnWyeJx^}W&MoKp#+6kb9Vtz3#Sq?lW*y0Mwx@?*om~^~U1jf`aeHQlxibT`
z)Oj)iih}vkfg^RT_@aCXJ1WmMZwf(4cO<z*!!ihP4lIteht*FUHV{C%=dKvu%r(oz
zen|$}9(5qk$Nnk%NQf{5!=$y2^zy+>4ten*E&;#pCA$UrG+lu<6UTCWUEhVz<^mSr
z<4B56`z(~t`xp)d=DyEyG+PA<6@8~dr+p16L13ZNHo#HNCiB(UV->{Q%bnln_7+Ys
zVFahLnnus&5Q}}-rbrlwyE%(isD>?OR6k$0YWjTP=(kt5NTqVy49q@ikEq^UG)#qk
z^uDtR0`rrXbq#Nm7H%fKOZ_3mT8QVfGe@&=1NFyX66&ysg|^<pfsFx=>gOAf&hU?r
z^{*UUt0494X3$<Uwx2Ly7G7%0ts~}*y=?+2A9cqDsn=<D61s%HV#GjO_lt$;Y9E(L
zD?f1ZXD&GPD&J3Cmxy(caV+}TekHJDpHC$Nf}7BUKVQ3FEqOfP;RK!`$5jMoKiD%Z
zx!qbmUwUn%ci!_EJzjH}{~;8zcy@0ze=`$wdrGsp9Z}iUK;k?Q{TLWhT=|Tu!wVl{
zYWO{G+wMwGH1)kYWojPi9pA6(gdgYmoG!2dw`5QGCPQQXJR@X=J5rMzVwV3t$7McN
zqloM}uDS<sMU(;Zp)XVtHccAz{xZ`@;!PceFFuW4f3OPoCx37tzqQKbdTSxxZ9D$8
zQUoPfBzwK=(-3d1s=*AelGi=x@Out_D7B5<YK%!O_Dp<uok<8Ry(mQwU10wtRvY~q
zm`0X3l%BZjKdh~IUov4OChj@J6QbnD!4Ruxn>r7?+_dyNPjrcqc;|uIRlz6RhY!Ee
z4Fs2QRBnqcNA;c*%==TUKh{ciD>pu2j_fl!_@3&N`5mJApS?Kxy3>&W@4P?C*|sr#
zB!~-qq6=sKEX@vmXG}hk5|{T4d6vpJboQgV*^#?Yf!VF${@5~js-__F%irH++i5Mu
zYW>HS5b=LpdG>Va;GOn)sXQ0hFh0O_%Nwa4pWtVThHxDBl<N-(6xg99DTjEh`~Bl&
z&}S~uLGk_3rKpPIENfa_uW={K1#)ene9+@ftRp4Wsg&V^U|se~NG+wN4z)hGKhcm!
zI#lrYl+9d!N;P!MFF`R+L;B^kt}k){KR<anPW9!9O=?^wmEz-HABP|Diu$+g4{34o
zC4~IxFIC58(Cc}}wo7xm623#oUgjV8fSoe5glPSiDS&hk%XLFsi^mZ!^AkcLGcHhE
z?BMR6^LFH=1f?$&KZ*JYeNSM?Q50KJ;f29ecI$~MgZ~-nVWQBM(YYp83XM>|WeG3J
zHkOc*<xVl}k$6D7#XfCxlI~PmBaNlNTsl%zIzr#tT0yjgkA=4WKBHCk#mz(a(C@I5
zYQ@O41Zyb0s#I?C_}tOR<0=*U!%192=EbypXGzzUk`WQo;H}qVzTo;ORPBk8Yx(!>
z)EHF7)m9O+*%3Ssf2h{KK2s{u_&!Quk<bLMt>Ow<r|~l|GctFFuuBHjBfmasR$3n(
z<f|p-Jx!Os9od-I$JCecAb>bfi~$){=L&vC%6_WtwhyNt`pdSIWKOM*Vy``h^`S~<
z=9~aPHa8gU8Vbzo&$7Eq!_89IyW$Iwyd`f}SaK`A$hV(`EZ(yyhQHAvl^AtL@!{;O
z&_A;IK#jFGZ_)E>n;nV_JoZVszHNyrzz=$hGJ86I+J|ro$aY67xLEIrIzUP_+#NWU
zj~TBr*KDZAW;Kkc%>C?C7Q?D9EO%WqDn-)rcNxY>juoaVgj}9_6qr*b%?uTDtCae^
z`*@PuD{?;3xjHJwEDlglbU?TKJ2VY-Ta94SdCAgJd>Cr<H%+O+or__g6T#drFkEd)
zJ!z>d5eh#-g?J!7Z9|S(7M5D{!3q+&Dmi_;xd_yi9Ni<+;1kV{sk0&5s!%MR%p9tp
zmFHnRfjw^`roPu>kNu>WOluGAe<tlIntYd8xAxe$t*%2|Ftr}jaD2kQhBn&#sqU$s
z+|@wdzU_&5T<doxn@BG{7xqscr@0cpx^MY;U-yQW?ZZ?rqsoCiqLcjrM?;SLMSk#~
z&kdT%!J>8-ob*d6jkp{@S|l4BH-1&2xHth{+=gB0iP8Z61_BPt9i{!jHBelcG3j)z
z19`<}jphFEs!XtJFKK&JI*`B6QQo~@=S$9_vur#yCi3AYF@3c^$)uC}9;u)5gn<2a
zKVAtCI2!QLndeRkLyq|0E7@dCrhX28M;}0aB%nicS!|!MAOCe4ZJrKnAe-`OxMu=K
zc`s()k+_h}Jom^V>#p>hqxs-d(i^(L8lmU#L)}yChgH(#AWPQE@uOds-VIT&m!rb0
zeyn|#{LHtB8im|YNNhp_VH&|PbX2Nz5VUPL6s`naE7DV%t>7(#t*aThrF~TpZW5<d
zLG0>vmzBB#ZiUmAQLzTb5wf#9gk1S)m5k*O;V8|9h?fm%?)=BmrI-6nCx031ik#(5
zr=()5+7w8=n#2-3((Kx)y4_=w7*nfy`XW^Quz1?5Dx&VG*;gRrSkcjC<)j6+I0qs=
zrpOfKeloX1bs9}CsBcX(C%AOOG)VLEan7xSo!rP?<xz;JWs-IaDDjgk-N0FjW*~~p
zr04M#))c?hH2H9R8S>Pozl@I&0LVepxh{WgMb!HE<TK4xNmbuohTDyCLvJ2`F$1h9
z7Z%w#RuvEbKL1hT_f(14#8TzG8Bi4=|9*%ciIpZByEQyPis8{QY+5VdERup1+ieRh
zYZSb~X*E%<?WCu3l|iB^JQs4}{lT9pMYj5RCqlj{JG@ceXUDdkw~v4(wix<8%#atX
zaehu2h*3nY+E=XKZxWvABcKf>5HO%z`r$Su#Iir1X&%2ZmGlESnfm%pfOS4{CQ$C<
zy^hadyt=yi=Q_loRgb9LZ@M;Vdc-?j*oS>J+1##|yH5XcVN!fIiZ(&^!+fqj<h;v`
zP_tcL-v>xLhjCaQNY@Le|EO@^`Nzwa=4YadM%Ek4nvndmaF{CAdVH+e$5(XqYTm9Z
z`AU1m-WJ|{DTW{H{*;zaslTcZKlSVc{(8^vR8;;m`+%fOrS8HS6TQ9?Z`oe9J0wKT
zasF@h&}aLX^_YdmT$?FYSnXTL3%Ku%WDWJ#9Us&p4<jAF!_g?pJjpa#zBD4Ej)b3x
zvUc^f-Ln#m-m8!uNVtXx^l8iH|5W=V`nVQ-nE`%aDtEO*9L}=@OCP6@eHx&W;LH1Z
zZlY3`oLf0b3@AcUj3eCp7P*v_H|fx$Wfp~BNY<JYbN^&nLiAJ6j?-e5_)tBxte!%i
zL0{VL;chFQRy&>7d)WPhUn2BiyLrX>aYWT_=*-Y>=Pj$0#SIVzi!D^FouteVAggY*
zusW-Z#g6YGGBAz*hJYu%Jk`mPWL+n#fx3D|{<)C%F+2M5ULi!QHX=@gyYm{4H1iFR
z(vOA&;96nJ0AydFov}p+6O;#(Wq6bY99O4wPDfvO@2;IR=mjz5%*bDVOW;X<$s@1W
zzfZt}I!X;1AFO=z<`im#Kh2B0!J_1M6UyI6#RfN8V^AKhNO$!tm;!32JNZAr6MP%0
zeW49PGh?4)P6fqk9mgFEOCWOL>jB3*#C~G`*2~5R1BAXRQw!>LaeWo?u_fV~^{Srh
zmJy|boiHJGNk+3*D@X5oNVtqsb@*o`vp@lXfS-er7fS{8#Q3|nTACu-pMF^;&M){6
zoUS@K!9hkg4hBD#isW}V<IaL`KNGMYCdV%!KW6gW>jNy7Qd>`anvDm8<d-wgJD11a
z-nh9x4$S&wuD^&Q&-)3g9#Liv>kqD`j&0QIq<;J13n{I*{TF#GM16o!oX6vVEG}4@
z^)6UR?vzIz8t~q<55}x<U4LCq@YyCj6dW=UBgMJl9F_nUognGc#1-N?K1$O}-a1qH
z<&X)tPl-?OxoKYYY5j2gpihuAr<F(=`bZsfc~6gT(8{OdnIvrv-ysBOV+^2!m_glo
z?)bhJ5VNYYTzxFyCnkdOISI8)W!jgT9vAfy|Na;8hUu84Wh{;=MKSB1-s8eH=#FVL
zczf>${t?2UX~id-`Ds5dapTR|*!=WeCxm5UvHw&nmnWU~iDWB&Y_r*Q_&}Qwa4N=u
z@_yZTj>N4sKB&7mq&Y%Qy%t(7oTES|Kmdr+{idO@9ZR^UC9IP7JFaebV_K6+=8u-k
z;BJ*_2pG{35-FV#8Ca#FP!jO8h}E$B4LV%Q%%oWMH%Qoa`>E2u$pr&sdopc~0V?e8
zsL=luP_5@-b<q;0f(a7t#4sY0&f9qXis*AHrQ-)`#44HQ?%#QVJs3!_hp2bogI}|8
zSWuyGT`y(qTR4H)uqO8j%emXn1)nl2{ST+^Cp!`f64sI7X|hUTVfHCF^ny0up@my@
zV}-ku(-x<N$bK|7i}-$$&Ce^NEpY3Is1I)}+8AC^HIIB?{*t5g`#uB-2pDGngYC@7
z^N1QlXhT~?FWBENDDhD_jK}JS1&cW~8xAK=%T0jtmlMAed(R6WTa2p9lB3EG5AM0{
ze7KrDFcv!g=!DM^p?v7`>>TfBKC3GaY0W`ghE)zY-wYq+33t-UG6M#baS9TprD%*E
zK7c~#<W=9HHENjc$3tRiMV7$TMbgU5e`&%xpQ?t+-T+sGQiK3PG&4drnd_99_`f1v
zw&<}+pbV!CTp%e&Vm(NRK8uguYUS1??FPT;9WPJ{YP6S3Ea}3>dSnJtI!v9}@s=7J
zvwlwLZoVm$JqcimN?VPpeM)Uf*{yXxBwT6gDJiGv)*GU&(`L>r9|FN0Mi65w6(~$D
zitU0S-SrKPk1&I7*s3QMKb@f<GR{+j8JHU(y_qQ?X&8u%*fHVeqT}_Toe7s9551No
zf{Tp;0jCtS<9jK6p1lA`+_>|sr2*>JXA;Hcg~l-9`z1&7SSSIvNBd*)i{i|r8_t>;
z3CPVu&~9@9ssi`IhsgG|D%f5hl?|uLD%4Oq^JZ7GKP9$R)s$5^;3S85cu(4Oz&Nhy
zQVea^B$^0t`X#f@yD|yNi`YJ*W~<mXH7_JG7oqQqn9TG;52&}<5Ji{<??kE2Cx`(z
zfkhfs2#raA5vMU}(%prbXeLW1Rg1B0MLLz>dB+TVz>KrlxRO#yqL!-K;(qFD#b?!4
z$jwMEK<zOJTfm6sjyj|3`GQ;XReB|21b12;lTN9RA3&H8!ke|f=Cfc~yWIaa&co}m
zb;iX#kAKw(Q}xo#E$=ApXlcdHpICTreTQz2V|Rh4%ssE_Q_d^*-Ak>7gUww~H%EL8
zsHj;Z^QvxrbIA`>f4Q+SzK*qW-tIEcjCb0UGF<$9S8H2hz^yL}in$rrO6j`igQG%2
z*Sb5JT~qnpEb~x3vq}_?Whqv1labmP?U(1`rp3$>NaKJylTG;RQl{*exfDx8SeT>d
zZ!wfeJPwNZckz1Ym+uA$kmhz3kz(|vX+8VjNz*F6;!(jw3D0G%wkGT!#N(cR8KlfJ
zPW+|-I*X9|S`0~4`HHzMn|<<8H|E5OC103A!l}d<+0ikhBHFQJXlaLS2#fY3xxwg|
z+acV~igpgd|6q|N=sFVGhcfe}nS+09WC*2lk8WgNJNW*J)l$82L3kViODWCC%$4E>
z-4tbELg@&7Z4Z?&dEqdUl9P40ffLm1vNr-2ee!SG_S=lBU2)x8N0jzZZasYeQw$Q+
zoZ(swAl#N!W<h@6n80ytN-0QhP!|<2&j<)9@4ew#8-3PM7UMR_^=5jw#LX4qLOB6@
zkWx?;ZpNiovM4YU<clPi@0rwME=@GP4Kc?@2zmf#9`_P<kOInha`ro~HQGxyZ%etk
zx?D}EH_LdOi_tFUI$_ZbudQH>EXz)jRW99yye6W>H#1b?tFk|5r=6m)st4BoX$hsW
z%W<`9oFhKLwjkelU(wqcM{_&hW{$b_5l0?a?PW(5uUqlKj$lq_%CZs6edm&HxIJu>
z<yH3^zeP?Ku`!7oy~l%Xm+GF=R0Jj0Lp0cpJiWn}TXC2A+v5<DQ{l_aI4DST+^s*$
zi)+PIf~%==265hNCsq_{!fjM18=7*$qk#-mMs}!Kw53hZU^V|8FeNXGIj1e=P!%Sd
zM&w*$M&YXlRWO!96*0`<5fsF6BtVbTIC}`9U8V~Qd9?_k?j~G;ydZo=zna}L`h+8L
zNidb&OtGgvb#}Q`7(&;UtC#<#Ws-wfOJ4hzT`5}fw{I2zZ53p_szA>z*tY-@Gs&mI
z9}d(&d2^e-+pQVJOI~+5BS;pSSH}uFZ%)^A05I!u?@dXSF8XO3Vu=6$8&<ohAUYJR
z#Dg~5w~WV;{0^@!KrRDJni@<`%7Ak*ZzwGV&sdD0LML+S(l}-O^7mLuS)basb%}?E
z$2_*pkhBSII(TC^0~OM<kdmg=VMm~r@3vIur5WPZ%yD|}3Zfotx&2XfIpqiHD{Dtk
zrx{y52#896)+cyV-K=5$;Tz|gL^fz;o^KSDwUPr}!x5$A_bW;wlX$Iao4{!Ct?|C%
zgxwvhy!q|8Tm9Nef6lrUGETkx0W-hdH?|SRbIcF}+`kDyLMhk2#EAo-U3VV4mTgW2
zVs~-fVF8Y$KBHFAQ#UKA`2zi+EXsGzLejKavZ2nYGRzvJxf_JJ@t&Fu_1-Z)AIz<{
zSOojk9p5=Wh}2m@<!y|4#&2%B_b$okp~R@CaFUwmxhwnlWIdNKMAv)~yVeOKm^Z}T
zou_9Z4k<u~+?cl&5R30L+m1`b#>JMC4(UTS($u|qGRkb2cYTKCWdZZ_Zq^)h#Y1Tx
zALLrjJos4j_%K1W)^7xjQ>C*k@&8?td^D$bBiLSndp%U}+U_jKz01IDH<gXV%K4sb
ztxZa>wDAm`%K*I0WzQ1v*?&=O1m7$BpBLWu2RM>+Q+d7J8o$hRkZ*Ef>y{(NC*WAJ
zz(Bc?td_+T#KUe9%2-4bufhF(+-ue48T;3<e{s}fU(pZ|TZ2SuTi(Av>2vo?emL=;
zCL?Sm_x5|U-dBW(L)_E!k&3?~K_$-U!L?b!^BTc%-GsIyD^aI)A4x}zKtnS?thOqR
zYJdfy^anXwKxCDyER4zep_c#+$KECi`EN{pL;NJ{Rnzu(glNZq7F*|v%bpjaA(Ct>
z_o=vE{)k1l+d~zk#^B9`q<uT~%JqNI)LN#RAoBP@L8oHyO0dhhXZ|9JGIwO8d8xpW
z*^}36y*A8_{47$5cA{r}iYX5_@x`y>WheVAN`1D@Z2sE?=pgC-!B$Z44G!jN;K;WZ
zn{qKIW9<8@D#%Ru)D+!%>J+Gl(Nlq}FUN-LC(|By9%kk@{KtJ`Gnc~7XEJzvtO@<^
zGd3sIrKetRz7~9)s{T@HlY300W)4rH7Bzvd6yF%VSeFCmf7;f(ISxg@Z;(#YB@be-
zsb$B@3>czo@n+?>d!q<#@+Ld77QeoO3ElxbEoxlIO}jjiBTa!$#mhK=P~#P7w|AFQ
zY~~`U)<<;mdo$UX9mQl)3qF-T;yg%ZSi-Iaa`+=Y;4W5pvOyLhIbLcSvMX|qz5&MS
zr4j&qxe{qvNa>^`U(tt>9(<N}mcucqz0JKwnB+eKLUg7BEs$Dx1@nab_)y&%HrQ|X
zO2Wo%Vy^!ZVp&(dIpQ8|r?tn{2Tzqjc(U*D8Tlmm?>GnF$Bg3c4TO0N{0l~IZiPk@
z)4SS^HgxW9mI;Ooq*c;s@atzjrl76TBf#~40Y`e^gfb7|oO+Ds#pTHy`UY~;JGg#+
z`%Ztrspr+MgM#iH&KIjwS>=8lgj+doiT{-ECcju1rGP^YJ=<BKSI8Rs@1FN;m8`Tm
zEDeM=gA4MwC>aM(za}`dbaQ#pL**f?>jhYq8<>o5ruaS}R3K)D#F{9S&-jV(bDZ<L
zKh+*3Vl{wzCHtxPHexVh$dlTl{T*!8VCZ8?H2I)9#(=L4mTZ%OR{=5uZDsEUs!_Pv
z)<9<nRxa}%A%e8|@vyDgfEBXaQi+@y)t2!;D}UB5AG(bH;c|H{Veoye`g@q;^@2i5
z#1E8>|3!Cj8ho=o`leHW*l{@7K%Hf*RLD|wB)C<Y>k!lrq|iug!$6!Fu~SeQ7W`0n
zBJa^3IBP{Cr7gvZdI;F0v6Y*ZbSS6gH`U7|#)vUa+*m6L>%Q8Ku*<`1ZE{W4nAAcs
zWYSv?jeQMF4Ga3q-v5~H+EIu_^}V@dLS62o8r?7-P9A%J<a_mFDc51nBt-DY#Vl3H
z`&G4uJP{AfMTZil)v%=`a7pb?r98i3of=1T?lB+Nfwcdu<Yc~oDaie;%ia*C7bWhm
zNT;gz4fWA=CncE?(fptcT+p(VXToX<c(_jde?`JhW!zX9Eh8FAzls)y0v(GNb&E~~
zlV+@wi(G;%B!AV$<-)$O8VtKl>Kn!eH;~8TexVcNQ5024$W04`EQY=z0L;_^s-?T^
zt!d}f_p+r~kde+HxR(AUG@$`h`*x)Yh5>KVSur(DJpuK7Zy6{&<Q7Y~hNWdRMaW~+
z@_#aqO&aySVty~BYz{EMgt+HK_jiApCE`^x=iFumi&6a7TJ-ymAdv{-`q$F>SDjSD
zOq?$7|MTRe8z%50dLW#@b@(5ZYgz)ga|{1#s`HEFtLV55SX9!aX?yfP5II8TwT1xs
z`?ie^H3T;P)1$3FStY=S`C^tx6qtOmV0%W6@I>vw@+f{_rmT!PWBS5v-AAIl)@p!_
zXa<j41xcc15BdYsPuvj7+6YHYGqStFB_nCt8~k3CJiL(=>6g0{(|In)U1oTMiG-wN
zR9(%Ndpz8e5o>FlU%cuIT5GY5v&#41JR6UZ?mKMB36YO`2yV3HWzSBPzkJT(*grTl
zGwO$)(yj`QSKm|*V4mN)8I~dBmp`JxG1vbsSUk6{>|Xx20D5j!v{4rl@%4?Yg^14u
zR>RtDp^V0^TfI@Wq%Bj6i@|F+OPz73nU0kM&7|Xv^NahbU--BDbum%>mUx6G!3md0
zq%>q*e}CWxYmiEf?a!cR&;&fxfkF(~Q;Pvr$nV(s!a_#G2a!5y0g`-@WH^=~B)rsE
z=Cd@tgFk3`wk5D2s%EhyZ+YGh#bmwSKEsFqO&u#4OU2;Z#auw%?rmn49~yi`mTiPi
zi)orE?7GE{dZUo|@{W-aFO^ir#edei7mu7KdkFd2mMK(%CIt54RdDVbJbq?~O3-T_
zQp=PSw~RMHc8htoQDT659u}%Mw_O2L`aVj1Krk@@;otXTlqSF@Ak;)woMZ%I&^zQx
zN0;ESzhcF*0QCLiEIOBdYF{Bfg8oOy{?mE?6cCOhuEzWSK55Vhf=gp?QSSNw+ix1P
zOldSWyq%}}$61XSHiU)Dld<h-^+La~MnAcKvH|r<_cjbDH;>T**{jVkQ0Hmf@g7TP
zZ-UD0KJ-)NaYr3sM#_bBrF&Fyj%rHd)Vg)|3S{N)aj_~YE2_|lqEH_FE2;k<!}x!y
z^*>LD58-xZOP~JjFu*{Ce#4CUa8bYT;X-w_G=%g@E7+l!9*?spHpGy7e^zifIJ6-Z
z?m-JE9~B|Hm4*TKBw}Pn7t3M<3;Q)R`)3uhw|ezC!xr<$n8yA?jL4&-!4f>L3us1?
z^im67TVZj;+D2BVRX1GmVxXk3KmdF1Hxhgl-YjY}Y^Dv4u{UsUCe_r_(cMh=?3?F(
zp|2I)7j`99_Qnq*Ry1P%hij)4nZt-*1FasrdE$t7AJKUPXChG+wJk#>iSjlIl^jNy
z*D%M}(La&%#cS%mBwg5)mkB0&R}%l1WU7?%0Z$f-GtF#_Q5c1oX`BGh<c05xCXJPY
zfha<zaWUa_!HpndUiXIP+T)+Fso$A`x<^21o&{6+xfYaK&n~R)@`{mO)2)-nWA<)s
z_E7?KX);}>W6Ci+zzs+hys=B_n3nSkN6%cvm&9VXHZ7))4SRrNj%&{GA6WUHS@6%4
z=zADw>D$^tOpr-or=ZFv6WA$#aa9KNit4ivTrWhh!myi=4>)Q33t{pE?3qj=Y^DG6
z8!P{!64$KbKk)QFtM&hT=}JFKqVRtZ8o(TiNXba)?E4VJPoLfULX^ZNoR2h>(G0g~
ztc(%uFRB7Rb9>33sl{-ghY8ne?u=#E@M6JF>;!B;6*co)|C==qg0O&(+0s%@1OQqJ
z4Ai}axXO0UmGjz}taMQPdtN^52c7FW4VUjHud1lsh5g#)^P!^q)e&n&+>mz`6=LIk
zd<A6%oI$M;7PoWNwZ6K}jlJyqQA*B-=ify$G5EmSp0xR=PrUg~tcma9Pevy^NjFSJ
z5(1=<!v}bLoRGI|BDj~lsAa^FNRJN(%xomX2VM4F$hXK!%D4I|2^}D8%zB9U&Bd)-
z#>9WROQ`W*OvCi}7u^2ebAMN|`#JJPT>Sq=!GGR7c?DzaJheBxyY7F0oS9_i7ds#9
zdrliGO0=z5KV;M;S*vq}r*)7XFd9q4jDNUCZ^n7{*m{xl>sxOJh@WLqz4QKptl7Cv
zj2CDqi)?2RaJ(HdxraknS4g|0a~TdgNGuQhGdkBQ`kw9Us-*$0K(F&y-Bqo{sMUK)
z;f1LpK~XT71s&=DZn~!{a&UW&uMzDht5#)(RLt%=W<zwwwoh0pd6QF>w`x%)G8kIH
zLmW55+eTtKWToeeuh_{$VP0ltN6Xuudi@xh7!lH+aW86TYMy~}fC3TB3;|9xQZ}%i
z)aH01N!*h_<u>Xf>ML4h29+~Z3No25R+I^wJSrFRCzZdX6qH!fFEKS!`~cs{^qD0S
z;x3ZDd?>QY7ZkwsV5*sN;l)%vAp2{TDLfK_I<0ufS3#L%dh20?g?(^fJE&-rPR8IK
zWxjO4WSw<sVXLSMEAyY@aom*9Wf!pf8NPeWUbnN8D<FhsjB-!vRHCqPtS{Ry|1ugi
zR#{l(w~(OX>Te0`2LsC&iCs!}%#?ME+@$q$nCa`EzrFRGC`ykrXfUAbdT1a3NgwZ?
z8W^Xp`8QmSj-4EU=jiuuYkD58mFR(W4PEk7ovM*kE!}DM>5xcEtM1*A_-@jKNWiCu
z2%gO6W23%i=HnK(VUz1mf68^Pf31|u+oeN{VaYk#Tr<}vvolE<-K1Vjv4@KQOAJE$
zWLuqVu}N{WwH8g2#fp5b^*~;wJZ`ZNMQ2G=7QA0tTAF@zV=GA~#TS#tA0mS<c(D+f
z>Fa(G7Z7=nvX%Df*%9?CvvF(c$VV$hf!+VJ!|)&0{YPdr|4X>0CCmS3rv5+4gB$L8
zI?zPJ!Nr4>LSh;Ah=1xqd9+Ju58a_TD%w^CZ{N_=-&)pIIBw2U97&q!L|0#E73ue1
zCY_6Y65|vapkFx>o*R2Rw>Glws_k2#;^i-Of995PAgL?y?}mq%mVR);ulKPZlD7R_
z@qN{H^54)?fscy~+-kTDw88uDXwbw9<e9@5BNhf!F;Pqh(M-caKe2{>J^r=IG{FJn
z&w%=WMF`ZpV?mDx-oL!e)!pxG6KPXZQ{M#zNs5SyPEAemZ~^B3{P}cqa&oeJ*<N62
znLL@ws}@JAh0)hoxI!rdMF+7+5r?jTzt$d^efa{k`5B3ZhPHY8s7m!#_}o&69@X-x
zz1!Onv3sM8%dACDJH}|+!Wp?AM$^OLNXpEiVB<u6sHHt+sE4?n?|tmtym?JIN>_!N
zte;<Sc3^JeW3p53Pb%9t##CXCr*Xor$tY8#bR$U%Vt`u#Blf9NHJKl+BY5?$aeIgz
zfX>9CN28PwU5WN_$D4pdKVLjMd%3Eg7>QOTztTf!aj$=}><^CizUUhee$0<_&J;9J
zc}-xQ^F9ynhvM0}H!o#a&U4PSBi$$qu#7C=X4ChJYcnW>@9+x@a&m`6d2)SyotK~g
z3Izp)nVmf|1(EeRDLFa)IgQUoLrcq|H)LWj<5TXI^ybXs$~EaxQHxHy2%Uw$Kjqli
zSkd^e(o(Qld?%q!Z_#EQS@Ei{6XxQmc-~!`Qb>9quXON<`84Ew?PXo&utLvJ;=Wh_
zYG{2u5Y_ly5EPgoF%_YR`_WJ6paw+-mn;&&eHXdTjFh(dK^p`I5T%)bj+nkI_1m|`
znc@R3D>K=_-BJUZyCdr>A%RP+!~oC(A=6~nOSKKL=MW$u7=y1BFG`U;jGOGrJX4W*
z--~t^2sqUBc^!<$_|RG=-9<(u0v{kh9~x4sYiOY3;=*liZthQI538x+r6;ecsZnW5
zP9{#&DcjU9agB1uTyGox!vSQN&Gd~|w6(YAqvJ-TkDvW$Y@C&*uOZA7mlz&LRlS#8
zt~Y3H4NO9_X^@eoediJ2gqH<+Q=;^?D}w{GN1z`4phzr;TDUl)j$~@hDeUL0Ox6jy
z*BRr<E_lr^IS^}R-ubDZ{R@Q9hAg+icFA&rC?s+HjoGe;7Z+7KaSB_`)S3i6mawn2
z|FvXtQ@mkQEujphhP~ta>mfqn_1_W>NdbxU!0td>sR9U{c}S`NpeP7zAWcgw?yAxG
zSsA(fGv0_avoKZQF+3e*ayv}BSS^h#L?;@REct$tKH}lQ*Yc}cj)bFpnQvI$nD{i<
zS-JKt-EaJW>eFiJNqhi3J-w~1ZE8Bpx8H1>oPzNA+1ZViX7}2#uk^s(bdbSdkvC(G
zc@fnQJyNOxv;T{+ul|bi{i0R6bLj2?X$C}^0SP4r>F!QHbm!11-6<t0t%M9PbV)Zz
zcX!?Su65V_`Tha#TF?8$iGB9j#~gboS$#6kmvYnn8l&M^cHyMRFt=S=vG(Ryy?etA
z{ScMl;t#4D&IIU7y77BPe?%ECAm?U}yyac+_g{e{?y3}Pt1Lyk>O*CF=fZ0ajMN2T
zq7(t^)J2p7HdYNkmT>fn{E;!5JWc9;5{**32<}*#w<kQ4endi&kiAw6DG!k1c+*7+
z`UDJ{ah5x-m?e)*wg_PXAPEi20fm{A%ckZo?WzS6>*ttI<WUSTFk@&*+hw6R333(u
zVm^2^Zm9uBjqZN>S)=UwWhZ9CB3i(`SH#G7kf0!gq~zMPqoZSWh4tuD`Pf#C2o*Uw
zZvsP(Pc#W?{q8vt(A7~7XfGSGxOm6x2fACaBmt@@!51z#WW6sx{$@wh(<eASDj+YA
z+B+3$z?xDIBSLHc>K%Fj$Mw7{ovV@w#AihQ-*!xsLYK&S^dG98e${T8@y@N3*{8of
z(H8+lpX&d5^b^S^LZaPuCA2-2ZLRKk=*mY1NC&^kw$a89;d0zFr_)Qz32Shlp~k>P
zmVV6ssCIbE0+R(ZkpHTKxX_AlVi&GQqV(4Z!{r|9>-hwz5|fk7tpKDPfJRp7ej+lT
zCrC|d2}nidp?+%i+|gFZdh3+-Su{jxpx}oJ3lS)$U;(*WQmw<TyYfIeftI=+qUg?9
zzb+;eEiQlLP09%Xd^~T2u#tmZTzW@X8*@0Mo}-jvX9X`xXUtKs-bO3i7pkGdI&v{6
zei1Nl7$I_La4H?C7~U;rbodLx4!*UEp=_$8@l`VCAxn8r$akCAk8tIb_4Ydnw^kbV
zQE6|!7hf@g4iN7mDKDTwf@7##u{_kR;<QkT;J@8h`W|YpRJzY#Yf}lotm?CS&cXs!
zeDZpeYSj!M@xLqpB{ExVRPq1LmJEan*By)y#GtOye8Hb1BO@TVOz~JBeQ;uKuH!5x
z4leE}0n69Iy2k9K$ls`$2kPzxy2#dr6$e_3((c>s^+g@DiojSas>;gB5uBvnkYo>s
z=MTGj<q+Q5)$l7lW+?35)Gb}Jh?NWZxo=xz6M!}%)A$2>vH@9+Syp6;;J^V|+t63^
z1GhU*g^3iVw>&TTC%ZF&u}D-U$5Or*!-z7*GCH&4Fm3N7Gxhc}Lsbhhh~?DOg(n<1
z^@WzlT7t<M9rIYn8vm)9CY%>F6eUD@<6+FK=sRv4MW)T*7^3lusi?SkcFC}izR1+y
zjXhRMr#4kS7Zb&o!16XJgA^-EQ6~-Dy?<t@GnOyuT>9Pehy{>C5qb|1rl5&a5Tq(>
ztsieUM^!{T2CmsiQO0gUEO0^qD4Bk<b^&GPhir(ErKZ246h_$#D4999?7?-GQy81t
z{BWELVs^=IAM;5^ok>-N{vSR)KPV(k02L_ghO!yQ1wao)>;NSdp{--7jm_?;JP?Pm
zqn-Uxgpl8jL5h&DpsT9`H<(*r7?IE$)Wv0)N7kY+iqp=0<+DkHmDo~@f0x<6&iI+@
zJ{DtI89<sgPLB$PzzWp=6^#?ja3X&U=?x{s7VkJy2VUi|%We+3;iPEO`vgop=oLSx
zVnGQqH6+Vl77s`ZPyV`P4yyrsJ<d+lIxji(V~AJ)AeccUB+?(H(AJTHQamJaFOmf7
zoC5lN#cX(n5Nqs}2$TQGXSzTh%Ln&oQ`5|J5=!pDux=!!enK2*K8xgw7y|p{3sZNl
zXJlxW$i4K%l3qb!`1KeXd51)Pcpz=)!TpIidHsiTsokl3V+ZjhYjl_vRz$pz4!AJ)
zy@x1j$evVP%M=FGgl&H!n*cy$_~ixxAdm^0k->vnpVR1u%1C$GR(MF?i7$C^6S9t~
zeDBh*w3`_RUsfz23xpPkq$<>{un?7oAx&X5HJaCz;|MDDPv#oiph?YI=YDW$fP(3Z
zny|DBAdw%lMSQAb)9YKw3+br~3rMbgwz;){y&qwJomATF-r5~`5>O`<JR~b5c01Qw
z<L$_}m+N9+ip!fQaQ1eJ>>HtfH7z8Vc}$w96_@i5!1+=&ZDmo&@qy%JQLZ4DM#&z1
z;_uL=&}uIL%g|Bd#AjK`#}P;!vXYB&C<AQYU^)<ULncNXan1yXxA}4!o5~B$NxLx?
zt1`vE1+-f;7g^YU17%D&?THYK76hZagjzF7e$xE_$3?4F5n<fpAQQ#t{%|8ivvh@h
zBi~BN*BERlqMJ5FD7C^!X2u7J!i7fE`Mt0+f8$@_--iy|Ihkmf*y7<6=Ge!AqFZ8%
zF0!GnFNi*^%WMWBtjfSH7QmJN^+5>$zfej<!TMdF6gGIJ8h}Ci7Biy8BkY%mx2wk&
zdN+PQM3#|=_uJotTQ%i<a@Y6H2&F8;G_M2_CbB3&jJ=;O`G;S0+$4NU(OA@o5$B{-
z0tFYg;>^esP3C%<7Sit^aCGr6F%;>2`uIjRh&8{nca3edBEEXYp2>}EzvRLmWwsFy
zahY2%5WcR~MZv_`Wzx&iP1JFb1v~uydO`ST1M6<BKQV`bxu9UpzhAMSXsfM9C|4h>
zu!tLzZb(=CMghpm08}mjhL9lu2SC6uD(u$CRJjn*e1kBrbPm~e`K7ts@<&gZ6k?vM
zJgCW55!b*;Ql@m-s;{1i)!UF^kC$076djduR{1HLV`jRzQiaESQcHC~F>EU%q!G4$
z&Wn5A+Xw-7OYlB#Pp1RYy3;8-CP>M!v}a5C-6fKbr?XMON1NgE31)4Fqu6D%x#rc{
zNjeiPd^y@|=48rt*`I+rP7juUCvXZOGKCP^FmSH>)L&dK<+?DifO9A7XP}!<k7_+V
z5&*Ls4-2*0v`$piC<PiOhuC~*^E+7}=k>GsU-btkbDw&ka>VzMvN|XXiMIit_C);!
zfW1*_TR7nz1@6AjjTnCUfBUTNZ6_q1Z>hELqZ5=}AdjE*F;O_NFg^d0a?1~x^Y6f2
zvD$UQlk}?VK)qJ`ARF6fo8M!j<TnkMEKq}a2`o(`g^dbUXSyAI>cW%*x<P=6Z~DLm
z4SiY41rQ8%plqqgFD-1$IK(DnJ0wruY>$6ilVlawXXYYQH{0RgQ4h^5hm8k^$+y;{
z%0T<d#d3n;bHrpH#>WV-7<dW^n*IQe-m?Q5zjSZ3xMT{oNJSzpho}02opK0Du-tQ&
z@<bMjKe9BMQHV5}aX-w^*+>BZ>|6|jh&|h+$cBy;E?`CBBQ7}Or&@el<rtK19|V7~
zZsXBkcx}-P8_IlVXIGt_W?Nhz{K&dG5Z8WB$&N-z$S56+N_b#Xm~FyV7C%2h#D?%b
zACI2fQd-AdD_W=WBeY^L9&2^B(1`3D;3lSo96-P#I{;P>4t~zR=Vv-Ho`g0Ps2P^-
z3z>(7TnbEuw?ZPFKi3aJJ~NlMC(ubc-S~(Vh(PWSb<hGB-1iEu^cK!Y<QZjbZTX66
zEfF!gjKKpR`}b2n>uxSm1W^s-Gs=kq1b8KDS(g@z-IKEd0dB;Ug%gnR4l5E$FJvM5
z<=G$t%x3+tr7Qv`M>*N|Z8tlu>?%3i^7h0_dl&NeIjOfX@J_aCt`x1+VlFbN7o*mm
zrU7!E>yFMyzpVD=#rb=}Q6YF2>JcxYlMT#7ns5l8rGQIxjtEO{#D-Qhj3C-Bi80p%
z6IwxmN~0u=ew|LKvtY)+4fwajg6I(X!t}%>A5YJ~@RpsO9Rcr#-5Xm>lpkhe=tTm%
z*K6MM091;k1c*O9&exj@yR5(YqOKk%l}JC?)~M|z{@^09>nB}EU>FIp2`YowxQ2m~
zS1=Fdc3&OiSaT4lQS(3J`Tu{2EhkX6!7Rk_!{R>#4ZkV>|DsJTZO=W`4VNeG;@Fq@
z-hp!ZX=twb*}nb^h%DRnk%vE@2m?)2vS<N**Kk@Cm=RiujR}>~s1=7p!3IEsaOGNA
zyV0Oomhw(!B8v&jWqca3$esxNY>GEfT?KKGMhN>MAAGV{{%hhsGb<}4;eQufiphBa
zx*FF%)}kS_?O`xbJ93fMW<G*NP61RE30K5Kt^5jF02dAtVG~Y85k`k4Mjl7%WmQpm
zP++5OzXvqrOUC~XeZY3lUR&c>>+5Sv>~dd;i4j;@JHD~q*s|PDoQR8N?`fYN5qfa_
zJ$men(#AE!lPh=l0z#YrCBF;9!4Y$bh-uc@_vZk2pU9Jj=!#krJ38@a^p}V<uk>7B
zlMnGo^>xbtus#5=kTp;rOv?#iYM+6<5*~@%8SDUNA}<rfy0zmWHpRiVr>*p^SkOZ0
zjMFE1hr;zIaydW!Z=+8_{R^&EZ_NxHX`*AIlLA@kps3J+5<V5N|9Z*qc1l^@Jl)4D
z|9Ad}fU8d>Vc}MIIr-m7E7wS|qE=UpF3r`m)Xsdacvos1QmdTv9$CNUef=@T4v44i
zk<}D*{zV!cCRfmjXH)gwo}@_ms5gttoY+jB)Q+%yFq`U_swwFuP7cCJVv4_mGi8uK
z|4})^8|&hg{&g-ZTEUn2Y1I8paE5VUQm>$C^@-=T;D+nEwBawnCbGX1Znx>=ZWQN{
zb=@pEWhtWWtw!D^;8(7@56Zl(@KdrLZy(^9@4dS6h*V54%`ELI%nHD=ZbJpgZ6Bm?
ztw5KNm1OqqG^#+U`E?h2TQd8NI&+mO2Ht#g@Q%O9ziSNVXijXTgU&<ct_1ZrvNSxj
zBtFW{*;A1xOR6`!m-;DD>^%+T59v9=wuU+A+A>@DfoM&b-}~@7I-vWYvqjx-5hpG0
z%9=g6n5>9?W(%6qtoG$E5;(^&B*svP1AV*OAiF02HT&1p2P&oez4<jA^C9hR0RP-(
zBe7vR$yikz-@Qi@&!%&kp!*Sw`w}?JvRLBV+o{T2ncY}ZHVKXizV6zTz!o*&6zC0&
zOWxH&;7==U@sW!Kw)*X>@m4>MG{WtuDw&#4w==H^>@>2S_-j=TG6M=~&`ei0DU+tg
zY~sG%`}u};$PHGhe-WG2>{#qlul3M1;MZCs6x^O^bjfLFA7^zccISNm5Mgi6SET(H
z|ELTy0JbThn=GKy%eSNzg%Aqs{fW&zl1>TW9Ab1hj_a@pO6((H07SC`M1TMhTPe~{
znjcv%{`*hONH2V&kbwy=Cjp^2j|j*rYtJY7aPp{R1D)x9iHJ<j{<S)&3YQaRdq>5l
znq$)S*W_v0eH#jE`Y)wc7kL!2ryMcwj;FU=uFc$(p~h&ss_ZySh((-C?ob2~P701@
z>gTP=&v06g)9N3qt{Ef3IgnK-QKV7f1d+CXV2T4FIpmXS&3|VE!<0!yJRaq#I2i$g
z-M{o~4)_Md?q>=q%;#dGe%Zy&X;R2=6B3%N`s2ET6a>Xe2|;MN@MxMB8$%X9x4EW@
zP~7R+vvv^15w#5N^;6g45OG3}GCznbO>_!-P~nm~SZ?^PQU-Sds4_cY<KCR@2L;l~
zQ12^gX=cQ0gNMhTl=%$>jz>U9{L5TvlQgx}FcjP}t=??4oQv-lCVA6I@?IwxQv#N?
zczL-NiQbdmsca0z)OPmpl4UQkvBRmak+vMQ9Pd&M6X)!PCQ^PM%pCmLCMAfjJ&S89
zZATgjRsEVuM?o}2t3yYGdQ=Xb31DWveriqKIOH?xxv=!bn;t%!&VEukdqAdf%vf)e
z*AYtQOeTQF9&p&;WM7!hKx@P`YW-%Zn21U2=tSPvDq2=t2p((7LENV-qU56}m?|BT
zOfccLob~2WXuDpd9*^&j!3|DC)7Oi{6xyr!@I;FG6_ZC>x=>hV-R!d<l!-A`swI<%
z@}_>w{-A3W!;R^$dt8;Ip>x<axsyHL_V?x@``h=^5R`^hua!-~)Y9j729fT9T1G=c
zI`)ey<wixZ$IyGMOP$>){;GrN@mIDV@2b0lhZg;Lj6f=Drc@92E@2@{D<rJoLS7HV
z?3~BjB5^k4!Uq4ya3qYWJM;zgp_9-Rda%&X2(>7T!=6vG>Ezeg$!QrbFhf3Y;U!TR
zY+%C00O%K;eZU3#5BCB2EKb$L%?m|l7oAT`Shjm2Iz-@pU}yjY?lx2<E9wilDiA85
zK*2<QMvGhww<5ecM&l~c@Xho@I6q$5!u1{kD7ZQd4C7NuQ3Fn2vQ9^&+c^}{n^(mv
z(zq4N1<&po(j-zufk0F_b)TVxZ{h^_Xkw17VGA_QDKJ*>m0e1#XCfS?ZD<)=kf=6A
zMX45l#I%xoR=-JQO-=zhmggAa8{`dM<@Tr~LJ@?ML+vaRr)@8M*mK;fT+!Jdo>EiO
zs6<&P8ZbRZ%mqP5vS=E)?vb!QZB1Jgu<X5qEp+u`dQv)rrcVHc5GHEWTljf{`E0qq
zH?3uV)zkhcQCkGax41>A(I&>$W*T5htE8JGC3wl@$@B&2XT$r<&m28|HPZCgQR#%A
z)Ga~bXy&uaymyJ|?d1dO@H?IOcDz!a;=;)i*_7DUzgm9AxkKr@JAzOkS_m$sZF3gX
zf)K%G@rYbhr>SiSIj7VoJUX&m;q8#)irp-4j*=@6FP6Mfmx$ttuH+pa9lw~~n~P+g
zRS(*>Tg(oNlxwmJ<aZ%*9LdkWuAXyCO^?*-J8Uw1xOb}t7-YHg3xN1CnyHxp%P;Dt
zW-w)JDB3VE(}TyN-HnbQZG-bGFO-Xent8xHii9>?ulZE(VZoQeB^9^!y^f~k8WpE!
zlpaxP*TEOYZ<g$Q1O*C-kTW&jSj|-P#-FiB%|lrX5V0t{RPm|vdPDS?F`aM@<E|k?
zm=vR?e~>L35kbT0LJU(g4q4F9><BGLr*%r;WJI#oo}Y)T>G4(vyg>~G%M#H?zxn+K
zk*V#vBKTxjREQRd|DiHNUp@}~7Z(PjZj6Yv!FYJuJ3f*AYMMldg$uGf@yWs-mD_9j
zGz#3>-p<r!XtMe1{af0xSGRnxF&o>77F_7WU1%aA<Sxda0m`|t@h*j|E8F6LH{Eti
zlV(|pCbK96;U;k|M@cz#<7|Z{kch!Cu-wODI`?l$H6AF!lyt@Q<Yh^hd~3uvKp|jg
zWxNKHwRACHOK?!(-oA2FLFDh0B~GW@tQBkUE+4$rsGq-J_DEWxSa_70w>|c!+z}Cr
zbQEe7Rw@f_dl>XDZ-{&Yj*_~WT(Ot{NiAW)P)pgA-^3^HWSb0&7s1d_t!NbYE&hoE
z0)2{bTikl*GeuAa)NuCt&ie)P#6RoAngRvdt58fESQlWaBuES?BedlTp+0{6;k|NA
zY1pE3T0OkSu_jh_9a*?ALO+lZNf75>{yomJl!APgcu76Tkxi#qB&oYG3|yX8mm8L~
zsAI)>t2ZiZbG3v=*Yj|275Hvq#uVpS))HDFKPp@<;a1gdCricKKrbjqkY#U~8JC`}
z3j;HPH%7{}8Nt`^|0b0}hEgpVkSV@F?EaQ7^M@=(EOeSDb@jLjQ&BKC-LoUJCKVjc
z_|tc_WjM8@K_dG|vEniKb`yEan`DEy02aWwj3Njm8{`;$ZGD0(>Ja8@&)S#AQcstU
zs)I-LlL(R(JYkM%_&M^}5XP&}y<1#|TSt>|GbmJa#-Tqtk(o)eJ-C_otOUs%A;6-2
zIY{^F>V<|xNN2_%P=X^Nbx)7BUmrwWNWb^7$N{InqBKp&D`1t)F|q){Xhm(%x(U(n
z;&n1Svt@u9tkmBj<reZi*$_ITO0BY9s_|GG5Og?RH@B)6iEmtl3iQpn@n1&WSmfSc
zzGB8Al~rl=s{gV{w3v)N+)6`Jl4etW#4^R11r<+rSMs~<?wU51!pKKAqWK#wN{i3d
z0|2ZDy_-p<@=qesS(}RGTVH2qM-`qexP}s#O%xii`6Z708o&7<Dm2e!s>K2V#D*mi
zxoXBQwpXMi1+`Tu9ZJ71HMoDN>=t&Fkc(T771*pvfJ#eDN=l~5&8HabvGTUbOkT!G
z$cnOdPX|W%?=L5L?}0>cow4J#1)!>u6#kS(1Xof4VI$6OT63FlMp<|z$EZVe9^Vfq
z<}mm|{cU=BLD@P8?cFCn4Z~n*tn$n4?|a$-*kkK{Uy~>dKV9uVAU&L*FX@`gp)Im2
zJziXnUc2WGF}3YUxDFv=H?@8m9Cf#KdW5vGX<h3)29#h)rd3NoT)EUy)_r+dnh<vJ
zt|mw#oVY~4P8u8vuBo74N}UlNzo6vg>K2wCw(1=|OjMgIpPdd4qgg6aWrSRFzWpPT
z=907_0ArBT$=ZE!<RE7J+IQGsrBZbxD8900a}$q|%OFP+3L+VUjliadBJ~+H&ALU>
zvj3(NPT{0%Iz<TFD#p5G@R@mxZRhm!hsl+H#<0<n_TFvUo9t#jG(egqce~sxoQ-7a
zn~~5M|5+q_^L|FT`nPntgjPvkfSsg61n#Uks1MgBJmeqOAJ@3QvpA%rCgooeLaH)9
zM13CR$ml1ez1^@5QD<`sUS}K<A|k`0MYH5a6w(@&O2b0p1bXNj2kK+P8ASzRnp>PU
zz=bOh6}I9&1Y96ApOJMZp0N>Fdv-cRVOXkfLpC;DYaSfT7|evF>{(>QM1ckM!9-QF
zPE6uw+7xm3QbFJQYHo~#;4VFPl`fXa8Qs)}ffdxBvI1spRExdcQ}jF`n(?Kvpsmw2
zWob8R8PJxsZN~V~QmCPGM|_j2WE4Ja00EuE4Mub41rb8XKsfJVyUFX|7eWgX{j`wj
z9dZCB!KjK0;JuQ0#&2%{yv}RVFWR->!MD+I&%R&(8<wLsY`_{kM95|I3+1eK5JSZf
z4b9hHo6Spgw=;7SIp56Wj(ozHf(zK67@}kR!XMWQ(Gyz_WOCl|2nk>jkN6s^Nqn2F
zfs5X*#R&L%nrEO%EL&8kPHeu71NIM^eEcvrIS~J!q=A+ljt|#IRrZgNzrQpU?z~v|
zo1LW}nnx90EO5Wf)(YG&Ki*^uH&~O6rII2)q`26}WGW6CbkSz#`=j-11q2m||5o!k
zdvoFa(rzf~lC^Q^ar%eC<Il$ky!EZpIIsPk?E3w--N|oxPPCG;*-IlM8YQztNgI@u
zn!l8_W=)v8BHa}wiHdYE>Yj15w2C-BQ1o#QFK(F&e|~E|8->8U{C4=%Vy@eBi=+i`
zh|sM%<YJoajL?*dU?XCJ_WmD3`NC%Z{kAf1w^ljU_qDE+u#>xOSel)#O2wvd8unU(
znUM19#6vQU-$OHl>oV?-I#<DttG2IMGep05$l(~Q=4Xez1{#rR)0=x^W4#}ur6yIS
z=aP~Y`O-gjXT{`Awe9hUg}OrTh2M4eHyfsVq4<}n*2k%X${mSDAvruiDHc?x?i)ur
zg7|X-;xS5Sc;@ZCb$oBo(&)!V4sL)IMKU%a8CL#=RqPq4l=9dd6Lm(~$z$wewc5mc
zKx3j>zw0Pa_;@E|DFuR&)fX#6Jv#F}w-E~d5W7)Z^LF05Sj((1%jrl=;qKM?w4->l
z^+as#c{8`gcg*+nXiWHM<OoIeVk}k+Z?k^OA;IDEPlw^5(w`*2q;J44QPL%{Y9$%2
zXs+=XD3J)+VR}ML-Z#t`-{}9_lk*H*yY>Bn?I1*ngsh;}0L<h0@vw^3Qt7m^w)^5F
z6~}B-w^&n6sd=0V)->UZ{(?JX@EPsT<5Jp!ycCnB{`m#Re2vv_$EF`Yk-p3K)LGsr
zar$ivZc$4F#jrrD_}Gd#7}DVWG&{=V34;j|4zmLJzGzeVv=P@+Wkng`bu2t{jr+sT
zwTt#-_BxL{qkYR{uaUWQffhGO-OHc%GA<8>GhQF;6&CABSmeRDZ>aU!2{unUsbY+L
zN&1;!wp%&_hvTk4GDFa+_ylN{yz?SDFO@lcTp7pecu(z39DnZv^b*p|m)IK4dv8x!
z8>@H)ebpNToNhU$@QWoF-YRAz28#FnSK_o39i}WT-0sHLe4g`eH8<p|Btk;&Wg(&7
z<nLj|3rxW4KG=BUn2omY${N10Pxne7O{XL;jvH=QZfDn)m>qf?7M8jB5@gum9T--S
z)k>}*OY@QNv?20Ljes=vB10iWoBAInO`yqxRo9tVWf7xpgLZ_@Eacsf*hxM(#3-DD
z^5ViA<=3ZoMn?3M%UYDJNB+KF!*0o1Y>UsUFixg<q)$)2s7ah=%W;W@j&tCq$6zb<
zf4bgGREpDGuYA7G)3c>Vr6jv>oft6}!H|9qQP|%7v~5j6w5?nE<J+5Zy~e*vXTQGX
zSJpZZ6LmiW0#iXT`}Fj~d+0%LiD`i+(O0;*m9rON8CE2#>9eJqrDSO{8U?K6Z$nJf
zTuQnIi^j4^{CM>5xo<}@<8+X$|L)M+F`2!`G~)W`tP=wSn~QA-M2$b3!R~d$UPxqX
zb-Hi!?CEP;S^;AsAxOc(){l5c_h&MB&RlVhSu<j6wQ*UTNPe{~ABAx4B8;0<XUKuE
z!7!TkyU>v5oQfDOGNq|dF|4^MdFh|h(zK}8+7kwtF9qw_&JwPe7+6s#Pz)Ym-I-dU
zF6|otnyK_srCNnlbyF6{ljN*g;#<^OIV9Aj26~-D)4d9yKwt#Sy@v1_M6Pc=4tsaI
z5_8t{!zCEL<EAB|GI^#kvF`YtFW~q+zR6SVX@9JBK0Ln7HL=q={p)?pmVQBjN;JQM
zc>C<?eZJYbeQo`OVJInOkq7+y$x__*sS3QZ;uJxf!pvQ6N$uYzCS_d?q?_${#5+h%
z=5_fQJkhP^W?Mh0IQ!<7D+}=k#ADYrhredJOc;C#y8I3m>je0c-)`ZbN-w9;H>Rd%
zWHpNsTFo<zPbFpqWi;8>dBfdC3clt)M6h8{*P36-3)J6Lzd!3Yenyw@yHAK*XvQ2~
z3#6j!xR5{6|3#oCeRxiLyCU85C7B??$vuaYM?j?Ai%{Zz6MO!0kQxwyR?I3vni_^$
z5r69;CIOey^4H_%zd3;wzuwUJDg3E4Z+|cc;#c&Pg)X77&e*CwlcC@V{&zk{@!nJ3
zln@J_wikZ8CIdPx3~5>-o%Il0lrDb9O+=)^+{fg9i&y1+>R6S*A0<_vvme#HO>{jd
z>=X=+6Zxif=1(I%@Ut&0-?qIrA+g;bd#t3iAmJAD=g@Sb)wjds0t2Xgk;kqQw9X@%
zz~1>c1PvKaBw|0E-uaJpchI(A9SA_ZmFj|7$-(uf0|_hbh*xn52_raUaLq2uL}JfW
z;vM4zmyct6FtpK8A7?!k%S;AQb;A14+wS$I?eR9NwMYh?KrS-(e6JWozxB;ADs%#)
zG#G2gHQ;fjuTMBTCG2W6yFOqD0E3A%rUNdY)A&Y>oHut1`5@$a>j}XyGKa~A6bHz<
zfL57Yy6YdDbPa2GN{NMl#svsl_0^L^!On+(8iQy$Q|+1LO1`XSq|pm^6t^=57Yi8$
z6-i$I8B>GBN4l_l<e*n)0~NZ-VW4}aUHPXr=*K7Vy9A0hO&!|w%BmNf(l?sHKe84^
zht<DJpr;wEu4x|^AC?ED|47+)qe%|_LRBq7snsnVY9B5llqak0$PyioVm?*1KY%YD
zTe{5I>#!20y5>W?B=L;$qpTxh_hqx}Zu|8Gz5Q~_d|r-;7-Y}7(<!q0M#lbYVa4E&
zgdjQGBmFaWEfsHUcG2eI&!{5y4NyYUd9hs?hx|uA6(Xev)jVDrwjbuj=iTa?b-BAg
zR6m8uX_gzd#@tT8!7ZSF7(1$dxazclD8DgLZP5|Rutlo%*5`g(e51bUoV|zm&v1~V
z0S6bqEpN}lbj=7-Ln_o0cRYK5a;v{;X58z6{U}S4>>gp>ag+l75&H2b-F9Er<bJ?)
zMNA;r=I?c0ilrDAkLwvuTX$0-eZZjiPo>n;3GRs@{f7+huVhdD>Nd)uK9x|o#hxV3
z8f+W2KpAFHvyJKX5Fz>JA7<@FN*1jJ&LNe~lK5M;%ZOqFZ@C&D3Z;&0y{ptzsz_l{
z((siAYxAi_TVYbdc$Ln6S_vxY&vcg=Z;su3utL(g;pS`4cmWT$#yt&^uk6i4A!8R5
z!wm)TO$T$6DY@~9B%jZAPHB62UiS~ZF61TuICU<mvn#^avvyD^th<A?WwIzNEO4G4
z2I2(}jZ5g=S5<5lKkk*eeS;Hbxr3AP-hRgmM|xwg5v4t&wT7m6-n?ZxX+y=d&AyV&
zCHR<GD*1!BG)sp%<i@8o^j=9B=_5l#{rZe{o#iZ!#mR!=9+v!v?h0Ws6c)llV1if(
z|IQ@VPRl`gF%TP5D2VsEFoHlNP+}3QinZ|NFaOo$Gfp`^?vz_6JsmnGJiDwTA@*2*
zQdj4XbKu^s&l0n<T$~u?A|Al`cyp3>332`HAmLNwz-2fK0np2I19qQAg#?ug2@&C~
zT#(MCNF}?9DD#u<mR$4O`Huv6br%E{mM-k&f7(VtAti-y#X=J!<mL=nyrqK$ZIChl
zV^U9yog~$PXujvU*7JB&=tAFg$2A;&_kL=(WK#2&67Er$&u{Ib4j{fG%l%#rr;NSr
z+fO<+LM3d)SxwXKAR)=$hxum`aof?irRy{3r~Nz_SPi<5tG%rV+iHe0*7*@zsZ3Hm
z*}7U~qRw}fO^0_wa|#|P#){Q6h>5XQhZe)y6_tA05qjnSTkX4^@a8{TlQr)xQ->@G
z+?h$W(zZX_$FZzBk!!yw#wYJO9wYke9asD3g?(9B#jfaA{T~#=s*N4(Ue#@mT8NB(
z;ve-?Gy>dG(lR6%4^$^qc@HFKf?U1ZP%`dI2bpu5;3wfCuKCGyf#kK47osS&y21C!
ztp9S$^8WnvEX(lCxf+ncFsjGd{S?hR;TDcozUT$G8F@xI6?^jK%oKhruT>*;1;38e
zX;}=4co3n+)r(*{)MCi$3Qgzg>mQetH|M9@#r$c7)48K8?ETlx?&uwNXhY+&-GAkT
z%hQEF>M+t9TnXF!P_>k^!bS{5C)Es4(&a=60MiC0c2j;kWY`xjZr7h+1LAk9#xDqA
z<y4-H@5U=J(F!}-+n*^ubslckC(S>cbBcM4d!Dzv-o8S8Uv_Gh=u$|*g=O7Y9jZp`
z=$G!2!(eOgHd~*%w_qAmL!b8~Au6BY$p5PQj1WPDV1AceOnJV7wj$=Q&!4L&xisxK
z66a)l-d9f|FUo)Y)=aW9T~67MCfywSAAY{SwJxR)#!l9wR34F|y>M}f<5W_{y}o_l
zkHGL9tfc;R;++*1XO%5c-PkZL>Bz-8QbPOdyxC0FNQF+Bx8KF^zS_^3^vCXJjI~pA
zx+G=xL3+G=?;SW>>*a2)1gDGnxk>d~Paj&?HZ}aHH)>PhUVHC-^(~NL^gxvOTk3aI
z$k0N#g%>V57Qc~s0q+pPfCv0Bxm7zm9@%@%3r}Tr6tR64{3Iv|0->A~yZ9IUp_W_^
zDl4OMtjg4?*k_1E<-v9_zZ>RwGs~$YiTbTgLd5gC1|AvqyTR%mOmA8TOpf?L?84^t
z?DTW9J4MrPZQ(VRG0++jor*VyTxQ3{HC7bYA=Dsd*<uk^q`tz4y1+@XUdN>{q}l1)
zdS3rbmpb=VYU-8N*()vr&Lb;F1Dcn#_UlqUg(yx9o+%ehA`p)1(r;UZZ98MQKiI}*
zCQ1$N`R_E)e(~jYQmTTu=z*k)MY#PeIp5@XNgYB(Wgc5EB3~K0syn-N%VRX4ccDt~
z)8~WT7b3#3Mx}rYHBNs|{+}WE^lrzW+WlU6;?%Uu<h<WZd;g3J*DNS#65-Ed`g8Q)
zMoZeoM`&uV_0LU(^{4J*;3Iy*#<O)lLkJwKjNf4FKj<Z4A#447{voW!z-cjmrm?8m
zDfe=s2wJ+&U@>TxqoDLh5jJ=}4@{A#6MQE6RHUOH_aWMxFG-;+DS=)IKqn!~`wnD;
z;*FD&IurU#wA{~yd|XvvdNVc!@en5eEs+5Yb=}?Ix34(ZTKHa?5dGf|!&NWg_zgb~
zRxJGE{u5OR__DT9um9Q|+0#>CAdRU~OFPyDuv}4&w%A4D$6&%Ut>^2#wu>YKuj4pg
zW9q?*E{)5QuBemghsBH(8#e|4<POU)G$gQO?T@>iMo^BjqL6)GzN)H>s}BeF?#@}~
zP*ni0PasO1P(bo11%=hs@O}w1LMsIo$4aY*m`zFYn}_nZ^qg4ruyc3{AZO;D{n+<|
zBwdG?D&4S+`0vt24G=R+0sFh25`9<N#>z}iaa2ve7rnz<Xo$fyYcCOH^5n<jd3Alu
zED|e1A8Uz6z^tlo!h|rssAOhbuB#-Rc4vPjY@%Ag+T?Wk!~FQu@5dh9`QG-nZ@d}5
z{Ud_erf`@hD*m=;#M72`WD`seKSr$p!bpf&=~EAHavX+%=yy)eZBO0wCSt?b!6a+O
zB>BViz}70vbTsMi@GyicK!z^;GGGE4Xw#vdj>LM<p{{KteY=PZ?7SbbBmg|rB1Fki
zvBXh33n1V(1e|qm3YYuKH@{c8d$;J;g+QYgT8=WBwB~_|yPkB|^uBb4OKDibv*fv1
z!WF#v1rR%*fflmu&ATLm634Z$4o=_<yGx&_GgbQiLB;96_iGPm5`O!rReq<AN_V5R
z=ZGsNB;oHUHrxKny&7;t*#7jxnBH>N!|lwkawW?Z3$WuC%TlW<JDoLSqo4@e9|5Tk
z8{N%P>D+dMs1st~6r?xqoL5txryyErocfwPm%Vuww)BZ*+x?GC^ZG1k(*u3U(P}Ur
zsmq|Rrx{k<<LY-r!$e-J2~zLn?aPQ4U^?A&C^=yhYW#v^tEA1grp6Tad2CfYa-lU?
za44O3W9~NFD)wWtQU8VKDolRUxOWVC34v33V&Lvq?w>OJH-#o(C;cevsADaMpj(!-
z)7bgUKMzuKdTm=WJ1;oMi5?j@zOhF*=mLCeO4TqaCYu|jDcy^n-Tb~BvOM{#EX`83
zj!cy3UA3u@OoGVuf~<R~wm0g^GPrx}9CA+wg7ZR-ltgp2=E}dO?L2q&a<9ZFN2Pjd
zbdkr2%sAr17~K!8!U(?^-Su_c-Dr13d)KyGWV!p;kW+q1zEf!_VibY7={%q0`;$mM
zK1h;}kM;fYbEDzu@h;`^?-z2-!+_=54TwrU5cI=(CI&qhHT7aE2a4xEJjzu0-Z~!T
z3Q(D%d{=HiRW<gTB%hnIgHK>&EK=r_5e_Z=M)YfGGuh2>IP7#BJ)Ox=Cq$YkccIzX
zG5;Z9vc7f7vyWH1`)Mh+WIeXkNmqEc&VWox8J<z^iVjA^W3-ePp<%86>P(PPN85BG
zS6cC0GgMmwpBVUWPr!EvBpEMPbT&`B8NS-Ps=*;rpG;BxT11RYx06;`BPV)*yRI6q
zVaqGO6B|v%i?liA$KsD|6hFT|9lTQhLLAx7O*u5|{Mm?5@GA*|rBSV3W_Eg%;F5M$
zz7eq_iumNud%t0enu=@Quavpnw+qti#6X*^h_}$-PCf_*v+}EN`@eZayi~JI8WOT{
zMSuaQv8O;m^#=UHz!C)MoR?!@GXVia0E;V343<6+Ok1kk@-U<6hFl@hPpVsJ`GxKj
zS3zq1?;<|Yi2L)_x21GJI<~mvP{H1S*}9qi%9g4OK^S2A=S_C2t$5s?|GcoP2)~V#
zg_mW}oKhg2ug>EaHaJ<}Io<qSw;OeVY0l+EOvc?hvXu%HZ?)EnLBmlS?k#D5a*&hJ
z;9M(6bFz=N6+r`s>k25*K?SPzZzj(wt2^Rd=;zvT)Ey0~C~moLJMAVFL3*cCXOg!K
zbWHB!DmkO$d~gF=C<<j~X*=f>BI#lK*Wv`$G{6b53J5}s0HH(Q3A79EvL)BIRjA|B
z!8W2v@TBvd2E|b8v=ivt=osA}hh{v$8cHe57k(%6Z9=UHt|rmv;cgO_Q*_xIg}5NN
z70@g-%O0yfZcgWJ=-t3dSHjnQg_Vxs>2)Sd5=s^#MPM|mgU#c_H>lN>Jl^d-CkL;~
zM1Om6CXpZ#7-GVTY?kLaL2#Y^lQl0nCh}uUz2gI@#Bnu@mh=D_1w}wDZ82>owzqLW
zoae3_M-p7zPPGtLQ=uvrU;Enf8od^9XiV4<z@>NbQ!ShPbHP&hMY+pJ{#mqb-rdVw
zXE?C*+{~Mgn;7uT)1fcB>y@UN5ap*AcO2GzPeOoA_;;;_=2c~L{ZHjNm;Wxkwtl~c
zE8;)np_2yK*=-}H_da?>1rfD*2yzok@SJ5W+3=Pn_+rVYaerK#t<D&86Zajz#YM?s
zXgA~pN};R`isFlhQ6xy3-h5td#C*5vN4yzuhRm5OOxPb!+h>`IxzxPTAy3EW&1^f&
zda1Jd(nD;8VehKK%IJ+4n!fuQ*MIs_vp><6d4H7KkC87>TEx#vbUd;f658jiM9*8p
z)XrMOyF~y_<Js`l4==V0(CI>p%6`unu;~-V@9dB*L?UWEBGp$Yvp4jPH*tOE_NcIf
z7ouG_Nk8kNxUb>B8M5mit%<U=$Ye^s?z#Tu!v-p9LZ@bc?*nPmtn;h$L$eJ5AbKJ%
zM+!2Z0O#Cs7JxROVyPeyA5BVxPiglvm1c-9Ag~KYy2QS#4~3IHt*aS<Nv5R8dPW^R
zKSt?NWk4=bume(tkky=^ndVMLw6$Ac>XcK7U-8=9rA=&X{p3^v2f=7R(*LV(-mm;-
z-$L#l1|>;mUFWqw@UGGvyngw|b1IkzMgB}`y85GbedaL`iYri>$q<(xA4pLv?n3t;
z{?YqOVz=|GESbXGxyAm)@8R-x8d8FBw~DX<!r5|3idQ20M&hJ4=LAei+K*D0Sg;b~
zS4#UeZz{n_HBbO4qRyU)e))^8Uam&3EsNtP{)u_@GjhA=2`1oU*ap(6DUb99N$K!~
zLrTU@3}n_#uwPo;htlV6ME~bc2r1<!WXUNvsn`_-<m7a75vR_}Y2o(ED`9GbHb8#+
z1AnR5P2@R>!@Uiu(d(%5NO=SrWpl7P+eTHj<#F>LxAv#I1#7}4D_oV5(too5eVh5f
z&4JXUhyY{Fb$k<;TV;#Gn;ta4N>`O618WV~=|2S~H4SXqS*`NWuS@4Jf{Cy9ECcoj
z#-#1#!uO?G93M0+oYw55x;3i{14&A)))1uNEaYj1y43qlMqzTO?`=WaoJQF%y63+9
zjT*^&;;E|SKo`kqul!2!^sorCo0##9Y~u&IyN$J%xVM>~QI>Z8`JqgibdKD%g$9+p
z;QYpXyY_M^*^d&Uans$gSMk>XPoB^7DdukV^#MEfabFdIzeVih2%oS?!V<hYQ%{xo
zE(r(D5dY(@w0=2k64#!xpMCcS`R*h?AnFf7rx+Tssqy6-1(EN#c4tUSt1(57-R3{u
z+wF9hTjM9xkW$rtU3V1~g+JdgiCtbLpTwI9zP!t{o>lh6U)%UPT-M&_|97;VZ0&9+
z{p(!dYam~o2}P$}n;KF6W5qOcV=6+{*4ug`>^u@%&pFFtI)ce!-)!ghqY*?WCd2*5
zXx)GUcugW?Y(rH-TGNJH1k(xG?>#qCNU_eFKh6s{G~)3RA$fl`%zV&_(s}y*z|MWa
z{(EeDc;);I;~@`xwxF<}+LD2)>!s;CWWS~NT)Co<3@)R&K5Kq7tQWWid0a5e(Wnzr
zP*577f{djJ(%UX%*c;<nN9Qg!whIo)qPv?cPI;roN}|tix?Cpvc;3Tl6<ko5x@`P4
z^f4}ES>gh><*(&nF)Ru-l!8UtTmYhlg1%u=5MBW3ft`9`s`Sd4u-j*&+tUB1Q|@Fr
zdhrr?Z{2=9a9VHim&)sLGU9x|vlFU2j>x-{5%lv};H!eUnp=h-H!QM5mtx%7%53WK
zbQ5>>z&ft@tr73qbTe7ky$D?L>|OiyV?^EVR2znI8xp$2Ghq9@5B{4sL2ndgr8V9e
z1=8TJxs#E0J#g4D7Ax`GJ0ZAIzi-#~qDicDOzsX+=SR(jMj!s<$oEjr@JK1sqGJ-*
zPGx*QUJe$Tz46V!YwJ+03-?UAFU&qIXsJRXYxPf@TavIRy|_6RB>pf{#?0X1O7K&s
z&Yrw<?E7T|vE4N1x4|rTlDO0F?P6C`ysea!Hszn|JZ~J70<ZY0d><Wq2@oHj%FO1i
zM3!!l5PbYv%^D*NQ-;^jU>J9jyBd3;eeUlH$%=HTm0xc?$7sX&nD@zkcEpG>O$BM>
zd#oEZeSt&v1MS7_34dO`#Pjo8unm5TAV}58dDM9VcKY4q)@kc>5gMbLxg3aJ`gGHB
zcaz@bkmpX&%^lrj*|d;fGKuim*sX_wPhEHWYp+~HEzaGjV6eG|$b}3ZBZm!*nb0ut
zPtpcsZ^GAyncDSH`M?AN%H+HQ^KzBg?w>7e8;{11RAQcMJZgl*!Rnb6UN2;~|MI$?
zushS|M(-PIS*Nk|J8|0lX0yBw7xG^KYcGG(&rW*qH+8}Uqb3(`SNq00Zv-iC*}Q6O
zE^|k{_dh<J)xJ_jVES?`%e$Ji`<;%T@3nMAA)bq1LKOqO*h96m+57xSicT4K;4`W8
zMxNv&M_Q-ETlcUAA@CLp?g|&#A5!{c`uikSO#Nn*IEo6Ju~E2U=O#QBw3%wN^(aY5
z7XzQR$l1Kvzw^?FfEGTjGiX4=vUZP3s`ti5*-!wwt0<LhT@#>>2F%NSyj|R0FWxDH
zVZQgY=+W31nA>ut-rv>=V9Qmbhb?MB&JR{Bychthx1p%GHUIvHU@3)9A|kS#ZER$$
zu?=bI9>&iY7@$w3_rZxKQr)C+brGn+3uQWwsXm%!$Ep-M<hZG*Z&00c{JGx6X=Pxs
zw^48VlP4bXu^}Jd>+bRJz%on7In5l^3KBm<CJ6fR^8$v*?@=hHNWwxX0=<Z$vO^$4
z*7et+_`LhU#@V`9Jm(9y+WV(68s{INX7^!HI!{AhQ}&YCXjNijIEC-hOmFD&`>S^I
z>c<F)LSV?~1f3S_MvwP_CeK^!<q7f9boNfxMBfM+>;%6EIr8U0|JFeqOpYH?jh~U!
zF*pZ7q*+ikb<ts5@e}mh3HnozoI%g*6?%owow(?<jIqFLt{7B^^h8u5BT6utjjBhJ
zg2XmUXhZ>%5=}ak)kE(S@UJ-8IqhbsP!R(|UY(i)eC!9)Kg(He&x_SviA&C@P87=s
z{Njf_wXM@7YpZI%b^SH|rn6`4T`Et{$&JubTQ=WaEktM)S=#G0wJ^${V={^u6e&^J
z5@g@@<6S~w=s7xuUG|zk)xEC=5y2<hyNd~3PSud`4Xtdw>X`8Z@Fxx|OwA8V&6`B_
zP0E;27(Tl+%a_|c8&rsqtmd##d~#18(YO>=y)UBAlCOcU_$Mzvx?tUwF<(3B`$q-~
z+-HNu=esQ4hFB^0Gb6zajUUvNo>rWdygW5gD~UNFcav)YxI9k>=|C)eIomBlvGZiQ
zOTSm_&zM-F_X}2Q;f>5C#H%4>T)ir@W5x_h%dZKqLAHoU&;X`nZWq1Zb0K6Z_qRc1
zp_ya~6Zbao`B3<m9Sip*6*2JTq$aSt)wk37L4NBmM%h`%cju)LG>OlndF6PKl24bf
zQDrADo>N`mV(<vv?~C}0{hfxf)rOe4doI%0K#Ip*|B%qjU51d;4=LmHUV~t22B|O}
z<LJb`W!4f|ZvF6Q6qs&;M6~y29{3`wX>arWvT<)a1cJfV<rqQVSTNw#t-``g@3ksc
z#aga`O1C3%UpniAbICXC@>^G8K#B?i<Y_zbrBP=1<4s~^Ay)9+<$Q?(88y(HKNc>v
zA;j}qAr;(&N`fLI)vZT`JermNHf)><;HDg>G%y-0BSZ07V`5U6<Y%dY5sthiMJ1CA
z-}PjK&SqXPH7UFjxAFshLb%3>k-LF9u3ql=CmjN(?DMy)*2lcL1rurc&f(31)|L#`
zyDFSs8wv9ti<fiKoan&~6jn#8QMgqMwce*R)68te$>BAraxE6GZ%6!&z8+;rAhQ*l
zkG3OGHW*RR#wT<7`RdwF)xk#Tl=_{!zLMqL4<^J?83s;&`il|6_VWBYQon2L>Zi8v
zSGq1sT)q_3(?Y(E-oxpSeJ0zzbLY$WfsyP=Em>?Z8}bmc;p_HAn?Wk#^HuW%v+Jeg
zxPBQ|a=^)2!ex7c6D7uT-$3*_fkV!dP{?Wk`pgC)YxRGxWQ0Cigy6jALDjndhAb>D
zDJtQMDS06(5~rWrGHnXg4!O4)7`KEIQoAc8O_dZ}Cg?q~)sRQnuHCKjF(~J8ojaoD
zHQ!-ipzg5--S8UYp5@KlPY#L+LbQT!j;J*n;QFnuWZdkzN~#Cpxa7CFr|ZTqOM!h`
z5dp)u?gMV&(^aw9##9NX{@25;r!|3cy}vYVwm*p441mykOZsUUFxsJearX5Wx$Ji>
zwE;7BvkOhQxy$lKQJRSAWWwu-^Z8%o+hTs9Xw$D=57v@>x33R8_5X4QTNRk*mG&S@
zum7Tm>)dzH;q!sKPSgRfwQE5;`9MjcaJ*G}f3pzpmrG-Bir*4>aS$haGfrjR@7_$@
z+q(?k{+yk??~3w$-Knj&UDObGYJ$R>Q}6Holcwdius%2BhKUEhSbGI~GqKwsKX}*r
zgThxRKj|8U&$b&(DY`OlSZ&;;6Tqx}Eh@6gwAPc!^7?(l#%Ge*2<=GM3EtjMl(`Z%
zIehr1RReo?zuH?<F$HP2fB);h%PI=N8I<m)iT(?zTuO9|;s;-r>^uJ>D+$NgC<dGX
zUtn$VoJ+b6NhHJC8CRkq-x+?x-y$ou5by>$5J!-;#|8)Bbb0X+8EO;^ZnAad#>Zs^
zZcUM=cdPf}=Rs=_(>;hJQ;Ap`wWd&RWf&yKU_|!SycHI1B_Z-n#QLT5Ut0ei+usii
zhRg*aO`Q~NOzNE8zznA4A~yFfK6)K?Ki0YZ`%wxf0bTn$WJ=JaPO1rKCk2C$x;qmj
zrDx-FBlUliVjKHVOwk6Qp!(iqHM@_3=5w;5uL_iP?iW#HIgO%Uh-R~Ft9%paWYk=E
zoBeo^sdVQL@uj^F?()cu{h5(2^StqXW6(Bj$SYe*s6H#2r-)+D&>Dv=mfKX7nFc&O
z-mbUNy$-nHrPO~&Pl}J+9zO3*R{aU@BsQc>Em8@7Diy?+#@{%yP@-l`=j@4|V>MfC
z7&jeq4vc8y>5SYepx>NSFz3=bah$Q4d8?j#B6Qj5dUGWG?*X?Q15;YS{y0mfIA&jY
z``Iz;0xzChFQmrLuollc`ODo?n(1|kqE%;D<(^HBRa{$8VyZ%qCLNhF@6R0x$Ynxk
z(~3%GgcEN1GzPw4=0rwCamCL5>F(q3N+$_bSv!;lk)5)$5XM)UmnMXSqCUTgOG%!i
zHSystvo11Q3$SpQkA%+)Z_+wP#`OP9H-?*gu0T@}FrT{JPYS-tl)PvP)i?oK=;O=&
zq1BEOE{lVL3drPawAK&RS@NaacFkC&=YABCv538NoD!9%kvsPylz{)u8TYIN-glkB
zcmku$lL&>A$Ro%CUeq^l@?RI<*^CT=o>i^HA8`Vn$6p;DDrIYR<2-4-QPv*wjr%Uc
zqMt(1M-0f^G0&~+jvX7U7(?v6DJ$dUGLkqPpFE}uHI>P-)GpULugWqW=FP2kdeJ2G
zmF3*|jYdD~qOrc@+6G>%b%p}-$|812-Q0QeJzXEaNtq6_wqO2UGvf&^VdWs2(b$Q1
zyh|M4eD0@(2j3%bL}!Cyv7ep}@?$s0BMF4U0bzeAX+l2_A-COInQ^j7O9!n3xtg-*
zGPIert9t*X8_B{BQf-Du8bx@A6dJ%ArDA=RkooXmy-z}>Z#xh5Ih-lsQl>b7ljZFg
z6fEvwa6d1i1@FDRKwgm_EQm$5K0%2b`|XbWgjZp~yxu#dFK@ple__}x-C9kVezC>M
zXZ##Gck$vuhGi1nW}NgvWfcEeV=`F0>bWaHvo@iB=slasaf+hOA0%f=T=>QNRVlnU
z2nF`A&1?<cNM?)$Wl0C!7~HqZ7sGkw^$pQ%)ko~ORH+Rl?171U?0WkL^nsN@N^<)S
z@i1oeHETs1V92U3oxL)#3@7(l_KzL!P3`LL*a%v9>EP+Qjtda`=D+_#*;_@m*+uQ5
zxCAW(_d<(P+#MRASSapV+}$NuOVLu?LUAj!6n7|2aSg7)-Sy=A&%W5>oUt$V-J7e7
zHP_TN=X{>ay)kaOiobW$o<Jh`*QD>dnprhfLZZ;CTOkRy5rV2YF;5<Fi=LJfi<v^9
zq_!YTHo0yv6-8v!yl-}FOxJr_(`Fwjo!Ah(vDF{~hh5FYIxi|ULUI1BDiMjE*b7~{
zh~zI{iivj~(@c0HpWoos6@`H_)m{mrp;sZenO0WY_383$g^<78cqiS^p6{WI1U#cV
zTE%_DsQdz-Uj02U=z)P?Ta>J{<TUO%<##B&Nbg%EgKB#qf8QlAn#pgGK3cIS{ix7H
zM42y}9Us?+j4}ZeGF9kWG3KvC!|RrnTFnplvkN8M9^mZEI8|h-){6wo8uhlL7OR8U
z*V)|uiK620ROnI_EM{hfpVtto_+7qQx+)2Y!EAR+%P{|V{4n&Hu`l2f!Aq;qdbd`c
zu`+1QG}QKTOW=Fnvf6u`ASusiE}QcP&gb%YPWMbp++=#3yUZdHh?Pv+NO$wJylOG(
zF*Z3Ky(v5<bg@@*cG2-5HdP75E?)`UWe7YNHth?4xv&0g(1KC&Em?(lx;4$TyBnLB
zP$_+!jxd=y|E(ZK+@2k{fBr&5A1y7#ckB4Xd`ZH`a>1ecb?n}3<(KWQXje5=@`!NE
zjO&t@r&TxG6(ggeA$fv4&FEZ*Pemf?qUNr@K;?uiR|*AO7mF&(tr<6>k$1NE_IIr_
zTKRsA(<1yycg?;hh$MD9<D(6T+1w2paq{lns!FSsYMt>HjGbhs6ZPJ6-TneL{=d=@
zJ9<2;Sx}=CK+xAdaD{0y84y&)L0<mDyc-QC)kemS@_);mOv%A!@jf^}7&br~12`m$
zUyy|!5se-d9od{Ez~M&%{%*6yTEC5sj*1P$!##hJHV0b8h9u4G*uf;)%)_L+dQoZ<
z#y|yhDkl!JTr?_{9v{Uah(^xcSX>W&w=9iAJMUXe{hBeq9sO3n)u;5c`Axmk4P`yi
zVDZ$rkd!C~BFRtx0=q+&zS?y72<?<Uc^~=nGnY`xwQcpLxmm3QX8#+ADtHFM>_$Y-
zaa5CgXYHnH;5`XoHx_cc%8cr)OVXA0m$};><JG^Jy39Y`@?x}U*9oV6i}Ju8#2~^S
zz5B~=$>g&18CJ?dS%)=+`};H{?W{W?IAZl_N@_jw<OPY2kLCo&<TwDyBhMd$AuljS
zQ=!0(jhAvEtDfHL36vcZ-}9!pf|Uom9~+4x0>kgamOl7?RxQ_26va9HT=3lINbndg
z;L`f#^Lu62s8bDMf3#s!e{==-J6YwAY?PZsgzaXpa@Vg++iu7($h(_Pt||C_eY)r8
z$T_9#v$NmscxLA)4ikIj^?i(y3Y8ypj|wW^_8AWq`?~$=TM2aFQg@dj!W#}}aDfXR
zX7j{>+$76icaP_e1!0#T^IrXcpDp;6N|49;n($f8Is%;+o$opReEL)%%8x73+A$T;
za7@hX8dK*p0~N5?)TFfe$41d^L1AzEC=m8>cD71S#QZhH_aw82!Qq1RFjs`wVKqI1
ziSi$xn_HkY!#tk{sbtWxpJSdVUeN;qG@{S*AmGHj%VUhk`R)E|#)<52kVY?uUyhSh
z^N3oZ#rt*O6&puzI8^9NzzWfKN^Z5jy!Y}=p}%_SxT9)yMO5AQ;RI_7bT3#gkJmDM
z;+p>`kNE9BRc=Rf7(@I*0+H#YuD&bj8jOSZ`}+A--!MwBU=5oDrQCUlTj*9wTgpQ0
zAbVUjQ3bh5ANUIt@kj2`Pv|FAdMZ8bN5kdvM)^YKWN7H#k!}58d&H7$JlP;K{rgeY
zQZP?Bz&SU=>!YfKMAIDt6Nwi(t`1FUU=6Ejxy$h(tT#i3)z;ny^TW#io{JA<L9IVL
zEKUotgww2LwR4_#Lxv)*nIPTyPdf=;?jR6UQWgXPHBjqs3|BUyzg{2PcOHp}-W>)A
z6~h9?`k0}C$6d$-pbUl|lfI8Z_|rfEQXgl3$}Y4o?{1uM&H7VrSS0<j<CEP9vd5Jj
z-$EcZpLuZvufHF;>k%ID-MvYF95!87rR*<?`1~X2!HrE2e~^QlAV`=>o8Kg;cVESq
zx^4f_>rmJsw+rjZv)wL}8!S^$n*f3rDA4v?u0G<QDW`3Iw2wNI{!{#k-eL2te9d)k
zCoE_%H>i)rhcCo7wY|8I33#}G5LuuF?&7S^Y7hSGt`3paPFw(Gg$ZrK-|Y%l23GW-
zi0{`Uj-J-=N&2)O%pFL03XK1rikxs|Dd#c_XC@No41c3NNacp7Z?lg$2D-IgcO^)I
z-cGqcb~60sGKmW3lahUNGS&s#&L|~!%sJ;WVdnqm|A;NmVHC0Db%1B~x6<f~@a(q+
z)d0G8PrI1>-Dv2usSme55y2ZJE2`{z%Zhku2r+?xiT5@9u0k`1CLtyNjRZ;A!K@jM
z!|kiDq-$C#K%+Nr`m)w0OfxxHKw|mjd$vGIEIYE>qf$+)5EEL_+TXY0niFqsOIi9q
z&Hf&H!@QwoLA~#rYfmXpp^7(mXfA4?A6{*)+AJwfP3C7LX1?j@$gwXgJE0Q3l#?7T
znEI;(+o3Mdr$qm&b5WOgUi#-K#`RLkKyqfgK(Taq%lU;{7`)=^mp&d7xT67ErXS5y
z*iYCl3%^bA=0_9!kGCTwl4s<(k1IFaUtGC8mXgySvoO!LmS5td+n+cObEL*RRay(B
z?y@txGoKlNM+<SHxfid^3)A}4q-VO1?hzU2+SS-AB2nAQhbxY|%KKZIos;?aI2Tpk
zgNul$-%k%U=95{zM>bM@=W~6GfrGCLI5k&$AySeF=wnjRBI@E{4Z&wPmA-qQzMm{&
zmgKf%1_Gu_BF6qSlEeL$M^t6z-y=yjyXH5AFi){JwB!C7`qGuz+AimJ)yi8J*l}`M
zKY$4oz2zv!R#FY5LkzG|zXBS4#~c+ySimg-E-o%5$`dmElLl1F`Z&;fe5yo!bHwiH
z7j!I@e%;ZMm~Ch{DK|Bq_oKB!Kr}iw*8yc7I-q^;SJx*;3iC5mbgChyFj;Io8A_ZM
zN(kiTfl{r20I;<BPrY{rN8OYPc2J>_L;m&mxEx0(A17IdJvM(i0zUk99p33w!II|C
z`-(K3u8UH@{myNNB(p{%#VE7q%UR7fXSxxG7ABS$>fHy++`Y&7<gCd0KTMw1#oZd6
z2%qXg@O^UJYC{}nnb_RC6sj>=Afswr2jKZiy1v`$_c>jROrz3o`?sJEg9v(>o-OTa
zEg7?|qv#Z$9^u64_I8hcsdYSnbX<w!JO0G&Uua&WlL83C{#MNLAEiC#DCm7pSEgZz
z+E0xX`-;VeO;33=QS9@!z>au}f7%-HVHQ{7V+!omeu8f?O7x}k5Y<TUiUdpH#Jl_?
z7jb`Jka!+Nv3*oI(WxE<SSEyr2b)<|&MoF4JAZwuIc!ekz2%hRrf+JUO;PPSRvatd
zc2l~ZNBa*>Lydo)btOfwMn8;?@+#cWHTd#O`qA~<fhqmkLAfPg_Ux@WpQk5WWrvA?
zjtdd9(^eH_rHbRJHY?%DAmb<H>_7#z$P0<9?VWU`7AsFRVy+F+chb`k^`wSRe0iEo
z)Pa(;l$=*#XSTE$UK>^>9uB;8kSN13Blv5e$X)g{b1$o~mQ%eEZ4qy6l})Kb=6Y@G
zPo=N-Ggwi|l^46Myn&>FL%V(tu=G*?H?F>$oF_U-A`PQ^I;MaXIkJoFx3})87r|JH
z@sk$9@w()RSkG4YE6ntj0YND7T>77<;|^YpK0Mx*Nv$PF-7|QPW!g!DG!uqT4=C_<
zmzoKhu9{|RJ%@9C4o2`>eP0wLba>!JW^`CKpuRQ3P&?B%Srbz-`9+;4{!G5od;`~0
z4*j|&P=ICeU^Ciz?XwC(OqqPvZ$vW0BF<XzrSX%Ynvj`y+o!l_+HDfx%LBSB4xN}Y
ztd6~&j>4jCJ4szlS55&4sKZ>LCn;kVV9C|J(hn(QbjI4G>D<FD>l-c3U)80r!sLp}
zMo=PYDT9YK$JMine`xmR-(?YS!9-;u6hhYo6USZ94e1%0U6&Z3W@L}}(LI$#*Vo?D
z)6?{kk$v<m*&-Jilag_9akloaS!xKCH=|9<%Vgh~MosPU^J4T_`f(nvhD{<`EJE$K
zl4HtgSb#^YE3Qk)r_}}5$pC6?@VM@}dA!d}=hSLcyrw{@(icAHILLCJmliG95fbr8
z%}B7Fnj|n(*NW!{L8AgP1=l<ZORz};L#WWCj7d&ZOOoo_ez!950(91Qtn-UyT|(<b
zOYED=tL#2l+J|DOx)0T$Cw7yZ3?=&pyCB;ucVJGLy<8`sJh#Ka%~8N_CU_{5X2|-k
z@7vLflWrQ0^)VEFJB02$+l_dgw7Mu*W8CXMOnTJd1Qy9XX~!O}n&{hE=YpTP$JT~m
zEA^i!fRxLvjt9>%Gsr(X#o?*x1*NcBoF;x>1H(C+%pkmk4y(ezsm(me7yf{o8wu|L
z*vfT^>HOMVt4T%hasp_<wS`#>)mVRzJh6d^hc;j}gp7~2m5v8zCqH*}t|^^`dh_Z1
zNLKhbfz1zB4?=^fZ>k-5Q`ov=LsHAg$NecM{}=;{5jfaU0X_wR{oY1uYVuU(RjwCr
zsWSyh6r^(FF16Xg9<EXb(>%Nkq*Y31yZ;7d31sfHY`J5wZM>rK(=BsEnb%7dR+4(6
z6I+5g&#{D5Bf5f#6%^N>GH>=?+Ll3KV_h#<9pxNm?cSf@P|nmb>kcUv;c?88Gjc4H
zSUXKRw1(|RZOw2b86ql{!+2zLlIy3Zr`^LtepS5tgV46NHd`krfv9{iji%yFZ=rFB
z9Fby)S`Kf&UCZy^L==JGdqZTvoX8>!7F!}aM<_n<*~`mI-vonBu||T*ayX9Dhlzze
z0YwT`H{p!MGn<Kpss9JZ7CnsjqpB+PH~O$h2&cLv4i;m@TC{zw$j5dcRi3zk88@GA
z?m>T1M)5VnHfr;t``kabJ{b1nrhJ)tg8kln40(ut=)a4i`V=5A$+PnGSnV+*5wLBV
zo>@c9xEvnzuKA>5bTcG&^@2LH*xZUfI!X;GHDx_AIxu-P`*B%S&P#*~BS-0rD`snn
znDU1L#%O6J?ivv0pk-2=$+LF~$<!$vYQ5?#KlViKh89^l!wzn=LyZw~;V*}^;E-7q
ztP$Ft`r0^?uJbtzc%clACZk{?>$~`~HGllJ2K+pc-at&6*)8k##mrrVAs(FQ3<b@R
zk9(y{>WYMgu09ks+IsFKIM}i9%sC%3dj)KA_4Y#()|(Z`s^_Y&pU1AA=KUt5mJ}dm
z91vL*A_O@@<`yzF3ILT60x_UcdCWlq)Xzyj5n7FWn*JIS12!>{#KLlOb5m4Q<c{iF
zO+@<^D*cZHM#?fEyyr_nl_S@g-vKI>;w?Oiio!r8Y==S-oG^_|+c?MoJb_YG021JS
z4FfMpn&AK@vyPt{UB^n`FlHbZg06nPst}n}|AYgT2Drv$rRMx}NO?I!-dYdlovgpa
z{VBSFU>-+8p$?g%L_?>nP@!a+wdIr^6yO#3)HJ1Scqw&_|2@ln=t7>6L!BgMM*Lg2
z<TEMvuGl`KqLBsXv!gt@8U`J|y(kf+UY^pW5ARf%EMX7sO^0`iGzJgJk)CYvJfpZS
zDk4`;Zx!ephWb>({$#%0iUhCH3Up1Jw)k>}g-%u+3>9o{c?DcyCIjlK$#l@-?^XB6
zl~m)J75u_IW09MX_L@1HQ^hlF!ek$~q2nj$=u_v<?~&0dUd<e%1ME#c$HvNk6Xlyo
ztZ0&sGU^2D=tRL_For0m#KWC09`I2LtZ@-E2GQuu*PfEb>}+g9p<jM-jzOF}9l<qO
zjE>>_vuJKX!#UW1``7#lvUK8YXp#4n7YbfO`k(7+t$%n2zY<|3O61|eh>S{!{Jc0|
zxH!7rpUJuHHzy*8H&4St!D5I(?ijvjNVxaxQHA0sPqBL{5)9<`U2*vSB7yM{>Ve<q
zcY@d#dQ70xL7t=oub`N~$vEcixEBGM*-MYGu@_1o=+?20lS$MZ!#jvLDrH@lOK-#=
z6wo+hQvfb-=Z)1MCDiK^UL`lBFrhgaP!SsIei23Ph41Y&3%#LGLkXu>fo?0R^ATF-
z7MRH(S@$TWdIc>qno$K|_QaLQkc0*b6#2E`H`7f8!iiHIw1Kg6gHoyunnUW(=DMty
zKVuy|34!)EG<_lv$RZAa>m7@5{)aO#7!2<fYu;Obyu0X2hGureHpa%pw#Gg!)Y_<q
zpoTE=W;=q%d0?qNUDw<Li>{BiZdTUTnGR*E;oUQrW&s3`UDD&wU|dV6>;K3%mmNC3
z96w4tQ>y&A>z5p+3S6M!3@~td5kB>o?Hf<|N@giQy7pf;ukwb1!}lO`j$<=)H1xp+
z!shpV_XgV`$4Ofuj|gl!zwL<&Fy|`!({+e*&(KRNvXyivJmW#qlA^!Mf&JP4=aY!-
zX~wV~F_3ye=U=;NNEqLkJwA6XhU`tK(cQgjkLcP}U)f+MxiN+9%yC`9U2f|*a4l1=
z(B=cVt2H5*MXWk=)jwnf&gSZRwqy_6v-Hp2e>yp`Tzfr^dur%yCxt3Tfq{kr9Oc*l
zD4uZRoOOv!`cojM;Y0A9Pbrqjp8oFVw=9Peu{->dn>c9bHr2@J<`7W<Sg4uu`^``S
z7NePrGd1!n=;&8oCSH1bd_tB1mePgJ<L@k%46dg_Okq|+5{kSW_nc<q&CSg)U-s$3
ze1^2<sGn7mMD-fAafx^s5VRsUT;NZaJK0cK8W{#I3=&LyC|?GYek_zp+U%Ko$jn^6
zN!#O_)`Lb@ZkH@;_`|2u%`I4g>^=^CSVG5RTs4oLzWyBjiAWSsM<^d@??L5`PAc~C
z#N{-@YS*}!;6uk#-h%6S2Z(;p0CitGFVljC(Iv&DYJ6obK<as}af%;HfWO>%X2{P4
z-*0ovPxD<Mr3Ho4%<&9e0Ur-?TiM`Sm3~$gkl`6hl#K6H?&6DonAP>%Rg+*%CwIs#
zFT4Z|7ljNJXuqOS8xa<Y>p=ihe@MTiI9X4*NN?S6g7DjoopvjQ@-LGv+%1o?n;1W-
z68@d!ouEjGXqJd}lS~;aE~21SAowc9Z1m@riwcOLAfY!pD-AURfqbJif}NqzZj&6q
zOwzBSBJ}=v8a^l?F|lQAOeO#gi}(Cn2Lpu~1cxGHXUE#8)px@2V2M|7aBvW0{|(%j
zDe0IH<`f!;*vyMWc-rUfQOrnu9H0d@-~k(;gchk%9ZjD@XJp@8#Q%=PN-vQc2;_~8
z4Qra}^(65B5Xi4bcy}y>20*dfZE~(?Mc*74qQ2({<VOSkeBUFk9AYOG2Kkzj%sw__
zLuXn;&XD5+`F?_U^>n86yE;nL5CBV;MICQQ2&?i*H}f>3?t7L7@p1@*UoiOg-}LW0
zK!cXAg|@RWqmz=a^Ti}rjE0ln6r@|X2|bm0{mfw<3|z76J1B9Pk&!+q;b_z_nEL0U
zG&jeiE6uRD&)4mdb(wi#on_4^^Eb2=2xy7&Tp`L34|(%4zsLP4anMkw6%W9S5(?R|
z2C`t`wsS-287-(Rx*+z?_V}M|Kw#!Rj+H;vHeLUPsbz$b(|cx1+%xd-OoV=xnEqJ6
zv87t`z;r7M!NYh~ePuaZ$LYhx!rd?Su)cRFO*Z8Y0s9BO$jk=nrCSja6>0^$4n{<L
z=T}x~U{;Nk&tzqi*xO5;<VdUu?QY5Y^0F}u6lY|WGfB(ukB=H@s(z1ni7&)$V~5Ze
zU1^^vxwQilQ?pVG9bC+R1~R&mLuEW_Ie6zrF1ur{A5gX!iZnsX`yok|Gxbxpftuf1
zzx`6Hv)`rsFnHTuD1XWHh7k87W}7Gq8ij|z5k&#nn!&UC*;3FK?BWctt6BWio$WYH
z?18%4h96%XnKT@My3IiW^SpQ(YO$PzU)c`SGIahD$41GS?h2q-6LJwn9uCjH0n)2B
zsCozA>;#F8nLMd-$8jVyKT0E`q5H~oaV9_rkQ93$kkE|_4D^7c{Mi~s3Lu5Am#|iq
z=@Zs8b^hCMhYY!{)N5_#_X1L-#D${_?;@pT;5ykL!+8(ETU1E3k2x-(vtyHoOjy4#
z4F*s&Bh^2wTM{CRBEyh_Zc3Tb4SD;ek8J@5VA7<m$wTLKPm&;K4<lI~jBK48MVZv4
ztxjay%n)s?4ki$h4E2l^xz-sVN3e`d@_cKB+DJuLoOG#|&H0`@@6mw#+cChrlU2nW
z&SG{W)co1J{)mxtk3rYHo1E<Ez%5dK8@*ig1YFLz3PzEnDAA-S;f2T4ByCmWjtBA;
zWz=e4naB+Z(UkyNoX%<)e>DT*k6W*}`^%cb=Jw!xUTh}0xDr#Ie%PFf+<QvI^t)m=
zN*!m`MoDdX$?m>4LJyzx&hic(G-%ILLRPM#Ovw<8-p^*pVV%-Xq)uQ$;iXqlGb*B{
z=NU8xy+j)s6C?q=ftvolK1$RA4IExdURpui`DAt_Zz;6iGLJ%p;Zsd3eH=#!6eNWu
z&t=qT_LJF?*j6LcD#GzIxgp3Tu&dM5{(0h|RRc`8JJ`Z>S}W5PEHzg*4_(`hZYiKK
zju?oV7lw2*c=pvwD_Z{R3PqXw!ZGkoZ=P9`)ue1q2!rh(CjDb<cn3p^X5pVKgF}+N
z2DDj61~UYh!O6QA6modz?-R~tn}EiEs}S$7t&kD!=6i|~#2C<P7DY%Md!!g1`EZ$-
zD8b!8PU;AyxWiHe5`{4%ajxjCp<594nGv&JkJV>QmBwLm$0PNEY)6^o7lEjhT#61E
zn~xA=E{b3Ybxav6Y54Rm4sjY%+KmB(50!Q3VP7+!yV#U>PeTeIW}IQyM`bRKPboX-
z>S2^gR{1pL(Nfr&6^xE`*m}fsr?U5Z!w3yQ4J<!>BpG4t9B^2S*$|#6-IQ~RTSHW7
zj=vHgV{d_l1t@0@$lvH#^Dqd+`^_{4$wZlEqSqS_1h57ot*@{5wLm3t0BKgI=%|z=
z`4g`oXnp{Mzeg4j!Xo6~`q;@}HZDmCU{xe96X_Ck|IbZaw_M(gAhx5$#RU)Jn2t((
z-nu|C<Iw=;D0`IN9ur=if-Kw#O&P_(J9&JAtir)-+@c$Lr*BF*7a-_9Dk$P-O46@!
zYM4kaP0G0EqB9Pww|JHZ&yfol-0~1j*T=+DF}-_yag$AZsAk`cgFL583W;^>ALJif
zG6bpY{{mufd~^EcEQ9`?^tSe}j}1FT<2f77{Tj71UQ{b-yH;&cDsX8PQr!t23Gz$e
z`8_Jaq}rfV{AdnKWTj8k{c5MobcoeQwBh@rgu#R{$vaL<k+8pv>6%JHktW@>@D*8?
z4rA%b6;GIZ98NE8ga=@wz2Zaco=Dn&Pg9IFwW>7uScY~h%A}(tMMYt;TH~jnRamiA
z0Ffg?v}{^9DP%Gq^U#iL<RIeYmj3_+Ew>%Yre%9F<2C{4h}UMcux~4QD>kU>;~0@y
z=Pbg0@z>s$(?V<VfhZqt4&|5`x>&)AOkvD6oy2KYVX~0#ie}JnT8g;3;CVMo%Bhgx
zraR67ZogIs#(+iUkwb@QJmL^`0biO`2Ta8PsPAgsi=Pxh7mn6(p}aESMmAQdKpyN~
zv*CVc%Tazq+r99|69<T4dt=lV4qdx{9R_)^pdy_i{WSi`Z2#au^}(Bn4uXfHt*sr-
zNVWBTT(aIqMnES(5LAUu88dhI6@_qBN>l&?P|$IEO;__K0U|APp*t|;QN^g|m;lL)
zMFaRJv<CqXeQaG4T3O(H{Vmz2r5P2^Ol$>~BY8B(Dj%XXW40B@`V-zUpwqMXZV)wI
z$8@eKT@F2SzY%j(vAma(QNrd|!H%$};BYu<kucJO`sN(4-I*SMwk1~UiZ^RF>e@f;
zwbH&ZG$FPL<j8j8ab^Ck@<I7mCgYaV_=%N37t=<d9#c6!+GZu_hmrW$y#@jG_hjgr
z&K;bbeDcz@9|8&aH>JzVeZ3l3BY{JSjc`d5H8%E+W}KR5D3}yP6eRzeS-@bA@C_%$
znz%0~UVW((`hg5%&ZIS2$<sil`6)3CKFEF603ZLi>FL6^U#)_vQRLe^t}M^c(Fd;y
z<661noFT8jz>aq1m@odF&HHX0!NP~Xl<lgkgfnKM%l*luxm_QuAWZWmVcE6hr#pfh
z+s4|d<fXOtO_wjg99ECkyAj1DFY4j{d*aO#LNNDAygcsTUJH6bQs>A8RYCt$4B)qk
zVfX8;d_pZ+e3{y34A3HaYJ$YBhgZSsGG-bm7_X)ki0zB$@|1)_T*6!$+!h7izgS~Y
z1Pi<=4KKir7sv6A2KkYq5u#wXG<8LxwKT0a8_!q{3%t8-nf4&1p8tBJk=QlYGSM<+
z5TpS5*49zKO*1KWjgC$wf4K8GiPQpRYA#`=-MKM4XxB+3ftVtLW!?u#HR;#x=QnY~
zS)FwXHD>f(i<fJW5i(~5G*ju%2|Df@yMr%F1*|U)%cYNF0a@E>pQE$tRXfe(>0N&X
zdiKc^Q(KI<csU<hMc&UJFAI|r#o&+>oq9IB!uOw01@AJj*jj@UhCPCyr+z-xmze0Q
z9kpvXIQwfX1Q0WsTy#92KX85Uk>(nG&ubS5eV4N{7(P((+<H0huAI6qEo1KQLwQ7R
z`R*hXFJSI<+W}KB5Cu<wb0OJu;T(N9i8Ksi*%_AmOp6Nmc`caD$tk1Zip6$K)4ec`
zb;(rRd8zR^hLL+9xidkF4*H$^q(r_Nr8mw_<wYsQ6K5+VE-U5bPC*WlbN_Si2Vni+
zwAJW{Xw+-`@p?Tro=N^Mg?e=I!G(D~%ThB*e?nA2-A^J~1x!CEnenl+C!z*20dv=!
zzDGq5SR?};zBh-U{|ll&3Ckq2lD2Z4rZVa4{~2UI(nc@yMD^Iev{<M1U@&K4)R*dD
zdMW;C;3$LZ2wr&uWvDnuvKuJRWSIW$$w@@MPwp4b?>Re4bsf-_+v^Kl8d2sdp6G3z
zn2J>P5@7i%9+O?QsL^I41+yexR~m*GLJ4~av}!tAt$}n0CB81T^3X<}xIL*dA`ATh
znooD8o7O32b^~6{ptIB{qXWUg_w?kSzx?i$`S*HBCtdlBmDQ*}pOc^5tHt|=Yro($
zk+Ue}!MaXzcnN`VM5Nl!2XXsyZNAD@05=iKXR0XN1g%#G%Ww}&^hGlVCn`@<#-FRa
z()P0B--q|t-d4+4{16zEm6wk|Mn{gojagn=GpxNbeykR&j~)F1XJx5j{{34*zMa^<
zj6yaSIpFzgQlVP8f8Mp$;<cZX@mPRXE_3%Oqig=^azfZMZLngAMp`B$n?_8d-ig^x
z93}pi30J<alem|FJCl%*MlNZ~lI2xf;SqUMziZxnI{W&6F88A!%Z$B~-v&rsH1Flg
zS*w99=lbrk+NWiU6iA3K?#6>a_^4I2b=7ElwQdV*LM6!(TK7F=$mSf88S4e%HnvRk
zf2>a4hx$Y9vY({8g1*Ygy!WIx9^N3p(6x_&(Jl=iGBV~{qXp!mBZo-{n$n^NU=?mW
zMoZsA2I?qNsEi-;dTjU9OuvH~5Ncuf>z|m1-r~3Jhx-Q%<~d3w2x`?)5}UW==@EyY
zM2#y6i!Ze+A<+L_{hEazVoWmrha;S8`glGr6}4;k4R<4>0t$LZ&3`xg>k;qNcKF3#
zsQldrQ5X4Up#-EZOmYk?LgV}{+l4mbt1O`c>p3;Va;ZH0%Lidm!|{{-*VI@*YBY4j
zju~>oT=F|naBWWxK0vJm@Q@_a^)m-n1C_$7f)(F0+peHFIpm@>l{obfA@<JZjDy;~
zzIc#xF7JJvWC8E`j3ePpHXgYfMlH8WN&1vHgu3Aif7<<YtC0BAe&l0~z+N$N@~ts9
zFWd&O_^zEcuI(~{>l+F>_Bgn9NZ00{dj?FYA}kMtHaEHmg|{`p7ji1uMS6zkOt%BR
zz&?KeZ)trueyf#^)nm2}f2RCwhUJ=E@)4I-aQ~xlN;kLBAvwzrF&UIAywg^QCcI%e
zP8mq(We5S+xzUt2ICW(dD2(fC#Dt~Rx?UTB@}^KCol&t-i+^kpu?!sFheD3bT){n|
zkYGH<qdl8nfg!Mf@{VxMr*?a~=Mwj&B5%U9*ie99dbddjC-*4?qWk+Oyq|!QAdN?s
zm*2qW#<SqcogD^S9G_b3ftA}=rkeBg`;XaeJvogYrL|9Jg)$4Xop+4pyiHb<Ttsd!
zK$Z*<Ti$8glb~u+ZLNPgd6)QSHI%;dVU*+6)zmL~<;D(rO1V;z0y;ni(|TSJbWZg?
zx|g9o2{2E5|0bh{1yUNv*K%Hn>}!j5U6;n<(xi!&od^=f4eBy?1&{XRhr5G=7|c^;
z<@!CRL}epQ3j%Mpy+0@1wn%Y6EQ}NfcG-l1PhAQek&k)#6}d;8iT~NbGn~fh&h!LS
z<Z<=Uc%+0zfx|0GfB(FE(WZru1NX>0zmb{}qRh}G>~o8>e{(F~n;OT0Yw*>wrD5Yz
zqmOK>)9>f2<DdAA)Dp!~q!l*6qqoX3ss5>|e;!zC%=oQWV67JY5<2O|^sD?VzG0g&
zOKfY)pkit7vQV2w<&T`>80hI&bpsgacA)~AU65*^b^l`D*2OqUfw2F1M_&%xi)TXA
zV>OQfCDV4WGa;!F{9QpsIjs$!y9Nd2mmfy~8h`A>K7`l*aNpFKMtABNR9zfz^b;F(
zg2n7WIfdUjEkQhFvL^ocv2T)hAoe1i!K&dfkQ1D5c|E1B%Eo1|r7hBJayCczPwzJu
zqfOGIVF$-$UjK~;$zgsy*m_Evgwgy}A10t><yP8!j*5=OvG9L=9QtpfMjE>WLTi#X
z5Fa$vfq|KR7k}$%N|)Q0OPwF^?Zx(+oagJ8D`+17J$Z9G!||sNVPTt#4L@uzKvu+r
zzw0X%CXkQwT!CpH+{b<H(HQb+oTK0BQkwbo56!MgrH1sy1dy3pa&ezN*@Z)N<z%`#
z!>R-0+wWU<utLDDgc$cUl&flt$B8%#(I$szejzRBcxa!Kti)eQsuG56tvWw74HSBK
z7J5)1{JolXXh5UJa!f!&E0yz<q!1Rvkg3}9@v(yX@Oz_5kubiy_oZqopp|F2ft6px
zO^fvmE*I87w4|lEYK1eH0E<a2WzppRjCG6c6J=i&&6H}XE%<<iH26T!_mdNuyAwi?
zxd&JN%m$eGwsM3Y1f6BEyQ<P1BDbrTrK{xDK_-?3vjqh|@D9MO<^^v|`oH~ONcK^`
z#*NWk5Q8E5)7S4*KzS#5$qV-`jH)W9DjbL)LtbKLixZ!_kE7gZ?$LnQAIvuz`K7}u
z(!*!6m$_BZ6;CKene5hPw^G_`2TmQc+kDbpUx9PjfMP;HBxyW702Y9&BF+jc4ek5&
z<}=3v>d@vp3FsnAvS7naE=d2n>8aYUWEaQ%1QHQkp8VRy<4A_!!s1=XO>@rf{)w!E
zAx>tN+J@G$n-&RtL(iFwjh6_VN*zAg=n7OoFSy;6`A#hn%3J**f!5mhvu?i0!eaY+
zPcJ5bid7OkuXq;L{fJPcIABPXc^-`^5lPgfqM<^mYjx$3#ZONC#rIlW6Wm+T(cpX*
zDB!L|m<<B32^0pr2GWf@l@9b2Fy*kLMJDB^`l>2lU%UQ~ivE8z^FI|mh$8@cw;}!u
z6odHiYCU(BkuM!Ah%_SOc}b0k*2rhU!;#b1V;PF;9%<(Pz8bTmDEy<f|Kv3fhPFtV
zuvaS<*{D`QMIH8Nu1;gNaRl0vDrQBs2|YRad+;f0#26BKNQOgJJwaC}I$GuVq7#9=
zLMS?5$=ko@r;=#&6nnJpic{LfMM@4=KWE~UUC!c5rccaw!J-MN<$`>TR-b=vD`Vnw
zy|^&^FE!FhZDq(&Hw7M09H+K4xBLPM8$(Lh;xft-bs9N2W7hq09I%Htl>kXbY0-Y^
zy`{de8wX}x|9NR(c_({-AtLjZ{$B?b{1^!3enHqPW3Q>hyiNZc4f_@!=ie{qveRi~
z8ogTBA!PaSi*+O)Uuj#+di5*E+Q*aRXZCBQkU+ncTO0lRWihRNo}-=eqdw+A%RO(X
zTjSg48xliN$zq=6^!<3A5I!mPJRxw&P>h=a8z+cyM(bm2ZLdj6D)d(?u%zi_Z*$wW
zvO?a&64l_HP(f`2iNvVdWmA<1F$TXbq>LU9J*?vX82vMy^W8f+Tlz%iE}c+lMPUyX
ziZkgst>(Z3rC(kh9svsakxk+1HOyx*-siS-l|5il$XUgbl5M*mSvI;yAk^dr$$v?0
zXkEKQqq>4@IU<rvfeIGz4qDYhktUYq`s;|_z(9TDv4~hW<kx8F_D347`q|BmqU1)`
zv)GB=uW^>m<^t>8k+qGU>q~^jm-~=vF5b#I3No%7Ih=+uV_VtHI}pEMo{Z)&MRtoX
zDJO@#A<V$__*^8LMil|yi%70i%kC!qc9t(jhT$0<V+D1+liL^Y2{kYNJO#LjvN0#w
zxW^umsNuW(O?P%t(Z%tZx!&_~f@NCF=Cwk-dJWXdM_<SAqlP6kmZiTN>VR_~A<>eA
zgtRGLZ2k>;M1_4WTW65Wn!mJ6Gb(b|`z8hb`kTKm20q_nb^CevkAxU=T(nM%*FJ;_
zI5$b!QreVgdN?aefbbOv?r93$6_}|}X}0FQe=d$oxl#m;>g-QK@8h`m*nK)D=8m+h
zbtNSKk1C^h76ejzO3^)m;o}sxuh3pzdlyu9%#}vN_x6uu1AJPFa@9x+mm}Iu{#>-x
zFY{jce{vxp`yWI5DTJ`@|02i#nEC%dgdhSzhL6~Nz<Al?@Cmd<{bJzqN1EWD>a10a
z1{w(i_EoVF!pmS-uZgy=IM*e4b!l`WeHavJ3f)W?ja&eH+VIp)`8)b3=u}Xklb^Xp
z`uL=QiG2L=aY=APH9%Bs-Pt9&rD_=|vZcXAes2sV!2ed*zZqlh*g3bvu;Zx4`Ivn#
z``gL2&3~SU6TTJXw%C()xTAa%3pu=KY=h$lI=y%X>imy?0>z~Ho^T{8Jgs<18p{0?
zF`7R;qb-`+Vstp#G2lJ<SNbqidkpuMx=0Uqhwamwfw`&{IYk<)o*wR5F}JCwjy|e)
zB;6%9RYo*oF1c1P)+W`zNw6#NY8D8(VHw(FeEF|5p`1~_x>M|+amM4jNq-eS)N#G~
z$yFpHA%{}cwpYy7`GNJScK`ar;-6;Su<kf%8R#|wM5I9qb^Cf~`w9t*=pGH7L-C!l
ze26li|5(m@A4^72^&DBlAR4YYjVor?ru<;58ReyhcG5KU(?(*02j@9`xMQMc?C1ge
zDtCYw!V~x75|90<(>P+@pYYp2YX-^CnC!JW{dZp2|9H*h{@wP2l-Y?EpPZ7O2bF3O
z8oBPDsgv{in$gEY2A4XsV1v2*hL}a|y505Wl4jCn0j(UZ=%1p+(SFs+{k$i20^HTC
z2{Uu#b?zPYFpNKQxy7T<wqiFGq0)HRSn7hhLwVeOrH!Bay?ApL7qq&G<mXo!=@K>;
zj%Yo!yCFUpCHYjkvx#$EcZD<OL}g~jGY8-P?~OlWDdH-wt^i6itC6aPPpkQxcZR3X
zWmQv|MT1oU_!JX01n*b?jj;9HTlkWY2m=d?hJOu#59P-84wKoV)=gB3tc1mB4sMmt
zz??jJU;F9kK->H6K5G?b11hzLVK0Anp_+|#J`W$UY5{!?9M_9&So9{*VTE<5e$v<a
z`^l4Ms@F=?A<|qc@}3cb<W)E?J4{*2!Tqg)CU29|9!d`vQ^{r^;6|xnvUVanDZExo
z6C_B<mrlE1s1a4C2KSrt7*9`CCxP<RxgtbS{L1QDnf))t{-0U>_rl4V-8TlYd<$=E
zS<9Hl1<coEnJaWTxE}Oque!=D7TjY`9}J2%LEk<&zSQsp{qn3>%_ra{*WAa!5@ecx
z@DDQwUrP%5&cjbLtzX_oWkp85SZIchuH&HpATrHxH6FQ%|IAO@9d`f5HZB;`$T(+L
zBm}=Ig+w?bBdoj-O{<vc$6LlYjJ(JyfYXN>*C7@gt5^JL@NNH3PuD5khmF!_$lHkb
zf^j<;La(>cpm6(hwsCK0%~*_7!No(#lQqd2t+Uo_o1xv6dP`f7w%+l8{Yc%hA?3Gg
z>2oD@de$J(Ien8CSsi=>K94f-Kh_9pi=tQ~BPK#4r~$dn-^SF#Kz@&)RC^0OMz6PD
z4-Unv&nLbcclwrL!Fj9S_ZG0cc!bcNt50zP^Pz(kec7*NWf}H0JzQVE!SS-=P`>5j
z`mS4WbBNy9qKF;DQQ)r+`c?jEn9a8CI?C^5`q=BB90KDj?OLteSm>yRsn509cd&Q#
zU;6Fs-!R{`XH~4Etp<BHW}JJ0pW$?%kzC!_3LnFdjW6waNiR{^CpzH}DeBu{fwk_?
zdz#WOGLwb)K|!uw-rZAk1iArYFtu#%y2tV@-|3>aNtZYiK08eJ?{cDRx2dyLOL)e8
z0izzO*5!i^6VkQQR$I9AV$O}Xp#ayMteMclKe=@8{Z4`u?_KodrX(nvcOIORGC{L<
z2fii9lYH_ve#X^CAXSrvj<UCVl@px{9$I`2Sv+Q*xgBkj_0^55bwggqkEMuLs=VmO
zDNp5@k%0Oc_pogx9O^imadqR$N_lO6(HIL$x8K}!Isf2TIL6XGLR*VoVk{*)#%FqR
z^`8bPc7FBz)Rl~^mawdpU{c*KOx`Y(h+j_K$U&W5mBPLZP{~WUqzzonqbcs-w0vo!
z<a5h{$2=x9*kD{IP$``*3R*lvp7DDKktk$DLH!?cWvHashP}cdetLpTwt>x=6x92L
z^Qb;Ph)!${2-U$!Tj`4}*N}oj5GOT9;qpJW#Ia7sSES?q$hIA5M)t^Dxi8t5FSR$h
zZaPLj^`%lvtIB*Qqd8V%OF~_n*w?;&*RlPya3<zK_it5J%D+?ih=ycep%YRtAQOp{
zyqy{sfh)qZ`8=mor|$k<&BDCOAHYFSDz`)#Pl2!HFzq^rIW>o)7yJ_Th{g913#>MI
zQ*!zcw7b2)vG+2oG&?T3<Rwo>#tci;H5~!4RmtU(J;>_wv!<Y0_EYY0GRAW*EyVAS
z;qIGzUkM}+u3ZCyWzQFE*@rdDqwoZE1HYA4KHn41to`O~@AexNd<7OE_!Zb0-a#wc
zn!i*W@FZR{95HCKd^+J&SwLX|Q1<b`^rtG<NKT3AZnP}@H{7{*{r0v$O2xP+Wxutu
z;m>Vq0!g#!U+8-~6lXFNIo#kF<PNILn4PnLweyydT+c9#G4d!-bm{vgR|?yrpad_v
zgsbf1i*utJTbEIr=V$JaV0OH^xx9}(G>R2GC+S@*=F7y=pW#=rIn2fP7keR`)zp8$
zYqv;fQwe7JhwpGDlP;r~fwx0SI(SVF|KcRs!I`<X#lrSz=iC@D(ed=OgrUFkmhrT9
z&Y>N7DSLaGr*#dT%X*lm>^RO1pJh|naa!bizQo(f-k8L#HTVR5Z(q&$$pAgU>tm9V
zBo9QeVO)E5F0*@fPc425gLFBBzwT!COvZXcsRmdkRYM#96h5cMLg#b3Vkdn=@ki`h
zt)c8E=2G(_bH`@SUy&ZFAt%bYe>V|P@6cMA4HpRQAU9}K^iRy|5<w_Ic-p0k>f9A}
zf+<_(iF-#Eu{9q_8ESui6rdHZU*kc@PvgtiG5mmNo_#9R#T@c*oY{nvMxG6t-kJb%
z%T~dCDuJ7U<>oQi!I<}y*D~3m^#jSFcmAAQlkqO%5;ctpw*U8Ex@_?o)3}AK=+H^G
zc_E8<ISJyxN}I!J$<+Wzf&{*AWbL^v{fQd3{(H1xS(4Es%dT1cFUTd*<k4fi)#P=S
zIt+ziZcX~TG8>F>9iy1vw`kMFC7UY7G&nr$JCZSoPCqs}!Fvb?4iQ%Hx3KD}1wC^5
zhB5@5+!|9MLCh$UsG{PLykYt{m((Jsa8K|r*Wez^$fxD0=j-@AnN{bI4!*<uHC$aR
z-;9$!MOVfWj@aD&zv<&s*ktR)iKl30=O=?)JK8&QTrtS`e8AnCFZFg^F5{HeD#2sX
z$Oneq4-)Okf(EkG4pMH1NA^)C@;HwYK)gVmA6;|ozvjN=-UIlziVI$I(&F{{k<%Pn
zE(`SC|0@T#Ri2{f7?QZIiLVKgXeG7yog@Z~b4-3p9!h5*`l=`YNJLD8Y#BU=suB7I
zh`WBv%wieA#H0cq7+H;eB2&36uo)CNP<Iwwr&5#_o}37Nc1-hl+2e#TS#Uev)UJ?S
zE;YTxE(3n+q=SOU8{G2EnuWN{RbAtATm!Dy<HXPH93jKM-`Z*vCGo_1-ay|<5T{@(
z3G17T>gWrx>#{x1TKlqM$zSigpO$Nv{QRs_k77W%UJ@#;fO!39iuxL<+G!qP`WN)=
zq9F>iuNsG8c#mGb@f|6^Qn-VrI}*VdU=BckcjBeN5$mnq`KCsI-KWb^?k;Vkdu~BV
zhKecTt&F*Cjtu$Q$?F9iW{y{D2NqA`MfW``>eLTn*tEmHq3~8Gywm!rs%VS+>aTGr
zAGF@|y?*zWsARju1}$@O_r~t9Gkrll+puPN6f*?LWJQeI9mD4H`Y##WID9kLM!N8&
z;kLYfIZwK+v+)5W1Zn}fJ6^^EhUe-jMQoG88jmrlbGTdWHLj!<%ki5>M?GU)&x>!@
z5(T6xbKyY*)jUte_t-Z2-($zKPaQ<<?3&pI{#?#f77J6O<qQX1ijQA`6Z7cG!C1My
zJW4FKGvZa=C1J5aB@?=a36qV!f3~+Q{=~_yX$j#tu`m5owI-P2wXCQrqA0+-S`zx@
znhaEVLnjMVfv|1HpT0&*GUAX=ZO5-S5_@~y)em>a@mi)sllwS&8Ul{My6NpE1x(!u
z9=&gE$Nw5yM<7Ydylp1j(e>p&A=9nzO(PA&yD8$5dm4mOJ#CsfG%aJ~xrosjaI#eA
zk$DF@dmZNdXO@ks=Px~dP2I(9Q%?H_*0{;z3%vNA5m9+~_#sr0vYO!w6<ity`9-}E
z!-l2_qa(QA`+K1!?fAJ}$a<UQT0U{zE;>YYqfcRP*87)7QA3cN=g0-@*(nbkCYHd_
zZ;z?$D>T%nwRQ80e^Yx2XqQ%(fh>*VniS@|LV}z~D0gRjTg8g6tog0GOMVd%Kh5yn
zCU*MHopj!&6O61h`mJx@WlXj0GPrmVi+U%-fx!mFLA7&yBSJ9sb012=d`*kQ+cqGk
zjU`779X|4dKg+<%_U7sv5<r(RUUCFv`N}K;0wCuRk9}2NZs2~QK}`~V{2KsmS^SJ*
z8VyRUrLRD$c)in9(KONdIodhH36<phyV<9u1rif9Mb_+7BIkPP_tLrayuV)^TGK_l
z^YvdUochGD$VI$_|LA#bYBT>1<Mr*D3&EX4SN{kdghOT2@~F+&cti-8Hd>R1!_d7I
z5tP8Gf}8I1gs-9pkpC-_&V-*m9(05+yv$?|nV{Ve{=O)Zi+x867t3+Jc4KKM%f)tk
z3Xgiq9vfdBrAL#GcoPee{&rPY->qrbFEOU>*)!MYUtEs=+>8PJMe)@8$@YV)LVyx0
zNbL%7AtMmi0-dK%*3M0pTv`HweVF!n1ep@+eMnS_B)vrg!y_PbHQEn=_yU${q+Y*B
zYtsSHl-umrevdsJ@W4SN%fRS+H_03QrU9if-Z6sfoL@R=)8%5<pRXtaeaTHx2WW8>
zW4vlVtxA1PjRI)_Q-1sbOY!Q&@s+6c^#A#tTi3V0XHtbLx^9XzdJ_@a_sSP*C{~Fa
z$Lx~2rdmvfA^_W}8yyQ>pAv{vanR*N(wJ|aUFIUMZNbZCu`#ZziD_Hd2xx7lYMzcs
zHnSA~JB%v)AdJ;dn=3|_D2b8TnvfyF?v$LBy!92GV@~RO-}$z{?Kdtl6EJqKWs2f@
zaFy@rAh{=mr)E=Q3Oi?AicB1c0uOJPg4`Vwu1ekoFh>u6sg>_3JPsd(bk)CA8TyKH
z@mmUsZtx?dM|N%+3-I#3XYYm%Wt7_(_+5t$&US+AiN;{o^t*X89R##piF$jSV#4gZ
zgrfc)?=kMTcXlUOTf$(fRznVQoZOL_-y35bP%E6x=3fV>Yi)gnf4%E=0Q)O>n~wK3
zjVfq4h-E}9K6Y9KxJCNo#~-5YHz`ZH`M+CXur%$slVN2xuol?jc*<jsm11CwRXXIv
zj?ZbTWG{0omm;vSCJpTz^V&I$EZin)d;%8vdjqg#wZj`%o0w)CO1e{l48Us0_(*ly
zv)PcUUq6N#EVAk$iGcqV{%QEPpAM-Wbe5nQ=v$8<&Ss_KQ_y<Lo3W=g9~H%dZ?6GL
z0;he4gu(pT9+J6rkO0Vt;K{D3Yly@CEa<@Gm#`z_GmZ$M6tROsVAgp=zBbHM2{6#X
zuHc<r^6rwXXRk6tWEzVp$wIbtf#Nv_^;xPTT}-6-Xb<qfhN&aj>S*_t@dKFp{WbJf
zlI(G+(>F8H*9M{LKeM<o9zooq9D1wt8rEK47W~Ex`hQ$euhpsPhp3^so<G*inPc&_
zUIvJ!19QK2Z@C)bE}^{7U$bai|474tqg66H2&Q&$!ui(r$_lv)%Fh?BqTW6Cx4Ezw
zdBs1@c$Y!Vys;ViA4L<3)$;Vj657o?%cUV9FT2CKFdwFgak=$B)QoV{l>D-;@EhWO
z(M#XJ-6JaL^)ueB#7p*yg9(uNB&BpfztW#qM>)&0xwdvk@~A!YN)51P>n*U+);3vw
zhpCh|t*w>4R5$_2P6MC_*>B_Z)b%x9h9_H5r<jRWylj3A@D9Cqr#06iKfyw#qlwT_
zzUGNah$X^zPM<J23zLw0ft_0>v4uEUT!dgNguEePP%0dn;2nd}bu_oM9tw7i>y#2i
z@Vtet>{EVM=>NgVh{HHjciQkfWd?>)*Q(Ny&w&Y3273PKHkdD-X?7-DdPhxZ-*q?L
zta(sX#VDR=TJB4YMN8${RfD+}`AX-jz+*b_`m0O}I`K|@**bMAIl!i9il3WRMJ=1%
zk%qYDxbD2@jRm@Xw}GOLW0kka1SLK1*ENWeOZFoqfmNj#Qr9>Y*`?f35`GbRWaJEQ
zcWzsxcqRa(N#|R4`ugyg;HBgL#6O}K`{0oLjvs8Wr<M=B;!tdF-|=Q7eROh+B|ng*
z0x7K-SFU+jSWFlgqBaE6k5raHDe(7)X9x~&*Cv068Zf>E6R4HD#ucDHoxHBi7WM-y
zFg=W9%WBQ=|A;fUbv}?q?J+O-)r6|bNn=~AXzOSvgf>019NpX}SXdjGSv(^Zpw@Gw
zE&O)witpC!l()@M4{pPFEBPgyry<X7P3~n4Yd;H?WC(`f7ON}i<4slO?D?Yz0HJok
zoTj^8Tl=H#wVGk^0y<k>sSV)e=pfcB46!_PoX9e?@C&&y%saZiBaVDmQtmUFw<9~@
zb$Zxi;<IaX*pcn!Y~Sg=f&%PCajZGVhq_^t-9skfF({}he_R|sG30jMBGuT@-->iR
zx}>~x^}`O9{EV@@a=Htgcx59GDt*+E;kE0be6j1DMSu#K1Ff3#zVEhK)E)4iLf44y
z!kUQ2e(4itSfn*-T<MLcO4Ll1b=Cgvl(b1V)gK?)Jc8!2kU_JgN+J5rKLnDJX^Vc<
zn&W<`Sd#eLf;k7YQ4`Y3-vwcRzExNY{K@3O_P)FR6+bbLW;ys8`ytb>>b>2EiMj4Z
zNBdq|Csa}QizG6VNVQo_lP6f^+^1%$$}X$QUHy`#PoJ<7WA@vXNSqT3j@=PizNi}!
zMTQ6v=dQHMK^|w7onNpa|JR@_U(XCjerFKza#o{D$v}C9gRHlj<mBY<U3G$|3xnm&
zc-^tJa2dNYev%|Zczz`0SYs*SRa?n}hT-bx?#<LIXk#VH%!t&7F&)518F=$s2e7uP
zgxbvkd^g2A_&}Ft40$SN4Oh-pvW0xOtBL-lr!nUZux~~N$zAOK0Z2i&zWe=Jm5f5c
z9?-~wX9<O)=txS&XjKi&z%GqE79<ufQ}|m+09wl-7<5B8pednY!lW=>ELts03iAxk
z3p?H}HJtAaCnkxpD-6Nq*Vo)cfna@;x2e&bn+8fV-FPe!I9gYa)~qZP9zBZg$_n#q
zwr0?x8ajS!8kx0(lGPY8^{b-}oNyd(GQsU0#fh#iWTa;xFE<Yj^$lolYG$xn(bC*9
zjy4Jz!9Le@o!8aYndj2e($OVrl*?^ay&bQMXK+#QNhpx~Jszt&N#}}Rk1PNZg&L6R
z7m0f@I_ARZ)2Gqc*hG<V9C`T#sHm(&Bh#~qd8x6n*&Mf#*V@}VP*qipT&7)4ZZ2wT
z>(SqTCg7)*e75!y4#6;E2An{MfQJ)d-p(r&bbhw8{#al%S|cD7daEi?#)8;BE)?1T
zMzBH4<%}j)CJx9g9B}%3Il&p$8C*qZ{>Z>*i-WU-f+Z4+P-ttRP^d#2g+lSsNSvxH
z2L}7YA{0Cn3MVNPGAR`DNg9n53N1|}6AFP=34#FHDGCJpT-SA8PobdaGAI;IsLM(}
zs;3ccGh0|Ti39uh8H`X+w~~Z{$1@K5+L<$FP+wn%l9Cb}r%)&_FQ+(Yq$p@7m9>$^
zBo-RYzNx8+`m+^v%vS{k1r!XqXl!W2z`(%x??TAmkK%TbLSX>CRO)3ci0w&97_F>^
zl)Rr2Y7i*2mnRx82$&|E&s|P%hIIy453D@kECW|AysW$>79<X=W6RwL2)Va4W3;vw
zt(loKLg6ajf`vjbMCv0WBSsA5=jR)gmX;b3Ah#~2Z%0Rm5e5<og4_iOhKh;`BNhq^
z3(YfqeSJoNgjzaz(hoshfm@h`Le-2=xQyWpE1JRtr@vPMoZoOc!5P*tz{&&8GH~T$
zN}<p)BNS#fCEbKj(6JzEgDeS+%s0iw#fI?9%F0m7{1Pk(Bocxl;h^jF_4VU>35A@T
z98^_RnJx^81?Q%B2meComAHjRC`3l0H8ByR6_wD~1iuQZFkV4j`EXXe=YqN4{{G7h
zlL)CXOtAe65g(ToF2%QB3S5G?bmr$P9p1)z_!=8vL_<U1nDM5)?LJadjn<5G3WXyx
zLg6afY(jPl1VMy7I5<d}YB5#>o8%=LY(Ws*-5|kWcSD4-F4WZ2jQdkrS!pZ_wkWVS
zTPQf)ucYnbg+fI+N{<{tOF{xh$}6C;34Rq+q3P-agvKib4PipSKYxh$xSViFzWq|*
z3W&=;G`tOU6a@9=*i&CSey+VB_u=YFw4|q^IC4fPTuocBC<rF!V3D9P3EA1%W?X{K
zWi5~((6K~9uu!l?g4}d$cS+cgSkQQdtgI~44bk7<KW<sD1&cE*!Q$mg*upCmw1jhG
zGf>Y0OqK6fLH-Cp70`5mhARN|mk<q;<L+|7CI9v?L*>UOG=>Mx__)&Hr8w|O5KvTk
z>L?WI>r8xUFZd-Cs%C`3)x6o{Y+DwFhK7s~kT{SPK;sOWnwkvpJI5mkwh+)Wx=(I8
zc6LeVnyeB<MMb6?Lt;T)8^MDnZNU&M6oSt$_wAAh1-~jfRd`O4x&m<_6}EXMM5TXO
zLF?d$8@Ase;_tG;rHq4cqW;42-E<)TCdJ1U3?IdTUxI)_!5a_?rg5VEj8K@_FhRy5
zY|TuNH9%t#Bobs%5b<l!qAd_YiGg5|ATgn1jZM%sSs)r48`03vFm8#EP>}z+=hUfF
zaJjT*$Ba-gLZL)LAzng(g|VS|yt2FE5TZg7rdw&7`<;GXZg7%PI1ucAi1@o~aH+mO
z+^C;^o|`Vt5(>^daRov`!B=OA18+@@IftwYwQ{dD?!%Q8Xh}<%5eiq?Ci0ayu&oKh
z!^4K)?J12C3HE?Q5xh<EBK+X)23sTuPVrz13q5E1qjOmnG+rSyGxMC51v`u%Iia9K
zYbi=E^jq4HP|&Zg4W5~>D8$8Mq@<LEwGn<6R=*1CWeC`)73#*}7gX^$5on><mA2^%
zRX=G<6MPy}#dD9{FRFX!w<;@tpubs_n46hLZaP=xCO5&p$Lg1Ew63e7)4f5JV(|T@
zay0R4hp*l|r@eWveLdihx4PPTmYG<K(Riy_saDIcM)+94c`K{nt*WNK^rNocTr=18
zyB)kozr^ROskPjcwtCK7=X>ZbutXS`IA&bggrvCe*3v&h=XPAmO)&9l-xGM&Q&Vlu
zt$zAOtF>rfm%nrq3_%3>WBX<9<Fg(u*(-mVo5tU5;&%M|6i&uTV<5kp@0f@K6DN!V
zFVEeKBkTJW&kfeGzP(;)#`vILo}hS?o63R7SAjUP-luofnfM&fdrE`qTJya5)kD3X
z-(ZK|E23vU6Wnz*aMe~@W_P-KcrG_{PoUpk=cdn|P`;GAPjRWZYgD@E{Z^Xj+ciT#
zac-xPi7Q8$xh$dZE8Uczs;%(LU3*`hzNHQ$teaX=XN1DlwuyZ0bq&VG#&GiFNh1>C
z;^L5ykYI>h-2{1gdE>&Nnt8~!3^;{?-3?)j2z&N}#wKV=rDjgZKUosgt&x(Ff}=-|
z8o%X-z0QK&1!9j`2o?^P`!+41Aeg02gN1^Ya31KVP_U*)wyNu)s3cH1sv=cEzWe|i
zHA3w;#w+ykirpewRXm1}SP7{D7K}j9^0KUiRdJ8jRAIEb%Jh}0(v>hUl`u2jD33=O
zM~3Wp?&f>P%F8h(HxYc`KCcKTAS^u0v?6?4M7T*nV}v34fCv~D1oi5(Wq7#PbAq`i
zAV@~}E*IbBYH7w8D=NKPqy$!M9+KH8#ocIW89cQjsCskFQzdaxYlMWaR$`(O?(zx}
z7fF-%h!7P=hIDm2{yq_<Re9S2z@>Om+>@+)0YX<Cjj^>SbFo|T#e2*(wF1k_Fjk}W
zIIPw9-1JA+4VlSrO^>6yhxfXwD$VnLrHTC2`{*WO9OLm2k6jdWrVrbsW3Bl%H{-yN
zI)#F_u?cRa1<#GhRUA}QVyu++@cZ4wa8a>&#>5BH!&6ypzS}EdK|drYMi_^#vN9tY
z{PfcZF9`};RG9c|G(t_{%)Ta};G%y@0|^BQ34N>LP5DY9K+8#cnCFH`c0(0qmN2Ee
z$$Qn6@Jb9wNH8A8BqSsvc&u}CP2|sKBoq`^9>%@kW88SPFcJOqR#g~sHTQ%lH<ulh
zN3@qXU|fx#D?ij)d191#sVyZL#YYaao+_IW3Rlr)TNO00P}TztG>nOfL1bj)I1U~>
zi2eKbBRV?T5PV~!HCQot{6VPk3U;@HtOpVw@<)CgJ9f+ngd=P?>sW$83pjOmcbhH<
zTOdd@oNLX6%XOO(3R4LM-X}5|W$R>w6}2i~4=dBt<)t`XQiR^3LY&CUK~F&*21|-D
z!pg~|N|?`{VdfhY@ppEz@@}w*O=K=VMZU~vBK9FF+TOfe3{shzYjhjq`wUsjDj;%d
zQ0uzRJR?!y=CKhQygo+1Tzp0%MDH9m$F+Q4mANkTQ}Ldns+MSQSE%(XD~0@*C8FLC
zs9-Dztn^09DvXGbaF8I7P&mPgt&^3bNAV+4)AJ%+rFES}a3Xa<0>y|UGq=6T5V^gY
zo)KNOY6)AdU3+?)mgJQHFy{?wG1nS5JtsdEw-Oji5BXvI)N=v9-F#-Kw1gyCXMWRS
zkc82dosGUiemCRDuW+!St3^M?Z<7UVq_`Ak@(PR)K&@KSf$vg0NSKk_JrY`FBGW3%
zs?gYE1jPu&#8`Qyu`C$tj1d7$R|$=>a!U~CUdE^5$z|LsEpa6=NGR_ai%lRMWWDex
z-)Vh-)@HcaIv$}I7-HU&P>{vIr(a{001D(qBM>B3B@zPUFA+QL&b*|&=b=9m2oiK&
z2`Z7QL{t#bqHc1Txh!!$p%4&{mQYBdP&hOr6t2Qeq^tpqB6W>TkR>4_BLnH_>4wBb
z@)8Upb*+bRAwog-X*y(VY%C5PI%F&rNl8h@U%f-t3RxR$i-O(FV2cIYqHv{b7cUgd
zItoY85;q|fz{&|Vm6tITK2_4TV3>g2(lf2)8q4G@LK{`<lr64NR?Izx`Do2ZLw|Jz
zjz=BEx>sI8Zp0p(%*n<nW{^`PeO1oo%s?qyx1g9Rv%l!L5fH|-E}|r{>K>6=M`k7x
z*R93jrAtxEj5kQK>qt*S_V(?_-nI?JhYq0l@IhqqICsZ(96zuhnY^ZF+EY_8Tvlp`
zRKlPqHwWokw<2xxW;7=y!nC;A0v}`82Y6o>GjYbI%_xf4i{6}ELwq2CYVYAUyGT@8
zILoD$b)aiQLZg$F+JOZNvFnXD&={XUK~e;ltP_f}M$3FJ;bO!O-Nr=>&)Zori}&wC
z6T{QV_v_o*Q&Z5Mmd5jRbKaJgYU1G}iM^Gr!1Bl=DB*XWq4-j_jQkv7_*MB!>_}jl
zt{R!11LDf1_wjg?@hnkP!?-MDy7bUbh09oT0$nj8bvMPATUHjOvq)ZINymJj;$Toh
zqQbHcNt{V+jFRkS-H|Zx)G7@r3J8ffBO+v3kr=ELDOXx?!TX0P0!Jk_nq<XjWZY3q
z+Loh$HAq5Hf=`g8V1VS-M53!;9;=OyMQ1kShoZETXvs`RQ))8Wvog@eyr{nTHoA4@
zW~202B<d34aJu-o)fFM})u{Ak954=Ln)gXGQ0#h`2aQFhS^|d0vMfw0FP9;zt#HbE
z;A5Em)p8H2cj~GsEK6sE!d1N4T@bP=NG!;*phcC`WuTV6#6fa$vavMCqR_;$X?HmU
z3j=3&gzc_b6Y=r!=6MMNbzw+6=smiwE{fjXUeo<yheraz9zSs<ZDAG)tkgxgDzqxd
zmn{@NRw^PJ2ke%fDse%rJ5{u95fWQ#1FVcxX~(T!i^`+~#BAP(7jFM8V%EHe{JndS
z7qOdUAC1$;3$bs}Lacav7LKia2fb|7nijSy<wmvI8%-aomo4o2<Rol(=|#-D=WgVa
z*wiY{*|`(X-h4COery&FELntu%a&l<Yjd%C{ygk?Yd+@Re;;Q3;ulESxWR}J`7J9%
z3rY5s-~SGaAASh6(NU%a-p`h3KP%Iof_!99xXiivCainzIn+i)VW6l8CrHrUxw#lt
zHw6iGm>J$JD~1S+7$cb#k?5B`^bp>C{Bbl;i4XD~k)TLTVn9Tv=VaXw(P}J(AirZ*
zt-|t$A4cS|WfUo!khNtCGALxyHf}@~MNKA;Q`WCHZUwt{A#u$bY<}q_ta<ur)G>?_
z0TLau!kDgu00H{~<ZZfg2qPBgE-{qO_Z)ruZ4~a=gI<1{hhdb!7$O<#UXgNNX&L&M
z56)2e_cOhEDD?UmM-oX|)o*~`W4=?}JF<3gKSZ)uoEgiI#2(|<#21C68FSJ&F<!(L
z3}d`zbwQP5fbToScc0A4LLVy^S%8e?hkgw)92%FPxE~<_o*?PRty_cb^WMP0x0fMv
z=XQhCt(%d|d}l-FLdup+IJSBvUcLJ+Y<Tr$R5KqAGu=njg`w^T`YmA~q2RBPP++)8
zrpl9E5~+{Je)Z)~DleBIBx<<#^V@utK?29VURy<BSwhhn5DJwuLg8xJf(Hs}FQV3<
zLXoy+BJ}k17!uc*1QEQf0=7^Hwi--FDA-m6bwkKq<014Ot<orgqJfmbYbt#7g#!Oq
zp;F<R7|a;xdWeifb6h-z*~&CRffXZEaGizwasn%G=(j1<H*F(GC>XI2ASKiCH)5d{
zXIS~vP$;Z<;d$(5<$dVg6?o^Fr*MQ~V9V=siPw-rvQrCr8AZavhaNEJS|v`V^by93
zMq`gKj)r6srk_=DG1&0ROISARQIsAzY>0pV(xtfWv;Ri7Sx8v7776RuA@2S6kg|Cb
zqTgGEXMb}me!%O8R=kZ<h54psEkaW3^S1AN8*?aLYDg5#$%)9=vCR-k(uVa|_0*HN
z_S64@XK(y9;^|-R&K=mlWHF*wu0$;bz^Lgyu(}XNNQxu;{yw%sb<g~J@4?PDUPo7E
zh7lb?3kyjTRkiLF36IE<&=?RI^rwk_ZhG-0%)0J6Y@a(9$?Mh`5|>CwTDx{!FvP81
zZO(Ic?7*=VE3lA4=$RXCKpq8?x-o3xmH04Li$Ismu);_fkwEwE>};fN*no{Mynq9X
z7U2X%!vHG*2^c-6Fp8w}ckjlrci+KLB5T_=3ZeZdpvcQ(TGhnHps&2lkhLrrdcU!*
zwCIP1m<Nh2|IQQ_Sr!plb=2h{OGT|U@YD<}wZ~)-r<v9b3GwuQrxAlS6hNg14<dW}
zHdM1kBI|)fm+8KtAa%7iqcbPVh=c{qL&|Rw4MOz$s}WD3Dv=Po_I)I7T#uwp8_cy$
zuf58A@vkO-6dgKX@<vlqJWiyiVU*#O<-m+ZkXQ(m1s}gt)&&WLN#*1+g`dRlH)4Up
zw8A<z*R&TX8b(Ts(aQWkBNVQ#%_ihvv7j*m5)8uV=%^768ap5>fVvGd7||9Ac2|Sl
z4dE0H_FmS5RF-{>e~_ERfqp+i{%bGjy|yT@!)1r<O4=@3D4eRWW<4~=##usvl^sZg
zP|L(Fw3j2aiez~e!x@As3x2{EfP{kGFFtBWz8u}Gd=IQxj%{zgj!hH?E1r4+%Vs}@
z#j_s4+LvB1)`o(85m@x-!=|E_X;|GAy+l<^6bkn5MSW5NP8}~W;~TQ~?80VN@atcG
z5oz1Dpy=QMY^UFk{PcQ503r-yR?f~uZ%Gk)_}uQr3-J)I7arJ$K~|J9Rm;>|!1HHs
zxe2e`a~Jk4TY}ZkJ%cyyy9aOHe=pu3(LeU{pW)}9{~R8=?pkAYSo+Arc#ikKdC%R(
z^3lccxSOmI_OhZ#;FLrj!E-m?gh#Hw4y!1NV%TckzjO&U&wUjeUVH&jt5%vW0u9<U
z;({1t!BY#qn}sOqop-SCzWb2BYZp$+dO<f4xCmC=0&;6hPB!Pg`T3|Laqf8SHN1Gs
zEjS(#VObOc)&p4vjP)SUMIgeKC~=dR)k2pAVfiDEVCU<vqa`uXq@Nj=5!lOOP(tEZ
zG5c}c`j!924PX2ZEMYtx<+mSUny%*eiI^i-zH7|>5?>;3Gd_i4QNnIW`Ju5M?b-Y`
z#zn+}x6n!PG)xgWEW(#bT;_hwFraAa%FRJ6^Tf)hp2EC)?`GUBHr+5OB>H8KJ&Jdp
zoNdTnqC@XddY&O^cQM@~n9fQ=i36p-#=>Z?Jk^nvVeXMzFVkKqJ$e}T{^*BT{rt1W
zU3nstc`EU})u^Hv8fM<nObCeu(;_E<ifB!%+>mgHvT_;1FL4kEv)5Qc$}D#Y2p!XX
zgu<vbF=0k1TxDCZPzXM^-GZ$QvINK~Ai*G^AOT?SgU2iAJb1i<u4$%(#v^F9gDeRW
z2=;rNzfu_-HYcuxEet}T>};W+mU+cxE)*0tTPOrWgU<pO7Ye2ix*{;^p$?s_oMYK?
zTh7XT&TYTJqrdnWTkzk+wg3KE%=+ceO$9A+AS=U*cie`zd7lV-*TT23XVC)8fAD@o
z;s=&5MbhRCB&2tY(0KIcKgC_&|DN%4IYq~tB=>uM_<ciKI~L5xp?BWK;dfWyAos${
zzrO=F{MUaPQ*$E;EsHHxwI-K6@i^}O{x!Jsn(yM-TW`iIcmB?}r)=Mf4BjJg^9rAp
z1w&SbY`Udv*@XPP5ok_H#sDi_jhxruIYWjy+1N4vO}x%9uX^?=9O1iT*Su%G<!%zv
z@4ojv?3_OjU0Ipd*Z~r_TKghqnbS39WB<a1xc{1KOt(eE{Q21X)>~%3`^`7aHDS-Z
zdB**~;>Fl7XAb7yeK(dp^f0O-BaJ99LV^AZX6A;hJ`EZmT4l{H;rl8MAI7E^U&Pi|
zUO@>-Q7v@S#Y5p@o{`w2plVG|#hN+K;ktkO48HNVe}nhuJdeuwSd>Q}!`3%m!-Eu2
zzov+Io9R-=7OA_f1w#~xB5(~X)NF$>3aQ+^d+-cf?)O~#W0Xc7#sEc}gro)_Y8Ha-
zl|VfB_Hx|$-EUK*{S>?2nr|#UrwR+uO7VAy;^eVk{sQ-3cb%~s^%WIb17=C&-6ZvO
z6pyoS_yy+P^?MWNx_>|O({ARcoo~%EP<~Sy?V+fU<>A_Y{R|dT{77JGfMWx{Z6DKU
z7vrUrVIGrJp`LMC!L%+q4mVrgvMTs%mG{do@3I@fIfa7UH6CF`C|tFhlZ0)nf=$|j
zNL<|l8ncj`ocw`>g4Rn=w}rYJ>?x4b5du?PzudNI3kA!GAEu-83I$d+td#xbR)M{2
zp~a!fD#zg$$}8a$G&oH}7l5WG4wjW-ptQscBun2HVMyf0uY4Kb{?sS&V-n8yKmAX5
z{8zukwzu9iL_VJczvAg9v1{=H99i`)c5}aI)+2c8<{Pp2@kf!uR$j`s&4}c+mCrtn
z$4Lfv{os3;_t5>=%8Gvp@44k`U%^}w^wxQ=n*o!r-u-*bx&1fv_X#X!OZ27R-;NZL
zeM?3va`)}QmN#F+(kC7xd4C7@{`iMj`uHsK-b4x#5ngRl0`@FfggL*x)sTw1DP*1&
z;WekF7;zwi(x6TCYxj_}QYkQGDUnbS88*-#4V24c9Na~raPN<QgsfdV%$N)_!-C?#
z49HU}p8KBMT+;>c!1uq8r4K)B21D8+L6A7Gg@YhV!u!uWgLh}oHs=kovBqj(k5RB8
z%R=y=$y0ofx-Z_k=N@G3*kStn<vvoS*%H=tRL!)|`U8U`mi-iJH+=a^`1&V5Y2xHG
zzkP^gnH#YiuikYh{{7GY96$Zye<FhS_3>JNSqTORO<5F?caVhFGfiaX|JJ|!3!*5V
zBnl)B6nA61r;n|9`S;9kZowBn{+IOk_b6wan}Ld&H52H@diCx*@r}R#dp!2*8<4}a
z&^1kK?4$6|Sc4~+uU@6#lNgYNVK2ig(XfjGQjqx5HHn5*%uBO=@pJ6p@yYyLBNTcI
z@^ECyV!ZYH-(el|PAAh^0~b9M2qPMk!S_fgs9VCzFik2emm$n}3LVb~g_&)N%}L7I
ztJSZr0WFH8?gPzGumytl5(B|M24#;`2=0cEH9{5zbz6k`nQ8l-wnz!al{WL?yh1^4
zlZApT3ZBqHq42oXD!-hCg2E*jp-^$QP#}ClkXX=QH1%!wvE|j1pNG?Yww)F0W>(I3
zeD^!J{tKUH%li9x?zUS@YkvCzw(=Ieh2>8^j{WZ}M+IAtCkk>=85?D+5G$X526+ef
zVSp7^XI?g%SZSwj--6X_;p%$s{s^`-)3AH#BHaA-uV6bX{PLJ%B%;-Lj)e2{tv4C+
z&!I5L+_RJZN3rFZkKU5w^eY+36b`dVI16VzjMAt`G^QpYe&c#WWC!1U+X#^Rul*60
zJ^mOrzV<3!zyDq=q3B4XAm}Es$eQ3LNvQ>$zke?_&V9wSQtJ}q4GHSH##!k6EsCM{
zc}?98X1XE^omS@@pkUP40kz`Qtq}e0yO@9XJ!T9-@xFb?-M$@}Tecu)n>DLL0~)p0
zcm;J+NLWOzSb@UbyKy2t-4X+ur6BPk!Vjd2rXY@K?E(rCbu;Xxuvm2e1E`IU2O2fA
zpxktUNK_~dO&1cwFCvyeyYcH^!`D9b57<XB&`nZzHL05*8wcKAhHF0i8GP<9{v6Lz
zR8_~tn3leTl)4^<DFjL=nq(RJ%HRGCKL1yrpfG&U#EI^a{~AOnzt+F<GQLm0{^PIz
zih1S@)5@37kaa@cP9pOi6qi5z%%|~%kAK_<!sgUu6UV1W@Uk4dOHnEdlxDwZFk>3i
zIAi-ZV-3>ymuw2PoISgcxM7_U4F`FztQN9vs4GNcDhl`P#+!HCj=R74b>#8+k>dqM
z6pT{f8H)nn=VP8ULcuO0q2Me}e<0XGLE^x}F#9Sju^@MIjqbxNvn>hnGeY4i+d>J0
zP!<JEos>{WOG`7;CnXSqEeaa&=$tNTTNAX`7zItWltsb*iRn;6!P)H*+&ysx35AKj
zaa9n2zQHalULz6sp%Mu`_r$CRRvu-C52HCI79;tEfaaAm(hZ!I%;f+(Y$O?fsZbFT
zzH*Y2Ox?U!i{ZGNo7qaNLsxbdGFd^deC`?3+FMU7dh8MGUb4^-@j@Oyc>Q&z^}lug
z8%8LIG%DkxjkQ3n{-*R4YfvLwJ!ADXD37+LSV}BZ#6+PjI|JMK>~C19i_EL&hlqSG
zTb}bCxDUtPTZPi2N03Q^IQIT(RPq^-(;$gKq$WY}9{mytX{~#8S;&OF_N5n1D|pQd
zbFk=<hj9CMzm2c`!zc0d&A%q`Y&9+7Gb9a>qO1)f9d)J1;$YT^;5!uVUXqNuJT}s=
zbUr5nmIXm3{xkXc=r1UQM^hKsqHj-5!QsV=vEq?OP(?vmxN8^ok<fR(_BtZooQEBA
z=VIF{uV5$ln(45NguCdTd$Iqmx6qT3iP4gh@zo<uT4;trxwW{Fj?E%R6aiWp^uU4z
zSUvj*)E+%%7ERLH4|>)NN@e)8n3KLi1ip9aV*KhWU%}Tu^(iA1WKrqow`*MtSxaP*
z`Skz%pZL|+zG~vWpW;x~1POs|#)a-t`rq=+Z{nZ+_>b_T&;BbCD9E(7h6W}|RJCNJ
zVfHOI;}iemf8akq@d<2G7Y*O7t_k_0_jMQM8H>{$-}yGa^zpyMqDLPw<5-3(%F&*d
zitVqzhK)=&4MZ(Dc)$!Q)%liJU%{?<Z(=9Khwj<@@=JK@zI!qI=Rd<iew(J8YV8E2
zjfdi>pWn6OiP`wp-~S!s{dM$EjB3EKx2)8N1Fyt_rlPWC#aeR`>~iBPKO2+E*9S)F
z1;HnApkoRESw?j3uL!v7nC`>;=9c(4Gqrd|C|o_8P0qo>Ah<OjEELrBU|SR#*|@N~
z7_<*%QLu%Ajy1(nBEuF6P76UOp%5%yt`w1=?PKanuyAgnU=@+T7=>}6FiN3t+Kdjb
zJaiasQ85_F&1XeJ@+~Q|pw;H4LQo}iPB@?W5a1)crK*I8z^Hrmad(h-(>8BJ^!uxj
zwR?v#>q{hLM(jk<k%Ne5t8VwA1vo---m!2#@<}Kn4-GPW?3X{s`y}u-R?=pbJ(>F1
zimi%|#k<cuh3DCNmC0DoYHY&o6bc&CAak>xd*~<E;<;OI#@ZL>7}NRA1@le+w7L&u
z@em2BHTu+zzry2um&QhD#zPrJMGXZ+Ei27B?rTUyshc)n!2|c>-tS+7%_RK%2)5p{
zGB7}Ys-q&YiNazd-;+a8)W?eV48NhD0%3@iviiK|-Fp|-&UqG96cip3s9Nt@v}jZ_
zAJmH1oPC}*#>C*@!Ub6K#1ka*I5b2>A${FCB)#_@5?8Or(WOgqY}qm-ty+!vRjaU<
z;^FYZMJV3A8)tHIF;aNkERLjUeM$$HrVuhuNW^)#A3a`d&TA-EcfRr}Hazo;v2OW9
zk`xj~XlNQE^XULv&x71c44AHmul%<W3J2a^ZbX%=B@#+%fzJNb4fyvz{a^U;=Raq<
zUG$8uYhRlXXGDPpp{kqc*Ax@77`#LAC<~5$-uQG`u}Rl^e|A0o<YOPh7kORzL{_9B
z3Pf3yMrx~!B`A9B`?&AgAK@$i`>)JYTTQbaDzm2cZDrbQpZf}qN9;j6(>9gwjipG7
zqgaet`7WYYzJtWIYk0mI`_&ym;ZVSEoyyBG>voJ)XpyRN^yKGI#6F78|K(p`F~wK|
z#iv*K&yYX!H{;l^bx?{a6j*khu*<YvE^JIHtDz90d`$-5Us@7C@s#kXyF|wlImO4#
zxu0?FE0sHsD@rg-;oA}yJ0ldXvdt+DLY-@Gk5Q0N5ZP<GWbk-|;BE$|+l2@PC$7Zp
zY@rae*?M6@D5y}eSoz&&2?d$rs}CMV`>_~|X63P>p-?C;o3>DZ=>j-EoX=b`1XYNp
zQVdj#K8C>%7Rg8b&XtjeNxac)*}sdG&p(X~ufKxy-P>?*#WK@(tUi0qVVBuHiWRy{
z%$l9>%*{7q6WugwU8B*pXj4AjH@`j?kNx6jxcmFx!<IK*GlL8@1LFQ4{|KAdYR%rc
z0|%Ea#S6c=70Vx+h1mD4H5)Q_Y)8?-{b)^1G05Aq8(ZeSio37*E*|~q^=7)|QnpYv
zo1t+3UKEgQQa5fu&h~BC@!G3+@#dTG<j;SKRcvW4zW+Y#Ws6s)TJ`J3y!#HaDKdHs
z@=Z(Jtcu8%a4%b(ajRG1*I)c17Ex%_96O4!a*N1C*lOYHSS$aHQ8cvCzv$)5v5Mg?
zjo6D*nVD?m#iL^XezcI#>mnmjd*ld@V@dF_sHW(wKYA232M-~0{RUJWIDpfcSr(a5
z9E=tgVXUYaUY%<uLve`_5ViDY&)m6K|Mb&nI2vWHiv-m*p+%BLiY?Kgbq|z=>R$NO
zSN|JdqfpqpbO}0hGL02L;}A3};^FImf=~bPAK}Me_&koRTwxYEk|jWCnL|;fsfZE`
z={vXKaSF4~{@I`5?jQXCaU0j+3|qE?Rpmw~+|P9QGYW<O`0KyMUcU2WVV)5RXUa>=
zef`|4Yv|tVenc_x3A}RW?@4S2jQHwiKH2@o>sa&jQ%I&5=%PriITncq3cV(ZzJ{1+
zrdJ&5qoa&_ee^NZ^V)IdgUrpFP{K6t&CM~ZGxil1V(}A?<1-XL&)s?pDvusEt28S9
zl)wFD6{g&xh(h6b*#wFRmFGa2o-7n5msckym9vnLP>={HnihN%SVj;~9C-O{Iv;n}
zad|O@3-ZuRVLT%guFlOC2F`Pvu!F}aXz?Wp1>1rUYDLEL2?ed05d5x>+IG=Gp`Qd&
z!^*wmXmmg*s8T7hP%<@)sdEZAp9u$i4j6Yk+yVHC)mkZri!J0qwMN-GYtPC=_V%qv
zT)&2`zgzL!Z+#Un-+4PWz5Xg5y8b#mebbFd-LeTSZ2j$+_a-7J918dCMdF6_SpN89
zX2yU-f~K-*pqr)}K79SP_$^zd8nmWoJ2KO8Y}LDF3Ztg%b!DWpmAKnX<J<i5%P2c^
z$e5*TNDyZjw(gv43V@AR_Q=C{nBw9#`Xv(I$Cmu!2Oq>zKKK4JPmj+C*gJ0?=HK}{
zJn+5m;)$RB1S=kS2+!T{3%ol^-2;b6tR?8n&8FXl&}xW%Ia=AU628`EGdo}z{k!8^
z-^9GT??Tq*jp%1<T*6?4g-xw^vn(*rhk4$fkbpyPy@lt0`AbADT4Y-ORfi8Dd(%eb
zY~GB_4I5CrYZvNC^cDN|Q79Zj)xiTuT(uHwXU|5$ig(bJm}tmMLSZDo03!tj@Tdi>
zL5}4b`Cg5NV^P@m`s>*6)KjQse$;h!AISnS%x7E_7g~y0;~g{>Lqg#u#*@Y<L@Zfk
zEHSb+Xuzua`)~f*SMaI-^Z&pt{LV}YHFdqH3#pFZfB2mhX10pPaLBUo;_q(9fBn@b
z@Rh&$|FC5CV`$DuHDf&LlM_rg(5L?I{|jIE#9x`NhZAhsyBq3EUeYw%p5yt5dViJa
z2KwAzejLjv+L}|6%=E=mjQ5B)-@pRK^OhIqpk!|ZDi0k%QN%7JF(1V-3>63V8~3vP
z`%p*Gru2(n`7YKmU#W|sEh)i_Q|K)z#FD3G<1_#3Pw>P|H=rWw2-CFO#HFz&R8~V>
zalQhQbs@{8jpG3X%7cgL>n^q6HLd^2<<$vi**iB#{37{jz-Nnt8KE$<onxC33gO$P
zB@`^N5GYnoi$a+!3M4KGh0I*GKv>{OUcPC<Pa>WQ&S$~}Z!w{L;9TKG0QNVy3kxum
zmkW1&jadgl#JFPCL%8RfZ{x?G`A6LRl`rCjJ8s4Ex7~stfA(K7`-Wd4pQPSIaw~|4
zz~N;}%_#mw4?bX4R;-9TVt%kl0!!jyC5hpMTW-Pg6d3F0%wbC}lFufXzURBY`yIUV
z*kg!)?>#exaPDolVd1^^;oy=bIJkH*);;?iN=UAnLa5mSbLhvsyY9xUYp*k+pd~2@
z6>P0<p}5dG26EFtLRl0JFJ6dc58jVO_uhq^t(#E1cNZ!S?!$@n6u2~~twt*zmSTV{
z;L{|xF_KDWW*QDGoR7J`y#<lW7Gu-%&tm7?mr;A{2!`1j98g@9>h~(D;9><nc)S2L
zM-Jot*|Tu_m%fOtFFcRv<x3H{coBBI{34$G$+eh6fwGzYL@!^4J+Hlrqa^Jpw(xiJ
zcsuXUc>g_|NQfsv6`MZsF$%V^f_%7HI89$P-L!OX1LG~?m6x%e;-V$$7(jOy?;X~v
zjLbtG5|*pnT0BWB9v*&sId1*>*YS;i_y^PP-$?<eMW%Z5^Gw&zcmC-g@wq?!6TEc$
zZD>hOGC#(2QsYy$ZN(0z%|V7Se*HSL;L&>w|4m>0Z~V*u`^UKV+H1|222Fp|7zGXX
zGy@g?;xDkAY285L);b0f3mWTC&$QN5)t`R;bNI$5KWVy?y7O}2sjfgfg~qm*=3v1+
zcVg|+PauKfF@57&tRdmw`|WSwwl9AXYo45q1AHd>on?q$^$ud*S#F?oIl62KI#ZL-
zm!D1Xk$^WIx)1;MXMbu0ZcW@VxMcar$ujw0zi;6!E`=v25B>s{0ULz@1j>YmWyVut
z!I=9)lvgL5<?h^Ino^t^5ikY3MFnOraWH;t3kV&T6=8^iusJq*MkrjR+l){M-!^Tb
z;4^<8F`*Cyore+%US<N1j#;tyv+}QCD{|{AFXD%v{ukWxwg1MJ*Iq)#j?Gy0?2}mV
z(ETKxMP@ObL1v<!ygV~y@0nlSfSdp8zsw>)T2x2BH_$`zQB6YAGRo=>So{2QhR`c1
zB#!Ufi*?UGkGXf;j;C+9!A$wv`1}jl{K5-n>E%sxUcd`C-h>;!@CEF7;|;U=VM{_H
z$$qbyIWX_eJF$uP>USXYdj&-l6Y_ft-HO@zJgLEWdv>zb`6S+Zd=~1XA~D34?I<f+
z?fW(0PJO@X!=^wOqi8r85DBXvn}r0nWZM#Ak+*F#w!icOcD?#Cnph!gTA;>B^krw7
zscG((Ml%po_pEs60hC4TK~H8nn%OFkCmFx^>l-K%o<V8EZZyY4qipXU6TdZVHP^Cb
z+!}oh-HgjKnHfeL_|%FmBbkv<bZ*=<0FMHoi((>b;R3vU-@T|md<b3*K4f}%)asRJ
zV0c_wJyA<2=j0f%b?aBZif{eh-(e@?@C4tXaSTe2)lWT%Z~pDy;HEEq2?r=@2K8)B
zwMiQ-FRd9Gjq!2lW@WE5E<JP*%NQ^J_1FI!Kl$9}u>FnK%?z2Lx>{uI-i28||0%xo
z@lRm>{r587cj2_c(b{6Bl$J8AFW>fCeCO}}7EdvsXywK}O=~0pYQW*1*XLs2yf=_f
z@zER;h4!R)bN<Hdzrj0?JVf^`sEIs`@_i8~XWF*JMWZD)#-wQn?^T+PRh6MVGX-xv
zcpv`#Fa8|!?z<Ze@iFj_JV%)qJjc}nuYi|=z>}Rzp>X`%LP3yN&?=9`;V!>3LSbeL
z-!>x@!na+ZP|#qFvj;Pd3x&uijMzfqc#(xb<q{IAoGt{;=RY7q2?bjuD9i|gIWH<U
z=2aIfyaAH?sq{3Iv*o>zt?_yH-iZw_J%^P~KaTr;@LjBb@p;se@CHluE0X0n!-_9?
z-C8{Ulk4!KfBY08moGPBL+b!&$zT22<e0{I96f>^B!sPO5jV1hnYClP8U3%{I#~P6
z(}<Y&CbG9|Vaxp}DoHG5d-q}eGtc0jZ+{C%NO;{D8OE$W%y_C{%X-0Gcd-Tf6bU)r
z%-HBJJdUibTd-x$9JbV7Lnq0)l0>XlyIS@gY~^Y$x|Z=BJzju8wrIy#VQbo%ySxP5
zSs6IGbTKwO^OR}%cP7T8kA9p?Nk;POl@t$;B5L_k)RUn4i;qKV?0YCOv@)Rv*2$7^
zQ1kjzk_=h5l4K<mBp`}+?W8y<Fmw6aN%nDU4d+leoo4G@zi#MNKe~QUi=w~?HZ$<9
z#GH?i@J(x&evUA0%69I+y2l<v<ox+)K6cD>ORy#|;=-+IfQoMlr@Es@v6A;)`%nLb
zuYUaFSn=qiC_iuj^?XJ%H0J#J*Ld=$KQrq*v?L^8pr8O9$;oCW#(E01^bH$G*h%Jx
zo;2G-V+Ujb`sUyNJwE&Y{1G1h;SZ6zVZHf%4++B9)vNHtFMmm4`BkiA8k8{&o05}I
zL!r2G_T#w!d*8!z6om1-ubVA=Sz-n$G)^$S>^PTDQy0RCv}7EZ|0dJz1r#xE2h4KP
z<!Db%M9!v-NO^xXIuhbc_mM0@!wkb%MG1QIv$6ECNATrOd>rr0o`psds9QpietK9*
zy7MWj3P`dN2l?l=D2$71<~70RET`u}P#HWobYJ1L;M20@j3+<8-)kSsT`N!OSfZEt
zSOT`h2!-+)p>UOLGeRMJTX=;+Mh*#<#7bf^a8?$<V8RH#X=2jzmjKW@5Kc%ikeJ3u
z79*^@MOvDJUVAJON0%?byu0qetzZ66{P>^$0WaQqGcvbsHZunXcyA3`pc?W2(k(aR
z?r(j=wCF2HNPQY$rfF$vfs?@Uwr|76=by(elDJ4DX4Oi(OY(}O2-rV=9x~RiM>jL1
z`shV|L#)(~^4hb%_=TB4(4Qk>FE+CT>L?WE-EjvtP-JwG+%#suRZ)qy#6-lt{WeK^
zjxp0$?caxeufK+EbDl>R#fg^i9c4v3keds4MLGQ|LN|%3`oMmqt$82oo_qq)OP8Q6
zE(XJFsST0<B_^8L>W^Hs0PoL!4BIqILT2~eY>cTZg7+np{I<OC95UChrMSp2Vj*tD
z+jy6);X@1N8*4&SbQDQC5=FaqU^xYt=KHH9-<FbM&05d^NruP8H1G!cvpxFBY*w~L
z<f$K==;ik&^Bdo$P>No(2>n^vMnJil9v*dBFpc}OvQTsIAiw(sJo%IB@yHK;fVEFN
zfh@*x&c=<{`}*rxt>4#p_g!>n>7Vs@004jhNkl<ZW|<$M>dVM9gDZEw^fER)^)xaV
z=j{|>gM9xm$@K&)n)LPS@Z3!|;^r@Y5l>!!y-A<um>BazX{VXqDQni?*&A;%LL+7E
z8k25WeBaXh@5kE@KFIU+I7xqo*-9TF`6;eSckjY`vmQm-`|nXq72*`*GgWEv#N*h{
zw5w#=)W$@inF6bb_im=BeCDS=LDZ5(IGK@VMCgzN6`yTRh{4i_AHXj^|8F?7WFa~z
z_Qqswsj4)D@5;`BN7I`%m@)tO1dMfIa#?Yf&-1~Q^$_K4GIU?TwBVC9sn8M!-U8+W
ziUr7BqJfb65c6RZ<7Y-FT%FsDPzc`^7NJme;2_#;p-@Pnz{+!Ku#l7ReA9vMo%H-g
z!mhw<&<(**r77sRP$p5!?5dXQDYhUr+B{|5`*@p`@9dvlhgWaA1&>|#W4!&)gDBa(
z8;wy>IJ{^f){<a1J@+g&k|5^&?hdRX2_>#tMRJTrPe!^K;lJm#xp@7zzri*Ni9-t(
zAcACdghZFUX%pW1-S4pR>1WIUy%R~v=wu7GYX1SOo&5wJ`QA0iShE(VNn|}KsfGa4
zNJy{VbQ5;I_!0&vAT;uSgktARb}m}@&cbb5QMGq3Vo3Tj)31KyVPhfiR#jk#74PY+
zOk)x0OiDmD32pDIuVBy1FCpoj6=;u%Hs*c_CN2N#7OBa+8+{bJwQ}UmH)6r>@4(T;
z3;BJ=&=hslh={#!zJ?Z7*ga_}#sV>y!s&tUe2Ze{Nq+A<lJi{i{K2>0#L7n=#P7cT
zRs8-N-$2wt5*o=?0}&+<#u)dWe38I$1B)oEv{5Tp;-QQ8ucydb`^Y0GAo=&RAdhBe
zo9>EHrgLv<8cwldXgqubB|CN^f6G?nZ{3E{JrO96h(HC=%rrTZnQ7KykjOesLg-?=
zm+ab&<J-2Q?N}6sS<$<-uoT5vAFp>Or%+TKMD~V_MsU<c9z{od0{Sy4n%E+jsA!Ik
zF#|RW_|EM08*qI44wUWLgZ8*Mwtn-OUbz%|*(RJF@v(@eSlaXQi}ZINdec&oN&z{S
zVr1@(zsBaLpF-qY^Ra!-bJ+dTi-=%4Ex+e(-1X%z;l*G449P3sp?_J%Dx^Vu$?vVg
z8^5~^bMN>KYN8@>CNJCMWn&dk_kby9DhowGUQqrIlmWZkj0*q_g0$f*uMU{9?ks<k
zpnLMCk9>`#$Ty<F%RJ~S%%f1CNHC&-*NO_5Hd#i<&IpC8bDI$g;oHJ56f|mDm4hmD
zXW@1hbiy}HOnUwj0Kv!)KouA>(HJXmmwtvgISKh2*W>+J53{xR5XtQg<ZM}w>LUl(
z@?V23&p(S*k3NhDlE03REPM;)d-oXPOd?6n`pI>;=X>8ZgZ2uyZ(}Qe8RoEJ|K(@?
z8H?`vJzKYrBWmel5=sPHlJDbzZ+-*MUjGy9r+-K0&%@CLZxL+4lMLtS7XnHAy{Rdv
zIj|o)DKsAc{xx{?yWhb9wm45yh^U`l3lt6UTe_2y&~!8s$tzaiv1_iu?f>xwY$92o
z%Hn;jWJlNn8^}yU<=)+V*PGb>+|xMx=IbclwwdopBH7ZfB3V{)*vc=aXvo7T31>7v
z8=dhnIJ)R9JahfEnEk_R_+3jVN;Z?gUcw;?fYVtSDBiUVPyg(C{Or^JjOTy;6O!Ds
z*!A)Y*z)XC=J+t<GJn&09MW%PJa8`}v?3(qVU+3NEh)yRh%YbaEc3HzQA)TdpYU5p
z*%Ghby%Q00o;PSaau|I{iPm@qP2r^IP?yCS7Vtq?VoLQ3nHA<&GDmrBG&dJ64S*zZ
zyP5W5d3ol3iGs1xQr=SpH{(*m#Krw6uZ?QG2l=IQ-akyZC~P#~a+LnKM6j$>WEqiV
zYLFu2OnSP(P*xV)%wKMj^$_2ycc`1Ij_G;ujk(BOzZTtzaZH0Pc<t9W;QCMgJ=6HR
zSi?NF=cN}6Ha|5R`{%xltTpc;ZPhz?it+#6!w;hA$U%yMY^HkxcF%o@BKBUyt$qjn
z<;7;O=@8Ron8MIlWh9mvZa>3-yrBGV%D_Y!v0Cy0LJm<*Lt&iMrwxshm;%g$X3u=<
z<*~1j;Xcmy6-YGDy(phTA=8N18KH1>ZZkq5d|UX0!jWSbNzXR@n*O|iP&hC0OvU7z
z4oqd^eEuTgteo;4m7^-lK!vI69(5P6Qtf4>TSX#De0wQ!H>^c#Y!n7qQH`+TJe|%A
zw{<fPkz8X*_98tErcz7Y#R{z>E*8g@SR?*(H>@`U0?Q-z-~dIyy2od+1-Te0tmtd@
z??oS5koAWSVE2nJ;1~r$`OY0E-?0NFTetA~K2)+LTC{l+df3t($<D$ll3~Gy4cPqT
z6FBhdtEkx<K_VmJsgIiBS8H4tpm-?Tz7-oDn}s!xJdDDP8%)b`OzQ;XW|2TsP`Y&!
zQdTTS0R>UpF}AMxU1JmxcE7NvK>kuBWM^VbV+kl8G@$H6Vl2hYDjZulpDpDbs6DWk
zt@f>`-nWM>>ol~*9K!*U-&Tr(+>Pr{8L^9^WEZOU??K(ceY`&cJxTF6LD8WwW>Z+5
zh>qg>*m`Fk7@-J|nOW25e8&qd(ZKJMK=AOoTVjsk8D?1P_U%R1yYHfy-*-AO!94Hf
zeO?l^(o$saDYW|8UBnnG3U6R+ijUU}OuFY9v%LD^VHPE_u4}-bH$UJX_bv(rwaC?%
zuX`mjWbKeOV}vkP4_T%p+!)^y7@Eo9E!2198PVY?)F4fY9ezhE1y0_&_t8ONr}S+*
z7Ks@BuER4=BZlI$gu<cW(0()=V7yUGwL~64UurT=QB=e)T40_%l^BmcqG-!TlP2j*
zn-eLC7%pZQO8DJ*`nD`1vRusD9*P!~Nf=Dze^UkmFhW5H76Z=m>VVZK2vG(nLH9`n
zOan@L?U@gKOm7JXNH`dG<qHZn3Za&$ND74mGeY4i+-8JA__hxq6etqBENre33WdIL
zq0oBxC`M8<EVE?}D;l*-rb5p2U|Kn0hA(dd{=CW8$KP+C%S_7(e3%)dkHphULL1J`
zFmt%QrEFcYVsf#fI?al>`N#n@9X^D9w!+<N`IeWEgz^os_NOJIn*yObA>N3G0sT}k
z#Y6`yw653~b8RRi&5-dhTl!tm$Iz>LS)q@pTYyBa3f>S7D@dy~oog_dPBLceshj@j
zUO$Q5E0Mrw-MOkft^V9Tik(J^jV88Q&m<=qlJ&@}&wGX`Bsxh>9VDIsiWOt#r#~+J
zMuGi4-79gSDTRy^LmV;zQ!I?KqLx*nKO+@=DM>h^H3j(HL;Mz5EP6;}5(6$-BPdMN
z;&n3~JjZ1!&NPBVB4k*DB`Fd{86J_BM=f>|nf0zhLr_W&+uEcsx%HhQYz=<oxAgG&
z#)t?C*ff*IKHV>fSk!Hy@7AwgW@KQD@9|`da7b8+E0Ja3*h@c+8}or*{?iYCZh%lF
zTu7)Mx+x4MToPR(U=0dom`C{zrH{VBn`>P&Zps@HBYf7xEz?I<t1$|qffVMGm}m?$
z?1sqsOh3h-M9%;Pfxgd(Htp#LOga^qwAQmD{2uwK^sU*w3pEkD(UY8DEJ9<9bBQnI
z1#hnMHH8!7z{{|nmG^`5zsgK-xlvpM;4H6BOuzh+>>1{1AxB}g1cHzG%g?+7#y3pb
z$erbf<*51S5tJUBo>1`kwA`-Ws_=|1-~rD?;yy10f=53iJT@*A(o@qIgd8+AG@_%e
z-3S5gB?g)sn~XS+fUre^+_bN&sbx@ejZo<7=wy&26fE)***KT`)n=2NbM?QO?cCdp
zPzc|4(LzD%0jO_wTqtN6XS<TfzI@@!2~>Q+m0gJYobcyZglZ5VOgAefH!CR%s`N#w
zS?1Uy<m=wRv99NdaQW^6Rq`Tv5=g$>w3nOZuDwUZDH53m%)K(t^WDyC7A&F~55LYO
zfb7aYaBSaW-LLcW!;S|D7`2uK(^?HWR@_)_+FQpH*Umn+M2khNCVfOUN-xLWJ~m_&
zd_C}tkCnKW&@pmEA~r-c6YvM%biWYT0_5VL@1201KI7>U1mmWAC=4WUbUZF@0xf<c
z=ol^uItd8HyB*hxW2K!Pf75{-w+6x2LX?vW$K-T5FZfO1H%Y+xB#L=#+|Aw+4H8)`
zk%v)6p`c#?ol+=xgM|Y3Zm$sw5(-|A3u9wL6bT~~3}X}uCy<()Vyp_XD2VVS3Od_6
z3~YfQ5uv>Vgzl4wkWi4okWkRQt})lRQ1JS^=6493g1{CDy7o~fq;PICLLq$H1quaE
z$aNH|_8&ycp-2p;qz5XF91B^OFZ`xr3c_^5EaC~O%q=n%NsFAbtO`Fb08{zPEf~6%
z6}ZRVJKZLZ)l#yEOnc|?WSCZ#5aODFDpwJUX&H+|b!-u(-Qo^*vs%!)&w_m%?B*08
zXA6y~-9lYg_)H5kIBhNzCT;Ef7$A`=07@gJ!}-$1T<3k>%uHhm(79##vMe34pqPA`
zEg>OGi$v-~94qfC?Iy+9R4{SsaC4TC4}=R$pG-DNBo_4D_OaZx54aDfrK07?VPjF4
zj!^LW)S_oiD3Rdd-sORxVnIT|@8hvggzkcybzk?16G%%*HK?knG}eNKx_To7ME<sQ
zK|;aqme6&%X>WHu$bD>d%m@W1kvS23eP)|_n-L1(+rlptvh%D$FEi$4466lV6KB>$
z1?0RpGYGa@;2Be)6W*K&_;NB?31^%iIqA~|a##uGsNxF`{4&$BB2_DFDwunNzV%%2
znePt7K|nBF6y#sP?@0s^7BDVsLb+JTuP{UL?o5l&$e>WjFnc{?#E?zo5)}Ma-RI$T
zkNgazlQ1dYUksdO=Aw}~HO7Sk@6TX4;WwK2Gwv!gSr|@Dxgeq7_IN1*yzsgx4&1C0
z$9R>keXm<x10L%c-<Yv1be}xQ*JK)tf`ozufyN%#V-sv~V2?|%g@X3>7zI5q;ozcB
z@OgdX)&g4;=-kbB3p%#(Q6{8tZZkq5d|TLrLi52R7)nZoX&o41RiV9n;TN(dVBEFO
zm<EFVF%|Yi#qH0Y8osRbDd7)-srbSKf2IZBG!Yy}Q^CZ62<c)G<mV)UxEP2;E(Jow
z^TlA==|h6Fp=ZoD26Vk;RNGzfE!^Vn#R+c3p|}+(E(O{G1%g9yhv3DfKyWD#ifhpp
zcemnJJXoN(Ysk&>zw5p0UF)v<4L;<<IcH}7X7<eN8D8l(wdv+tE3|AuH`jg2L7jk&
zH+WNF$#j0P(x5-EQ)0+GJ6qyI_6{A#yAE6Rv10Q?5$bXr<w4%_TOC_p?+KBkyPh(}
zfbsD!>vTv$Xn1e=Rr53Ce_%8Dc`=r8^#C%=zM*1c=B|)qU}G6^ESV5eZ%-L)d=)Bv
zgi@!xpz1^Rum6=C2!ZPjOz_71f8axok^eq+6plINxyc_%qGw?6w?fr6Ut8b2QzNNI
zO%Lls5e60G3F%DeW_$X{8MEFi3a+2y<%#w;oeZLn2L3Na1a(m#-=b5p-3cl(EcmP-
zb!`q?-@Of1(O`=HCKnBAHn<bYvGcD>%=^?%<4%~wOX{pK<cYhjXqVFFE3&D7cJ0wk
zb*d+4J<On(b+@U~M8pJPXN=!PF8+c}|5*9z%8w%d<BSryg7z{Wb(S0lFdNHGg;|AT
z*;lwP{WnY`HuR>E+|$P=|4@+zyBK3&=v!iPsw0*u%3F(W$gUYKx_>~Z^e4H3?i0T$
zv%#Hy7Fs@zH!zdjTruB^BF4hOL8Tlqx85hbdLDw%pV&y+)bIb~_H{0@5xtCfgY0$P
z^#!^VifYTdxUYS?K1pcgeVt%mV`sta@zqpmfC#JTN2E#dFfd#DO?AkBZtlkUv|+D5
z3Jb9-M-Sc*H+yPRbnQIcO0?$}*OH-pLYW<;_*C@v-Ythnp-6rBYP!x1cd*~fwmmX-
zWAnmQ22EC|T*?^Fz?>%Y&36<|&a+D(HbY(lYOnc|#JlnLx+vc{Nk$2d3g2fwGy#ms
zunL)Z<M84wtjy5X=u9|dfpMwfXvuyk?)5^6d3i{M0}Y{022RFlqD~&NoLOe4o*&g1
z`7L!L8c`pb!qGy*BcDb_MwR4%G8Y#YMD+CFr6mK8)%A7fVGVMO7!0}eNMvQM!%2xF
z+@(z-0tH%Xa8~Y)XQo?B!A+Fo`an^(`DFL-JW{|w#)gf;?g@S?i!X3c8r2u_;Xcd$
zV+G?djGM`wNR>myQ!^Iq%Ea)G7obL;)V9SSRXgi1_}7#>_1R9ZWO~O1?`83%?~KYK
z{tSvWV>rJUuG}+qm%`nBPhu>xbBGQ(8of$pdgFzSp6q`aa)66&sdHu@iE4CS2)Kgm
zE4_2$)FmNJBBK9xROOkhK>Ye3gByqGar6R5;pzJ|gWJ^VlGQ{QrttCtnn}}XWp$Nc
zP%7E0!m1)N)`5ZHu|MyOjdSF5bcp@@{NnhDUjDUwWy6g#yYW8(q8&E6LpkxQ3Woe2
zy&@oL_-^|9FRQ^ssBST5cCl81xc2U&*0{1<<fisG?Q&Bsvi%);OsteKRYfJ33WBhZ
z7VT$NT-A_3u|%tgdBgL_Uc(J<fY>%m4$>$Jez<7k;XZMW9-_^TW~bA7#~I1y*pZ+;
z0z5W~Tz=;}gd8$%eY%&SERiZg-)ttwNqNG<O)h<zhRp>DP~{eK7uuj~p1=v<U`&uV
z&$}mXnw=%Wv9YoGF>~1#Kq=-$t@-<!V|e7<XEi~055e~zP1Fi%Z3N$lio|ONroO0M
zR72w8adqI?rqUXzl#}l5!Uuh3c6LmrpGQZI3TCLNsM|X>xDi<b$g4PN_JAN;ZgDqc
zYz%R@^NDic$htuda>a7Ed|zjn7-{xfugP>J-PoQToJ~SPNk<ZN3NA9XV9TvvQ0?!$
zy__VDEPeMp`2xr}v3Gu^II?|Q&6y%s+7>+yL<BvFZ%#7$k9N+YzVcv=x6E)+P8^cf
zZh!J!kJOXO)8^m^p!f_diKIIjaSPN+><*0a7RUBWH>ZsSD=<gMV@HG<y4r1y`$mLP
zjjMc(m1_VfVMb2P{*Cw^i(~aZk%e`DnNJq?`dZjVBczqsv7qU;WGw&h_j@zkmocbD
z9A8|%g`beJ|M9~^%BBPRH`$qmgl37}>+5GQ3i`*%pB+X0=K_CV|9u{pW%h&z2GVgd
z-(!Ve6yoP?e6P1G!S*%&w21numE3s7Y_K&Nz7LKe#EP&&MPr_Jd&Z3Hh3T=9el^8%
z+eqb4ONl3XWr#)jGEq#EMKkER;0MmNeB#m5Ad%~!su(n25vc*2LMalR6KBoHIwJq?
zoqP~~+{Ge$SFRl~&WPNGPp89PE2`Y0Mi%~SLff=&@3EvvXEq35R8G`(8lpJTHX6Mk
zJ$DJFk5DhDHVnG^0Q59fdyTQZ^}Z>XK7n51Yf9RyGXlKcQ!m4_x`j)1mOH5R+8(3v
zcYta)W<z?Y&v-=svk=R(&5o5V)9VM0f<o}Q7%u+xb%<Q7<`;X%H%#5+xFX-PziVWK
z4f3nd{#q%>|4V{TcT89Ivs%vk6S;+@#n2Gjn{#nu@F3d~DkXaMrcL94Q>;)7Ql&}~
z@Ov>6j9g-j?EJ?@F=7#$bjtr>tDPqUM-EfH<|wJvU?n>mP$~K{6bW4%jZ;9SG*eup
z6%VbalboWVQ)kU1FqPt(29Ym>Tj5G1sK2m4-SlFa$whx6L`R5kwx8;nB~xaiOu%ei
zeY>-Kc+qoC+dsH=`n0+}T*{e0!dOSzQg}egKRwj3#MU#ozbRF?U9zgN6m@4OV(A-8
zf#>Iw6Q1|QKAf(BLx&5$%!7mQbMjv>ocql$x?rQzqacU3+J9gWUxDT2x_bDf#KPD0
zO5-SrVw9DYp-Xj^d(EMWI@&!9?!*TUe8da|F8R@4So7Zq>vAW4-Kp-0!C+!Wrpz{%
zmzM{&$ZVltye?YZl9YwS(E@jHTm*g`ATM{KprC-%Tbvo<Buj;~?)~EaAgHa%K}JUQ
zqp9hZIah|><6KrWF8b4bCJ~N%Egg1V6jF2q^TX<M9Wr;-VJ5>kJbX{#g;y-uSeT7I
zoRW+J#^HKNQ|ER@DpO&@2mSVYQ~Spkenm<Y`&Ub@!0aA8o3o@)v^u^Q*l0AJKX{wX
z@;77RqrTyj=20_Ho8_cpn92)EontG#z2l(Oq7#q2So7BzmMF~%=a+i(1@0WC7)p#2
zR9QjlhL$2g_glB%^X2Cavv8it&Q6)wPz<ZOYkK5rS`1n>Zlth{1``oBh8&EED%*31
zjcG<2xi)Y3&!2b53FE8-hG16Oxm|uSu`laRE{&|_gWp}vv-LR8h6?pK${ybq@EK5k
zsre<0!k<{(_)hLbO+lI~#3$B5aOvSvXQhOPtR3)9f)4Ha97!f&D8zexi3YzrsLn+a
zZCGL0Zmz_DR^M$4wjRq<%R;E?rgY4CeiE5y4$-9A*DXs7q0Am-a+w7hAY)QIPKfhn
z%gd3ux4mD_Xum~DUQp)gS%xw(%4Ee8#fFQ;Bv>&sNig5!Tfv-DSy>Ci6r}|vB%Hk)
zjnYLNb?dl%vo##QFtQ|t3>$|Lu#ziY*lWh}D{_luE&bFbj@NwM7(E5NRi`YgWDJRC
z#U@Dl;Nv4Yks~hTteN?j*Eu`k{d+$fE2|&P%^)fKG-ow1GB`=`rlX_VMw!&oF7~K>
zpZE@1*zUeJG^qT<q{6Yp1m#Bd)>5iDW%k7J;@e1tLCKYD{BTBZj)i5}0|Z}_Fptzx
zs>cp~k^k^wh<~u-n=?caCqfZBoU)muuv7_!EBx+D?6)tCfC59}aWf2|JH$#GA-iNX
zm-OZ%;hm{#n#t~a-j&@Pj|p+uFQBap!Md5R(@&4pG8HwJcdFwoSp3}Y>^NUnqj0*Z
zs;&;GrDl4dyd?T^TeA_+-DBRBg*pC}_UoFSsaMxY_Gt?&;C5AVje?#aVf%4YY{CT)
z|E%)DS-Lqwfi%*n(RDwaxQU>z$LJGeGzpCXbI3)anTen&A$+@WC5ocDElBJMa!YV)
z95isYIV3A1b$`~^$E6IeX2lTzd>mQ)o8R!qWf+CIcM4`oMMbR?CSd-Sl3FQJXT)6r
z4>?K~3Bn`<<ZOMP7ko1#E0Hd+yT4m$kdO=3BD3$3Tq*p)=fuzfgZP&`m$MMc<IMz5
zFcKL0ZN}FsGZtMGu;P5bzytTv>P%s=1L<gd!|~&XlnTx+aQnExL4lyFhCJ$%wu4A$
zgTAo{ZRZ|ppSlkN`gS*++Z6!|wA*#(CYz164c;y0K#6&!f}$0-!wB-iy#@}9tWa<p
zxSm_gVHY}Qx~_znQ@UMz5)(6TE=I9y_WHaa<@<QtcTVF1NC5iuxjuDM-jtqF0_jHj
z_4GSk?k*%Z1Xg`^)B5@fi9yc?rP}bJx1yA59NPA0J9c3ClW&vFOA2N;Bi&0i-J3$s
zHl+d_X&n6AZXa=nzJ29jph@QiktBwHF0uFA8*QbPq+cOMpW2I-kLx(R(od(V4=9q&
zmA+ljfIXhHxilYEx3MMnkdhg;P=f!&gob#yJKpgWxL(XBaop|vYtY7@47!I!@@=@S
zoRyDl2(9|uv-Zu30)=VCL2F`?21%jVP3vN`vYzm>e?5m$q|91?RyQ%<v&eW?i~h<e
zrFX7l(MJDW#x#`N^63GaT^Y{b{l~Qr2lKTvt=lXJQ3BohQ<%^K9fZzj6X3BscR7Ks
z6@2jcjD3#JuGQD21MW>+=!2kxhmp2Qs6kf|6t?)zajN=fX&iI4Hc!S2=iE!SX4o$c
z&E6!2*m-P!ajfSH=_zM<Y5a|k?m$)4x=fK#$*HZLcj&1OTj%ZFRW>V25zm;i+%+3R
z=-;-@WegQ{!st+h?sU{l7bRFIMxGs;{nM@4gY0&a04;q??>VVAK0RF?xEGGJilnF^
z4EWqo<RtL22ilO)?r}Guz9B3Xxa%KPxM(V!({4>WwH^0TYh7@Hh=2)e`)$`>vkmGy
zQ73SUWv0Gzy(_JuL9JQOyBNKc=<FJr>ppS<<E{uLa;0Q`S}A_wh!}2Ki8r)u*HdRl
z@r&9IurU`z3>2x8=lAafjHgT=1QNR+<*H%CCRp@1W!pDLjf|4pG~9Gn!k~nsViIV$
z{>ilZghMEG)?F@*Ey6qa_?3nKlW&slAIbe&`@b2MkA=xR$`3+O9Sjd4KClGIlT56z
zAo=I+b>c_D?%%e+$h1Sk;JZFODa8=(oem0$Z8v*x?_5AG2LrZIhKN)`fE{Re=bX6E
zEbr=Ie!emXEPJ_gwv%x}4`}yr{B>(05^!D`<aoC%xgjDY4eSb7o9{ah6UAqD78l!^
zQXwb6XD5g+g6?Gx^$=iA_J{DSe%O4@N5>^M9vAcdCXIm^Ns2zZ(+f9}GBuxJZCaCP
z_j`2es}opH(g91!YH<L%9>V&<m{spq!HE5{?&4EQNc-`o>yx^yDBh%$^uO{~RAm5^
zsKa(@-&y9J(EPflZa^5(%gDlKQM8(nzpq2P56xOa-AKUfa?})+ZoY+t$J8VSF{T7g
z;5kN|^hD?O^FiptVGVtC+exdQD_`?LNwyY`u$;)R<w~;yXaO5e#Vc^HM8ReYB0)@W
zJ;1l<6|*p9aLu}%_eH-7eL}k!t?$t^v^=lP<!)fbnX2<@T|KhzG-&Z`UVU9SU|Twa
z0Bq`Ze>VP+o)*}?w+t;ltfn97yY5ROR(5H&6Z7s15psQc;4xlIe8eT^Zsu^i8bmFe
zmgR2;eZj>f#N*R!_U-S{1DzAmQbXuYW&PHK`xNM(y3aP#^zlq7ReMV}Zc_SSN*$Ni
zZtm_okVyh|diWrJ`xR5A+h}(lk4~A;lf5U1{E4ej8Uv3&|4l*n*$)0Uo5Hx5M-ko&
z-lgr$E{^`14HvA1-8NcVAI}0JLIncFo*-0z{HxsO`>7}yPkUdirv;yAz`jv9QGHX$
zqDn9m&h^G;zLM?i*L+Jc9PLu;0d_2y%$Sfw7g^Bk-xxQ30L@6RhiSVHXs6VLrql1w
z$G*UfcK^F^?dQ9*a{9+<XoKweb|1z1`3>~hr^5mCV*P#s`rOpz0W!li^;^L)y)XA6
zAmlZu-PA<ih5+ui$|z0(7o&Y#dald(kbkvlLjf>#K02A;k>Wn~^_xcMwoCBiS&W;-
z#fY2kMGIkj@Lfe9j_mCKv|kiJ9a#!7Bjyh^A&%&@eS1gAG)5#t9FOLzDa7Hs7`ltK
zm`(!%P_peX9sbS5^DIa-Jd-Dzct)O#|0Er+y>06Z+DB?$8}~v5pdI3WyY7GLsf~~i
zI@DIz=p2!Y<h3uTJ)Y^q?v;RO4Hmk(v*4=q#$YRBZUj@(1o{2ETw>(wdP5s{1%)0w
zcJc>olQR2vUhhF|Yo5E$rpMNW0<5eaeL7%keQOzzL1krh*IUUA;Q+^e_Vv1mCNOH}
zrrvf37(96j=)>ufUKfW}ODoO<I012ao!dW=@6`?uu5VTI1YE5dxxy!6)jxr5S^G>*
z0oS9fr&K4MTcgm~MWASaTh1=s^U_eHZRb_@8@qF_6=*R9+nQq1K(l_B@##;=)}HFF
z0c#e@V2q*Uuwu-H>BR6SA5?95nOAEjbBEErtMJ{WqkVX;%vevE(1{4sGGA!_fx_FT
zD+(8#6I@hCNCtA@db_>km<olZX)YVizs5+8uhKZoe0jsYb_M)_Ain?^dCa(YPfyy+
zNtv5?=y?=?w)3W#kAN`XM6VCoUw3v^PPir#@N^T_H{>E-+nbNt$F3A`vH6FY08f@?
zHQ@4$iV~CR>FAGTrogJQi!^`0PUC+#5_gy77O)Y>73gYqclGAR1t5bfO7}%f3@U_4
zfS)H0T5+8`rl&r6%mNe0A`T|;HkuJ3(DE9YH|<aTDSefND6+m+Y4cs~+G<Cs6D!v`
z@dW%NSvq^B>@7tt^_MO_arntZp|y!$;cokc5OlNsMMia8xf7Uz$wvV1;PVq3+KcvF
z-wIPxza^5L?QL*j1WUW1Ngf-Oo-s6mo(3p!v2}LzZ4wVG4c|YzR_+v`eICG!;tSq=
zhCX9<@;|Kx-d3GO_(x(ko)r_DhWMXS0oqHU>mM^82gOY9T8M95zG9xNNnZV;X!o76
zHYbpt2=(X_Ydn42Qlofk&)6V)+M>Ga#kpM<4LI)P!zWxrq(Ny20RVQk4N6GR(FimG
zHb}KjJnDZPyQkx%O$!YuKantspB9+C3ck6Q`TDo?k8_+_+^{^^&Cv9tIo)gGGDxwg
zIwIFE;_^n(d{;d4`4CE`YCw#Bu023^{%@E%0Rr*@+4Wxzfe9u%E-udI)cNqhvWTOz
zJ0WdCu+06=*>H+B9#{(L>UZ1Pad=N7(3qh-S_mE>y9b0QZ|EV_KBn_q#$A`%ujh{f
z*!GBr5P&S^Ftro>pd&*7dWhdq4Doh@GV&*Y^KnioY3N^e2puH&-#zr+7Dx#RKG}sv
zP?%ByrQ8ERb}U%RN_3t(R@2&C^Pa#2XMRfJ@UOQo#5cby0sfT?w1CFyy1=6T!MXQ8
zqqNAhs#JO%VtVbVP$n3t*!9;VESZ5J=L<;!CrNH!+okG{Gr)B8Kq)^*(D^H1RAJv3
z^QEjHke+JN=4H=xq$M9%C_F=?`<oHy;BFoI;XCg7houh*<bRh)X=&W9b_)x6#U$FV
zMsfJStsx1SSN)uD*MQz6eI<EUG9@^2`l-xRDNf?BSm(4|EN77T!LIoG%~f>IFh+|O
zO1)2hYw^Z-q)itf_l0BZi8&S%F2%~ZrfuyB71DoJ%=-=CNn|;yWc}H|rC+Z!Xq{4B
zlv{!^2K|T3$H#ToIOAdr)bO;ttpcrjLeVKWmCys8c3d6j#A~`o=6!cwlCpK^c&Z1{
z)0~fDlae6Pgh?Wx*Q_{5mN8G?y_R>?y}eGE{Y7>GX}Bo5&eugEbWsDJwDm}iaF%e6
zoRCHSh?H5Mb!{!XJXYk>AwN`K_zx1zh3AeVa7vnb2yUpWLUBm%c-lvBOwgt^u~2em
zoch-3*1jBh_J2i_el9uS9-{HN>hx>4{;Q<eGZWS|J4R?LM<x%~*2E@?Eb3yk|Nc>r
z8;SP?FV?naTuUvx`@<)wG!K`d!D{n(T)o}m#Bk5ZCeNj|un;kt({71^#K&~@iw&Z&
zI$5w55qZIT<#k1}L0tL}iILJ;>h^g{P%MWdl@}n4bd`@ZKx&j>sTZ5?OFfP6HLIFf
zr<V-+q<2gj!qR1G7I?NNmk}X;C5AiksxU~**HKJlYro7eApy1xd?g#GKS*PyjOst=
zw`)IBck#Yg?W3>fV0*Z8!OEuxXKexuh+7Sxi-ge!eXm;D8idZHh2&h&=!N{d(~WP(
zOPL&$G3T#$)^Pvkxk|Ke{@t`B`uUYXL#*XHeHGc!zuP+Ep|Rik3i@&Xw&pH1lXR;u
zBywRBx4_5t(he>>uAGU-qq>Kvns4|uKVg42g^$~n4T`&R1KLF<2IAIF{BaLzN*F5z
zET((9NPE=~ITk4VuVHqC^Wn384&Q%ewv!zp@ocPxI>OmtLO6GK2|oP@HFm9|pY<nW
z3zK!kuP~zqDJ?JT(|l4}gOz|+8eC^;e)jBlF(>3^iZJJjK|SWUcIi%g99}u5K32}+
z^)7ON<Hh{8_RmH=Wn}(vBtVQi*r;_3lF;c3m(~2){*W5kRR;o3HFqU0#lv3pd6f_w
z=@jXyH6-P|mHs5wS}|LR+$<>lJbE@-$NXQ$ho_v-Db@Zos^0gFuZw@{9vYDWp@#&Y
zw?JDckUsDKoCT!<og83m%RXM6r4l+z!~1cxr3IwUueSS0wWVdG2()EHpmpr@bO3*g
z2<1GG)nU6A{0<cKl!OhATSS7;87S~!{lEd{*D-SGS7YJjl6Lz^ym7R!eUwmJqH@xp
zsT2Y@ydNjk3uM0wxc8{Mnc`hmmbBw@x}6~g**T6;ls3)}a#bzUCUkv&#!}16ZDrG|
z^yi{l`gf`7z0#pq@A}zWi)PB}qO&#F22zvuCoUuI+w8@MtzT}%N98N!Z%RR>);gcd
zl`q6iBIn^T-Ojry{Cba0a4qT5+d?VC(Hx()%g8=U>G5g}?BrT(QVV1ca_(=KJbawL
z=8Ut1w%9@dkl?*6?8)2^*r5L;7)CtVNe--Q%Q$lZ+kOLVth{K#ZP>h)I}PiQpR{da
z;Cr4Iak<75Kd>rBKqRFkjglWV(`Yo5J9HAqP3eTh{BlSNzJ9t*4703>yG`hjFv-h|
zMvExn7id2D=3#Li;7|@-DjNsKkHXU|jRvnMttW?d-DeCV;$K4AUzL(w{L@}mHN7u^
zrOc!*zJ7WwJL;OYAmB?Y>GZy2BW^spP|r|_Hqct^V)S3UF<<*t@7WV>p;>(FMV5}8
zw9xCH2U48Pwro<@S9*o#{_cYN6WUVZ)R*i48bIJt5)_$?1l}zxn9_7U{5GZSyx7!_
z<XgXufUZBD(4Dm0LZBXbh}E-(Jowewh<2d+-O|u0K*sOZq|b!D!{Kh&gdPy|kgyVE
z<lJT5yxXYI$J4YfNZY=<2i*%3CB!6HeX|NOyZ+cf<J@lE{2X~0=}^<<-7nntdl6lq
za1rSL$MyQRKEA#wsy?B<$z{)h)LM4p|F)f<{xh8tzQ)4FLM6d}e!KojMf_eg?fBT}
z5JltC>ehUZBntjS5#V7G($NyE6#%13ZnrjWW}7sxJGK>MrC0BhB=z&W;5$R5-uHhe
z1N`oeV6u|GGaB0vA&*gff%oc`MnS%y{X<h4fG;vqOd0|JJAl`2MRwOX3+#iPAp0ZS
zz{@M4hkt+5>ill9upf?FVESk~yGbBg@qhSE>vK03Xgd>|IaZcTfI_^aKl)U&mMKS7
zc#@*x_ciq`UhC9^q;7R+J|y><EH`tPoa^MnwXR&g8h|ucEL&q*(?EmarcWhr^e;||
zZIwrE&gVf{HeJ@Mn$DL$-FJdcIMW`7tJ?Lvx1s8$zGinz>@p&&@H()Tpv1_*nye7x
z;^E2h)zb;KYy*$Xjn3UZj?c$c>2)LMNkSV1ck>x^`$H$i7CNv~TaI0GZ@E9v0j!So
zw$mjEM%O#up%l<&X<0xNA(Rwx{+*=URMtp3*eRdQ5w3Zj@G~{DIb~Y5_zGwOUvJHL
z<Z|TvMQwvyx)4=1!a0spy0Hx(|5BT0&{6X^t*n(xA9M#jIJWD2+ReTIHvD5|$U{8A
z*!w&eO=N|<v}6bmNegA<{I2Kq2~UF&k5OFJ%>kfO>r=Y*OUNx=hOzsI>p^h_-f7^e
z|Inj8-l_k_V<cg~CTicu!t?f<<>|LTpW~~Mnfd$WgLUCWV<D;!<}!CZgbC0MSz})$
zdGqSD%|dPaVvLWTw`;5ZVEu8(b|%c2OTl&bvBr4UXa1wDnczAp<>hRqOuip{T`sWt
z<ldyC!U%r++4uM4<9d^QDK?S~s<4glw;TKD-x+Mre(*)|7}SR^sxif<m(BEU`;su|
z{iCt?K-W?ISc%MxY(^(+=HS*k!&F3CFP#v0-NRY^d<}eF34XYND)<C_c>us|WgoMk
zm$v~y5B%e(rhaCiGZ;NB0b&bkSDTz&6AaHkpgThj&_qj#<C`7jttOq~nPuW#rnhUM
z`5*FGvOBEDwQp3u4D_S5;?AXJrxG<<EFJut&SXFwFYxoHmuDB_wj~pCdss01=o2;e
zp?K&KPngvyd(aj;oA{!vm8bnAGEC3Wp9(n*x^0W{Y2T)sjT#E@*!l%Apn86uAW$B3
zoqtyc#cmim*MtwY7LuFkvJC0d_xvC_l-_r1b<=K!l-SN5{rs>D6>Y+Ocf?Fb7<ino
z>UN(@!TKD*7XY23=#aT>nbgd~o6q!F_l3FcPvwtfR^c^JoqVaPF`*L0m_=6BC{7lP
zTqLilbh_4T--eTB5XUB+ME(i1`woR!^2^{|LJ5OGEOb6UZH6qfYUP!Nqbz0c^PaCf
z>F!KU@6$UTK(_6za-FUv>#sUN<X<TI*_#p1kJ^FoaZLMwd&e3E=>tq*(_O4oF1Y6;
zO#kh;E}s`NCeWgpYb<lx=BE9ke>#8rcQH}&xQ2e__V?*baEtfG<*<T^f(-j1wV{UJ
z0~N7)0Gblu0rJEVC0L>Nu-nO3{jY}Z*R+1;MVemC?e3@X445F`;p?PZEEd+|Kf7e}
zxU1Vq{eeV*j5_k&nJx>l_(SGO@G1-KMd1-L9bREa>a71pu*;s0lpp`c$34q6G2ll_
z@P(<?2uO)`R(1|I?1uwvQjp%a89fcQh+%TSqkEUeFYY7H&sivtvzXI)xAkrI`-Gmh
zv~Xbk>^Oue*T$_-XUs(@{GvEqn9>>$p{ZlrXy>g8)qA#y&xmV)`*dFBri6z1bR3$H
z3JHz%&-7<3(D|$iP<h<*+vw~IRK4sg)95<G?cxu(t~AZHNgvJSOECBQCx5S3`!CaF
zatKvVN3!nq?c1DR4qNQTPK#>we#_ZA4H;$k{gm?$xAjHs<qk4a$?ny-^mE|G#L}t*
zUs&h!Tiy_g7`FwNC_;M3g8)luG7SSNo-~s@@5w4tu2sUSvEM;4YRkh&9x@vl3Vs@j
z%6ll!`yQ0S#e(L>@GTl0MUHLcvy|+NoQ%vx5?DitBA>w_4b-xCTtGDUu47JHdRFQ8
z@jpz5UwW))KX@ubiAqS&Cxv(&K)#GPgYm72r_V__|Czb0Re@uu9Ku*|S-3Uq&xpYv
zkO}5w{I!R;2pf*TSs;ck)Hl@|PeFex6>nRON_Utn(U8^J@n&#SPlb$+^{KI`!^z@(
zARDFi*zh-7HctG}^rn}T9%53|=r|c6Sd{n<OY>#Q*iqeR_pJu--ld#rZE4c#M!98k
zI{Q}1e3+!Il)1@s_Fe<0z5lp$r3%f*FQ*JnfKXwIu8q95rs{;>PWHZj!7Lq8qVI{9
z)nxwJ+9eIN#tlqe<}ft1(?w%UqWQl2QfghorNt+d<mRruPE5!f)UO~G9;zSP#2PLS
z*b$?rRim5xCiP+aw58RvAaA3Z&Mt#!YB>G*ZD!EXP>>^&ELpmMP!ppIG7s@5++Lw9
z3EqDJL4OGOQ}``zUZX;=`p{sK@>IlscDpKC{uZyuOh*I~p;1Q38cFnCQ0gTaD^qvG
zeb@6M;yW3bO2%5{rQ5M??Cj_B<0frhEnae*3=6!(7lRu|Q!=PHl1iq9gPT6v{I-e?
znG#`tPFu1Z@l-|K*EahNyimPG_6Hp%n!Rh@35QApN0%=D^7x5QvVqqL5Aq;D&4xk4
z+o~HM6-TGA{_;Rm{4Z9FWyhZ%e>6Iwi(6@o6!$nvF^~<Tq0sn>sGB`;zOZ`1xhXuB
zjF~xdsl-4U-H&+QK=|KH)5E9jjtrQDIzexXBG70sM=J?*m=YyE2ogu=3^mo-v3sS8
zkn~kD1xbYj`rL$~<K6%ay+s=jNWIe*lX>}x<rpl23%d#y1xthmxnh>CkXZwZn=(80
zL~3N#E5e@K?W34{n0GwI+v0i(1{&0eo@frn*yM}2^F;=?U57H~9Sf|2e!T?y7ZuY-
z`xs?3iAATzX~Fm#vt<W!u(hur!-O-m_-y(7`4Gm`EBU3rjZ{1)zOdCe&-rJ1?ITyS
z-2ovj{#&JSxnJh%Z#RTDfO(KSf2tfg6{UY0BPKiJ()C(<@vPenV=QE-lQdh7tCZ?k
z;SMalV%u4+jpIE?K}$TQ(5i5>V(yD7MMj*WXRX{Vowpisc9yyI1vy*)Lx10+77%Fz
z0u{A0-(ISG2QlNajSb$mj%ekg<%kv#SsK4G#gQ{-z>1Tpc@bev7jgT7kzaBvRCq<;
zu@viLtVLA=-C4H#45d!H2^A*XaOzc%iBg$b>)^4Q1?}F+wP2M{=-Tj{REmveQ>3`j
zRlC1mM~;8|=Zw#hxub?F`Gt$j`^Rkrhg)+SBU~567#m|Vhx)T8*A>^^xxf7Hr3nAV
zui~1HC=426fMy!VQ1BY92@cZ+A?J~)wkd4#=9k=jkswACDi@vC7v*Yf+s2gVaT|!o
zV8rP!M?v_?K|1E-k|~npzmKR>;+rO(IH3wVa=uYNS47fC3Me_-AOCd3or9=E{zCyq
zY@JUd20hK{oE$<l<4RCYw(uW(=<j999Y3~Lb9QprFY1)&{P=jF++uqy<~&tV)TVoi
z(NI8BZ%<h;<=^}n<E$;igLF<zRdzqpUh>M*;X(Kh1a=q$?0Rl5jMB~l<{d9H+7)-b
zwi|EYC8RPQ(Ow#6H^iOwsfjvJS^9jkvoZ#$OTN+_9ERBbK02|*<H)uhWI3hXnn3;f
zYh}_BgGr0^B>_$!Jnlf^@rAGTK@VkV(N3Y3Nj?v<j&Ul`L2naYckD>T<UKj)ubw;{
zsv0r^8uVpD4{XQG2EY`_Dk#1>q%hT=PeD)|YG0T9$l`og-k+%FtONQeu;7u(#=1{C
z@Ezt6`J==Tf3OuK9nW!Al+x}%{c*a@G%Y|_%Hw`ss@2UPYOWAAyFLGa;bBf%o$gUH
zeR;Z@qu|00YZ3cR*EW58f7_Vpu=3p*(ZTz3XLjuUWu|&ziL5@kxxxo~Ki_nJc+-<m
ziG1yvC;>6X4jl26hY;c<RrhD4n@CV2t00L<7I21(5>b>|<Bu_!Bq7hX`4j@*`N)5x
z(S3lvEtp*aw|v1@AdNd5TI_Eru^y&H76*S?-}%ou`)X5+v+bT15f7$OP3^lpeXJSA
zf~&r;+}W;lI+*~Fdwkh@GCLc4!`5i|!`No7d1{*zU@F8zzf;-~v6ck$h;83EypQgh
z;AaV{F5LHThIr%Y_D&9z-%rl(Uccor<$-DK8tB`2O~$o1sZKVOif5b{i`!F8VlZOP
z|0o^zxJW$XRQPH1Pyf(xR$U@3^@HzlLzP0T<)C?AP2E9P$Puxij1!<ygAqtK#E9mm
zxpziWL<L4Ecq^du8JGO%RjYZ90=OY>dQ1k%ze!r<$=@6gWM{Cxwaw0tpIkEEo@-7B
z8s1sY^geATLRYqC)8VzDb_qN*iu&&wFLxe>5izheG$5HdDfund?!a~;YfQyd;a#hI
zj$WKj^G9)?ft6Rzgrc?_B%SFFyx{LZLdhuV&J3PO*aa|S&zM>osO;30+Y8}YC|(@P
zaOG5gXuCaZeVDhUlN>m-bD^kSD2G)d4lfL}OEW6Rtb6C4S{=i@<rKHlDuK=1!SBgL
zr1o|#)1Qu5YuP#YzSnCHL-OhGlaTuJL4*0fgdhrJdkIo0H3CPb>6`@|rAWlZS&N>?
zANo7FZ=HucIUNc6<72m12cfUPcLA4Pt)aOXIW|ngS4ixArQ@m@^3;X6MU)_rXjjC+
zK1K|b+1{Y<*pFUGap(`0UTWb1VDwujQ;fN0lyUFPA+BG?HqubzLwy%Q3d7q_5<;tE
z+g{%#*!S<H27bJf)0XYBd_%%M+PUb$3;zyO7FOxtmdtO2Iw!UITwTa7H!=sN-W+&U
zO!|GtZc}~kSo5cMq@bwhHMr%N^FBtltuIJiKa>VR<^$r;g-`(!N-{3>MQDkhE{I>U
z(Tm+BY?eH+y<PebF6jQGAk>>=4n+Z^HB;<Ix*^HpASJ#>TECp*M6p32kU<~Yzt_<I
zD(^kp@x-+(WBuvtO4P$a_^R6{#r$d$6m-~6_h+Zkqk(aye7Jf>2kuh*H3|C7syb8s
zLFm?21pjPZ_V?rlXzbP)4aw!h%0qf<6<D{#Wct%P4XP4zdFT3_>06a?#se`Q1zmi3
zQI@s44~5ANw~JJr09mhcNSeLaBzXq}M%v+|+ogswTk<>ZAiH^G#@l0uc%~Y=fj8$(
zo6hNdN#KCGX^c^xa^&zQJpUQOaIj;^hQ0Xw7(;?Gg9|h3sntevUDH>euTcr-2&6p*
z6CjSe;7xX2Asd4l>w@+HRJPBof(U0vS(FGS!V?ufx6jeNq3~#DMcCB#k?mFeB+?SF
z(^$rd(YyXCTc#y!uHE`4aG+%aXh<U<wGN|+I=2@rqj=&!3})X?EPUYLj+Ak!*!DUL
z%?wcP(fW756>W4nEh<^CH2xLDMTDLGW;}g7wI7;Q`^y}a)ga}Z&*B+XL58d#ct}cW
zqMzG`Lzyh6p3_!1$756`lGS-LF`+qZ4Xi`D=oP1OqcNU8$<{Xg&wBsX(lv~75Kt3Y
z6ZsHeR(-tpK1MIjX3Gal)^^x3VDY!@LuFx9t~zs|&WPeNzx5>I4RaNv;LhlHUKI`I
z4!DQybTB&Dq~7%FxI9q7nP1;fw42JRNMeI<q;m996X#TW_?Daq7bxzVeA&J<l9j_%
z_=q*&91|+|T0M0R8LLG&ll}iLh=39E{xmA?yy#W$Tg+)mHZrNl!7f#INBu$1CYU50
z@~T>idx_C|_nC20DFqYpDPEUu>Qq#(sj~{uDM`7M2o-K=6&rBMArP9Je)-|n@c~)H
zF;g$@2g5de;XK+AhUBb=L7i}hp8-3z4>{-LPa?R5-AQ=rOg8STzsU+O6tO)H&c4i@
zN__C9*fo@_rcRa^`x95sTi4G&NICfRBMI^Le7x~gyoG3}B-M<^yGcuvEE4Y%-<fE0
z?}<zMZUt`%=sre!{gK4*ziy$j3pi$jAD^%Vh*(pQNOx?Qxd2bfcO<IdEA7A;%-SN(
zu2a~eQCozkN7K|~)vrqh>#dbojYq<2vZ3$7>06GxI(dRirI|T_9sS25d=zsZbute6
zb6;M2No0}I$WywN&TkbS4cyC}+Mevm6k6xfDHDkX@Gl$)0pB6a%(gT$>Q}D59Qm-~
zWdm&Ak^Or{`{BwVD8x7#FIQYdCgSqx2w#ULx<_+Y@2?ui1wmk}R82=Q$EEle{Ll~Y
zS9PYyc&u|=<ab216;nkf!v&G>^t{3D<19s<t}uRb5h-aEep}G>nYu2Tz0mIsC7wF_
zL~k>U>J(eFK8uyZr!#!`&p7`)YkGTu#760`ZM=S-2(aTf$uE;m(ZoYPK9xJ_8r)T9
z25C6iT)Vyaf}Gg3uJ-l9<nmin2XFxEo5PFQ3|!fk2lxD&xyHB_Z>76mZ8wV)?^W|*
zz1VqTy*Pbhhc1I{)wkKIkKmW;juTb`(n5%%u9t3!FE12M>g#;24UgtmNYZ{fpIJY}
z(_AN<Pts8R{#HlSi|xf$a2zobHS%<`YB2iyeCHlWf^K~@>f96R@otfQC4XoQyl=gZ
zE&WVeut-{pNPzqx+^6v7anbp?j%K?pPWr3~j*mf!ARZveJeZfpA(OHuw@kvZO3%gd
z*P^<Cc{qrsY5t+=r7WT>e~`k_Z=uY#{{kYkFtFet3JLfuVVXa;6fK{wTK{boPvCSF
zwpX{<3;Bk)Fnu1Qf{8zY5$Ccc%>rU^#4cFLq2p)KR^BmB9O|Q}Cw8X{c`6emTIp_n
z?F^>Et6VI347YmZP89v|01nBWrW<Rs%ZS18K`N_A!|Wu{9j%p18}rGI_}>WHUmeXe
zGYc0LR*Cuy8~SAifss!OF=)v&Xc0p%N5=Hu5oag12N=HT=e<x%uN)fr?GLfuY@^Uk
zw3UnVBtzv3{Z+uflg4K?_*g7;KeO9Hg1)V^a#&gMgPePbr`36bK>8#|k?&G#{~R{e
z*IMltqBT4dw(FywIapzvM!D0W1dHbolQ7)G5oss{ae_vZaX}MYL>KS5R%smR-pI2O
ztkhLiy!VjhuG!0`;*PN2)5^k#e%Dc*_Z;uAjE4)|q#LGwGedkTZ}ZFTqe9&KI4#V2
zrhr5$H!q)WV`T!}aqcP##!D|1jJmWa85m)x7fH75;^+JP{iEdJci}2KkMtdMy0;0x
zG)?6zj@gZ`_doE-OG*44>y=D13`Fcxwv?5v=Tbt4VG>m-i&A5kuPe`M!>v9TMuLc?
z2pK1y!-+0%1lx%s&>vr!Y`8=Ld}IqUeA%z=Joe2^XdbgT+A^@i>PFdSyRJg91EWJ;
zz1&84G2$5d{djvp08;9%l5SwZdHo7o2Z;`%y|hv_YF@kn)}Op?K3!JC`b&l<S_SHF
z>laIAAdH8KCv@(}{NpsR)Kt`1U#I%LyKxP#`eHfABf0YvNfL{^e5o`=?Vm1sMT{(N
z@7#ZtO3rJS6Hmn~#{qez8r{z`JDg@Em3GE?iOz)FRE`M<e3xS_`3U$iYJ%r*jBvJM
zCY@jT*!O2dA+0N@reI8)=w9_NY^LV=pJM*vJEId;o&DoxvmWQEU4O}|=11a=amoCl
zJO#qT)@7=$_`utJOUNfu6+Z@=v%_FSZqqHYS~u6vnWIHU=AA33fnK=p-X&`6(hdmb
z)gankPXmpTZVP1i=<jq8c$oY7wkDPDFrVzjQvS$IL=KVD1qzwQx8(|~I?Vaq3YKtR
zuO6mu{2tGq>l#w`ZH=os9E&|cKRk~p#|TVF9UoEVQ#e@^6fa#Bu2G}4&z=MQ2Hw*Z
zn1NsF+C@Uk6wL{cT?59_w<P60%T0|@u#UjjGo7lHjj9hHR=?{z!TbnyBiAQ{^M+M4
z7q45-u7P|$JT5%iKZBPyq<7uv`1D;eAV`&;%TbVOu1By|ql2$Q*6ZXT9`(_TH?S=q
z!y4-<U$#HgT{2_v)ZYbBr`FZ*j9NR2TV}$)`ih7mgu}|b=VOP5oD(>e9r8}1M|iTF
z^%KPC=0{4{6GcCgwPD0Y_Q(k-;HQr|My<b)%=fvXonT#CMC~}K5%u#0YG2h~U0m71
z@4cZ5NDRXFTc(qK@+RsWJE9fQ^r_}fTipRnrUn9{QNUW!^6cmyMLkJ>;?g*B2o(>C
zSI?X8HER@!2N~p9Jrn(4K|%iBpfOAKpF3$H;KfP!YD(whXi~fdr)e)1AH+6Jx!tIG
zZTsFmAw;8PCb(m@gQtica+OngtMOf=vSlwqPs{1UF2i*+yU_h$bMp<in;xc$#Q9cn
zwJ+OoxN3`iu#%R8>2RNTU^a}CuqcRAmgNtn<*q7%Rcl$;w}su9T{{s$Tj7-EF2<fW
zC+fu_Tm8FD%xd)Xh*QmI;<v*4Jf~Q%b6uOoB>l0<=um5*d$wDy01)BtHfza<L-E3I
z<xl>QVXgm_2;{%uIs8;mGRi|$)UDv^Uk7eHM}O@H)D-XXSe>={H?R7V9#98Vb#OB7
zdW%d*crl7$uLyH%dxzQ0XKs2woqmkV;WuPTQGRH=(TUSGQBq$E-O;hFWYiG&oD`B6
zb5y66{h^Se@H8ko<PG;dc45b=PveG$-&QgAmMZgZ)p44`eT!CZxIRFIe!dZVM#(OF
zjwdk9TTf=!+Qs-W!_2p2a!tKuH|b4E>EmcY+|kFhcqwfNXN_k>{CLZ0>&?4=tA}Y4
zbFDc%_B0=;YPQYU3liNR2xF;iOYNB6)tNqttH>p6;{Ib--UA@kzLV&G4GJgID<EVn
z{l8xyX(avSI3jkr$WOdFAtTPS5UXzvVG%(&&46-wB`Rx`mH>{<!byyRoRFGuF2{p}
z(ZrFY6U;X*<}6WKP?c+t`F>c)uJl+BLKLd@;x)Ew^{s_QkC)T8qFnyoG08z*uj<`z
z6eT1X%a9RKl^{lwkumW|*`0#X&+(>*S@nw#v3b8L9T$Sss4m+Uczo~v+_fwyGg6f6
z|6{7YA(jC|6!94Es8W&W(@t^;s6$Rt@_xPRG)fh$)OJbvabr2^+PLqA{H5gaStLnB
zg@!va3Pu%7TO#OS^p;2Sl+00Yr9k<AK6qJjhEQ>%zG9D<cISu#Uw*sJ#NYnU_y+&J
z`(J6=_@#05XI8X%2<P}(IxHJW%xF-BPX>4OgRoL=;zG`=Ce{^XUhAlI^&cjA<Ho2^
zCA&b{yeEWwzruXe1-TUPOh-%cvW`mvsw-DHQb1e$9KHvccP9?)i!(Y+sa@3XCKXUD
z=JXn0haFl8K^<}(?tbYVBkPzTlvHuJ-ioqu*>=T^vQ@=GPs5ezXojEMziQ3H%j3Z?
z+Yz5OS7apdvujo<$yc$*pX`QCXV||O{`jLOQ_V372+d8@T1UR{KqzqXzeWJ>C{1gR
zSy#E!CggvI?}y%Rz005Xk6T9u%YWj4BGx%Rtd06Ae=WPel2ifF)cyu4@kENd9f~Wl
z*zI+m#l0ot+Ubg|V4QMhWDJ6t+RRo902pxubkm5$N@=l?&*xsV9w+sU_)_X1a_U1^
zt}S*Y?M3J><>hH<>z@a$e45tL=JB`ho{DnaqneAW<d#LQHT^#*<ara8m)Xq+X-LeQ
z*`}XLcn#}*LqJF}bTsl7cEQ6bpiw<*p5sgzO~V<RBu!|)Pi~{SbUdH6%F}n5o%Pj*
z7MO<$&8=AV?4aESZY0N*nsd}^N8CL*S08zBgPG61`+q^~BCarE`0dB9Ek60g5tNgZ
zvEvn%;Z)H_5$<_OrTxg^iR(XjLZhpvtF~AX8T!{>V~uRVb_(Zdtkzg|!-AErWc6^o
z5q76M&j{^%%U_jsXy)>v^5HY30^Zk0zAC79xuAcqOmZ%8vxDWlP5-W@)PMx4A?keU
z!poxfEQlf_FYRismnyk4H8V;2C&jsXL%(#K+J0sE|4R}{*M1PW&{Ne}E^F#=RbBLY
zSP~y2yT>x0i8r1Tp^&j2riodrsn2PD{qMh{?jJ1t(gg>~k<pHDE3@Mmq$!=?*U|Zf
zaf5gSiJFi&_J2-H^ASV0#1HH?+@<WSOxAi~piJfmzr`6<`>T7iew#?xc8?zyw)>}D
zw!eYnki+Gm-+-TpjW1}(tUr41_vXpK`(fF^BI@&T%1evtB0f6nAE+HeEY?XS_5EeY
zCag;PMBTkB%ZW4w^sS+(w(8?__dPn6W%g4ZoylKezZ}FPuE!DUm0=r6h2gX7|1xhd
zCM(VJ4%K%vfN{=Fq;B%{;oAO~kW$($6?Xd1>VO0NU1GLVOVyTsa1+~cmIwj1W?t0$
zNTN|?$jQL==I0<g=G);U?^&gDwGn2oOo!~(rXG{9#KwI)HlD>%*e!A=iEftW6pdAn
zgHGCj#Q#`3Zz<9{0y}i98LTh-YobF%Ymp3^zODa?Q4Inp@7rNGTiLcd@KtBrjro!O
zJiva%NR)Gg<B7v`G3%9|LaAtQMbll@_5HEe>bm#mu6ssJiTIa^1eQBL^IUw#j7k=x
z{lT5?HW(EqM=Q-c$?95E0_PUZ3{cB`xQG$hUv^hbdP_ooBH(er<5odRo~=LL9I1ML
zHEtuaQGZUZ?;=;6H?M7c|2oXU&fnvJ@Tr?nW24L5Dix_kJm9px|FE_JUz^STpzvXp
zB0UN3rRsOPU@t5I6*|i~i-60S-$XHL0ER_K3c5?cwNpkStDUVowM(pL8f)MW*~42i
z<i=V7;BE~dNb)ea=DR5HO46MqON~w;;b}n$Xmt}Ndl#l>Y<*Uh0*QTaJh`Wx0eEz!
zl`i<3lA?$CG2*~5(}=46FLUA$xuwj;jo^3>N>}YXUg>la^u}xOH*Uit?7L-0?Bvlt
zPaySfQ{=(frh%5x^ZK-E5c8yT{cl4YIz@3ME>%yZh^xF3@BAagTGyjb-)+$8trq=_
z?gk|T%cdw|Z$s+oGWdCteTI?F51e$4<G$g0kBQi%*Vz38#K3x~BeVFgIL_uCFOA<<
z(r(?X!n9pCr^lU#yN^Q_LrXd>iZSxn$9Aj}>(WlK;FC#s3)JQLPnS3`+OEZLz@g%!
z^<|#OEMOV>AHym8G~e~0Us~H482SbzEa`p)ex8=44*FAbFWh$<xN)m_J}*wMp*NYx
zXl)bzTYY`>yJ+v8W}Uz&#DA^TrCLQVTaEb;QEt0qWKw+i$cxNd5sxvy$|U=^rJ6s{
z@4PH3&zp}qT8`tArAMG{L{GE*%b#4c982sCKIeNLAOply*u4g~|DqSSj6>#P&qI3t
zl~J8#Xl5tW@+T8W6uY{R>}OSUWW;gN_0)YIBZug~uFyG{w9kZ`tacpNn%o6-A%Y60
zcRi62bd9LJWT{3_9$!Iix%&#4PEa|a^>gmVeeSGs8zmz~H1S75;McCF48(=iQyQn;
z`{b?f(7iVLIAp?|zHwnxau!!Y7|)3Ltfvk@zTs2Kfmc)9K;H9gu-~0Y*P)N5lAt;^
z9$(>A>GNFP_g;Z;n|;|U1=%+Nh}&SqS)c4vAF18_tFA45yx`*+`0s;tpTI>Q&D-Y#
zS$Jvb6%#+p#mABW>(riiipE?tmT822hX2gTk|;6M;lEMC%4r!{vjkw0Y{0cjZp452
zX*u1~^MVU}0a}B&?vlw(V!O69`!($oFyw<5yiW+vha$DHWhI{)f^R0-PEjrjdE+)s
zAJl{G?!F<fmLT}i1#ukXdiEjUu_^dbu_Bp#tI#A-(&>^Ou^mji{;<%bWfnJ(#KwGd
z)bi^ZAH_lhBIEsu;#!d(WPkO$o(ZQ5-h{X*2Q0HpzOb8){Ktil0r7cl`gOiKy0Gpo
z#`ECD9gUtOJPL6}UjjQhB=jxIt{ud^XEKV8Za{984A&4(#DQ1g4acALhHg;tF=Dvj
z6fhLhGU8A#D2I4ztqS3K6Xt47VX2at8+&9{-b^?$q2vhN92zcphpPt&5xUi5<6&jH
z;%V5}87jP5gjXG6(<|&`y-cFQX(k^$V&Jv(E#>A6bMW>3w3ZsAUfMJi>f7JlTCF6y
zBPXkuZliJtgc{d`wbQHv(CgV``VwU-a9l_evCoZdb43Lcug#RApauPx>li|T7%7bW
z%!o&1xknr0n_DvE!s-$bXvNv>nDp|DRVNbs@-f}zK0OADp8zl74JG$r|Ijiew{P2m
z78$Q)w;3W!_R^MZTW&Gta9QKg6kZuDJYe~O7#kRcM1Ww}*-FrgOZJH>7mz?g_b*jC
zB`*u3sY*mZ>+0`%#LuqlrjjQj7Ns#qpg;dyT($Sh+qo#>Pa7Mzk3kz}|G9ilIv(Xo
z@FmiL&-9;1O|xt||8daSF|lniDqq|~PVXTjWz0q=<zWp$cgXkJ(3+%rzy4M7wB6%^
zdcTcZzbxhKUa<NBEof2uw~)=U7FA+s)vW{R@we6TZ~R0kgKg(Sh&%ec<?cYQ54=FS
zaDscw<_23ilSE7_mb}UuxF!(fG%VI@U4^Vyvpy0G8(Mubp)zNY>)cv_5qGHY7T4qs
zTV7f8TD3!t??xy?)x?Io8l<FV3DaS7R64`il(+agQzPF(H;nf0s-#KY2$6=${oo`!
zy__gb;1o5-!wAc?@S<y?GEe>#u1-5Tb%bt2L7^a8JO1hFrx2x;4c~=upJ45lO-k1t
zrEsx}Yf{8`5rY*|=!qx=vgBcy_`gc~?x3c=u3afcN|XQ*5_+gXkdjF6y?3QZmjEJ7
zsuTg~#UP>gj-r5o6s32mfgmDHiZtoHBjv{T{e9p2-8=V>J99H<CX<}xoL!!^*IxTP
z&)WX|NpgAH$zuG*aq8e2w<!7TwH44!b*Jq@T@MmHS>9fnIN}0K?XU8#vHaswL_H^0
z{fh5-1{MJVW;Q|ekmi8Ig~C@*a&{KJog$*8?1Bd##a&RgDsFS+OF)(!iWqLtoyPE(
zGm0sZsZi+~xuf0CE-S=tdf$*{s~sa4*c~Cbl3sPMRT3MeFa@Dq3fU9tu9D8d&8%ec
z57VXgV=L)Qr}_>scfC9Y3pW_xL^~w7*H9_K#B>A&i5Nx(5rTTkvsL)f#?x1H|IB+?
zc=qe%Z`Z5e+^$RN^l#^SiHV$e?PX+BVC$~-Ct=@(J<-R-Y$HLEGUv*ZKPb=iXtp9Y
zchPX0a~#q+?`1D=A(X_HiX+#DZUL6J(e=%6YE-Hr{-p!8*C^+t0pYo>*xQe0d*T=c
zb`gYg+0$xXN7Xsx(E-Dut>m46Ca1`*9mRGjcN*w7&ObTuBC5YOnp>;yJlJfHp?Zm=
z?r<6F{6%F2oD<?uhC!0_HVN9jg@?HpTTf1|X4!`UWi=$w<@UQO)~IYGp9B(#Bqq`o
zAF?Cph|<v&^xJ+^aWS~^=>YnS4BQ^i#9>#-{i2DSGH_*<iQM8f95Jp3hk^X%z&>EO
z@m}l!yt$<Av%+*GccK3XOVFOho@6}1KK4dhJAxA^+BqPb=om9ymbRI=g*{EkLFi4{
zHKAU|#}e2)#IjIYo-EmZ9)vqGTMt(GazdhfIDKvh?(AGPQ_IN#d&Qox@Y+}l<1mSC
z-NAc;(tUM^1Y56@tWQY8>4DjpXHn~c<cq40r_5$n3636mA0a>U+CwaXtrts<zssA^
zKOm?)3ABA!7@weYZM<M#r2`RQ;&hCUB;lO9;&a~0T1@LM?N!HU$`s4~J2S!Ky+Gxw
zb)dKxdPU5iib}ijJ+p}bfwgD#oE&siBfVDZik$V2R2Xdv6B}(jsdu!rW-Cb~ysJ<y
z_nE2h*Mp+L+U(Q4v{Pr`E{cVEO6Mn=KMCe)_!g&r6f};Af+{^fvvf1`fz6VLQud+k
zg?Xi7es$i>6+lSxGBKgmjkIQ6Wq?5N?{&5$V#&-(Aizb9tW&oC`mILdtM$S<U(&0;
zk5~ffR6F#sb_#Z0cwOeuDjT_3*tEZ}HxvctBM^e$rgChVl-kNDfK~QKE?)=B?B0ry
z+2gwE>N>C1cA&|-vu+sOQD3<w!XpncQ^^mL6*cfacj1qg-;Y_Cx^s?L>hJ>76E0?0
zAESZkwa8yd!pk@ocOrv*Ahp<;P0(hXRuwyg&Hb$lBLbo}klr*f#^eK3+$POLv?@3X
zqSA4?HPsAZL~QZO>^pe#@!8-YX#w=F&1RZzqh>v95@_2_krMW4)e$%d+uiODRd!~#
zrq~C9$`!znXAu?*^EG$btTvy9)*T@W4RsV_w1>N|2IPK1LnR3pekUHH83^BLuB*L3
zeY7yv;Pxbv%DY`#+<fyebg!apJ>ThEt{%_jou;5Hp{8*z)ja31nYpY9_Zi9i(k7)S
z=bIGwEd`(&nk8`BkGa01<_m)0j&3b}99nmYz9~3zz3)DztV*?W3pyNlu5B*$=kI`j
zr*-kg#T#z4Fe{N~)|E0m`0AlHacaxrjGU^^XL-Agu&31TZ;j4DL!kx^i{bF5K3S4V
z?GB}<w@Co>nO`3cKF79@aKnVz+RSc8)rq`ila}L>Js)U`&+$(JzJR}dl9%okr6Wdy
zlSNg7I9)JwH^7nmy2F5X1dhs_mbP+WI4>E=nZSFvj~kTX#D}J>?IV&b)F2%Rp>c}4
z)CLz!B!x?=1c!QF2oJoS4#e%8NqtAh=5rYUX>Iy$S8SrDwlDB=*6ZyL0VF_4h4p%$
z$x2m+%wW4k1~HY&x2_jH-F2^-O@ySYPJ*2z=&7e?(1M6iSt7PA>CQch>v@^1?)<$p
z4gz-K53+uT!JeR-?1e)<?Z*9$ciKF1?kvlLlX$w@L<R3a+0NFet<hrs5>+0SSKW2O
z%7hq5k%s9;B;+A#Ks3oxSoz+UW9vgmmQ&KhphN;(SeykJ<%3BKmjc6#oa<AAqSvvz
znlkGK-C}<j<iWj4hdGX2Ixo+)S`X|LbD+<TYS`z~_qpTT)p*#IAD<J)%TM%br0|R?
z)E|BDP6RMQsT7$>J0}K+NRi+Af;2G9TdAbUr+XPCY}u;6LHC{YdlZ?uHZXhoLH0mC
zMeBBAqFz~;4}e>#@9wjn%JjR-R<hK7fH{v7xN2xLqVF9uAu452x<hVqVvkoU^Ob<D
zdh#a`k~-n`SKjYdv3Uy}g;;KRLJhezw`lt|D7FKNv118Zio1yCb`Fz=F3|mMdF|LR
zR{y0l1WCC(FTQnGNq<K#i)5Zt5f-`8k}i0eQae|U9g~|#;&7RU0PG{8VK!hW!d>-h
zN$E|m5FxL$7%Hh+db2)=i2cNqa%pZ3V&G+`*q31<!?xul2|-GdqEfODyGc@Pg;+OJ
zp2$Iu>FtH6(k8GBMXxKq*&H5^RI<kld7bg(PWl~_+O82e3~4qr<S%CmyKBw!SdyR-
zUwzbad$j9gWvV@ps9B(22&Ii;E$x#$Y!q=}ij=}gJO!abMH+*^b2OuVkqb$3Qy0-z
zaqcLQuP&zpyHw)st&jJUOntibP3v&lHww!%og)37<>Cc27#CoRXJ4-SF!TDmH^7$a
zt36BTm4w2zVE5F+MmE?U6=_9K5|J3I(NvgqT%;P)6rJ0!%l;##E_qSsq-N`>m||9c
zzNK*BvZdU?5a5U-@|;xz+8gPCzIdm~u$3tIz8tDk&QDU1XJ8P0voUf=q#Cvg$T3N{
zZPI#}dNneS4;d__FRCn$2i~QND`@U!b3dr&>VLiPHRL|OsC|Sy22RKK13x1US}fYc
zkfZ6pwPkQKkr9Pn{|&Kp`W3H)Q}uKKfG_1ODy%@&<>e;^G(`Pv;7E7e6c-1~`9!kN
zle-Z}=+Jf9U}gVs0TiykBM8L1LI{((Om*$yIOqH27;8^0H$)yPTvM+c)v1}Czi?&f
z5|gSaptzLD6})W?=@oXDbL$z@<km=~#EQ2#c8A3O`X*mgT_pF7t!Dpsa^3*^F>%)>
zl>53c=rB&(LefS(y;pGG@j|u76?c$(Qx(W&m-W5^0Tb;`3LIvt#f?a(Ytfr_;}tOI
zy)Kf@JgAOpoITVdN=6|+XT9J8oeBL|{W6iu=56!aU=ZB(idw<a@fsrlkkO!4eT8I8
z3mokk+BdZCHWNR8WaibI!xivbjFDZ_qU7z+q)hVUrw8Vxh5L>&mpo<1yJ#oGscKeB
za)f=;jS(XYTM@ugbnge`h}?>U$jPDgtaQoMx$Yz-%@Mol5@!xtGfY-G%I3;n34&5*
zeqZhW&27DKYtdw55ycf|Y`B1_L44+e6zJXzYOiMt?U{6S)*`tqO}YO0``y=qctXd>
zu-qp?^lUZ6-ByA(;EiRMAuR}v#YcHbw?X|8!}i=A9`qhzpM>oN=-?Ay>;ZS)W@tTu
zh#0YbcE&&^0QvSK#VlCf-k7<h#CGQ`!D?)o*jRg|mA~$V-jyC)5I%(Oxn7N{YnkeN
z_{Z#5#;7yi?PVX1Cm^T?pwlDb$JAcMMRKeA6m_S7u>uWFNCXMRp>ru^pZw4<9|ZV<
z_AM!7KOg~;PxPjfxW$rlU-o?#Kv|||#Xs?P2i@G~r#R_*z!p=)HfGnebT)o9Whv1P
z92d2P`%LxLy1{N&F+VBOb||j-;P)XCftW=<iVFE0xk)R3`~!D-LSJ_jt8-)outo<s
zrv|{*H>T2RU0l({=A$!^;#;pisSK}DKhGYFljI!f^J@td3WU0P2{alRxffg3D4@&d
z;^#*-#B)@ntAeRXM@5`&i}j7%hK>jIW=iMBbtR^Vdgk^e+OMyb;no;45l0n$G2S#|
zik#OGA6)zH#sxoER?+^t+$ZFl@cGzFxf>$_%Ei+l5j{w~9y?~POcrMYTYDH8x%MZo
z4q20363|mZ9c%Yg>vizWI09PkcA;UmBrtXGxC%hm%;TJV@0U`Z@pKP5{&o?OTb`(y
zK}?DOJin<XOkQvT>K8g}RVWKLBMx>$)JY|_RuL_)X}0@CpaqD>Sd&e%X~m`(&LL(y
zMg?s?C>rAdCSNS@r$<CMHo<kpX^A?wK$x6eCp}-UV=1AmyDi4?vyL?)!EO&o%%6gU
z4qY)tOk<Py6a>(>h%?RD8lwa%!at=1QQJNAohed+A=7f`LxB&{g^`cS>&}xI^98)`
zIg|vXc?-=hC!4f1?DP8ZNjZE-+#4`RxMm%(=&stUczLV?!F6m9ZDA{)8LYuY67t?G
zs8f(ypEiB`R#hbY5U^h;Rl{Y|N3SNbDud6t#_DhKM%A2^D1B?iBn67tJ_-#qw8U){
z3Y`7=D7Rnp;i8Hc*0Pc#xI4w`+(-WQl9C?L?jM2@C|WOkqe|G3IEa~IW8&Vr_h!HM
z7Kn%ak-wU0<8PV9rLCOPezh-ZbG7^L<Af<3?tEHbw3Xn+J2+mFuyz|OP=Ae3sLLw@
z)yW^(L4yS>K<|#Hy7f3K>cEgBuU03T&cL@EcV3j4gvo)&dB5<5&$rAaG16KA?ki~t
z>OJgF6d6~GLkPd3B#If#d!SJ8ybd#1*`=q_TgKX7h!5h&S!2F=aglAW**mwI7PP^$
z$n{jyy9(jep7C?#)h%QuG%ShJKS|kcS1GxG^xSEENlEh`9F*U5*KpGawPvpXN=%|w
z6^u){LPKijg)=un)_YjVzOpLR=NK@?*;iG;uRomE@furR*f#S;rx$4Mdm!0uAoWC*
z<$5o8Nid?@35|BMf5(G9eo}UL8)09TDGIM%R_i8P6KNUk+mAnw<bBUW)CX6Od$Tw4
z-f~|fu<y{4(YKvS;aPY2w(mUn2`siZw_$A3J@xy&T(1a5-{)JJb_&7}>n(MrB)tiB
z>16KfkC>G{uC;EBbPla0U3ys7IX~ilbC{N|O_cd}4^{c&2=>dv^h#Lvh>=~_{i7JJ
z9?{K36!pUbjNtqG(}|HA0Se%PhxhbYd;pKeQfM}rC<zIzei?h%KIFc+t*joo4+BA}
z{@BSUF~3!&JRSTa>kH8Z2+F<nDX44u_(q?@jQHnNHUY}pR+oio%>F<IYgU0)1{f2M
zvLwGtCshgo^`=IKE}Z<lQTQGNs0d5`oNj7IZQ}PnG@$)Biq)GjT>mcets>LH{xRWO
z^s-n1W&@tIuE%0O8I_v8pbauKN#Y^<ad{}T+(&YcYeeHSwx~}nso=Ct6-JiyeEO$g
z&0dROOcNncWo+q^+|I&TgNFO1JNi&P@spxcePZm*)>@bjt^2|sD&Xg)SDTq%SsT!h
zP#4z_|9#v$7l-$meyk@cWZ_EZZyhC(?A@QMtLkzosBInO8dceLQUvTYAxY_1KfZKq
z*rQ0ksia_T+F&OXs359q%gx;VANUVR&9x)bfbRz?&L6ctV<iIWoU5Cvvt7FtTr6}$
zdWP+Y@;9c(Qw2*LR03309FPc_v#6Khbx&=oB3T@8tI7^bb99tKUQ{Bs%WuI$JL>we
zL|d|Rd%~)5SERlJryq)Lu0B2sgJXDnql%{&zLHZF<W<b1Mjq4fS<FDLv@qxL&8d6f
zkpgMX$n%kv2?cNndZQXf-pENN9>H@@5ytD*zAcCGl!UPu1HiOwH|@D!IVQ8XyXm2m
zf`e6pt<GUIV_2Y5Ovo;B6&&t!g&TjIv63diF<7gywraW*f>>yIz_aY_71zP~e&jVq
zAC8W$V&MWy706CL@1YX~BiVjQp9pX$=N-6OQu?hO9~(dCT-Ri4t<4VnU=4o|@P$!t
zb+PGQ0_Y|aX|-WY^}Y3MP$$N{p}d=@C_UB-6~BoQbiXS`oeL9M<WfLM9mNI5^POSO
z#X0cv6PM#&fhAOYDhs{e8vp*&0A|v?Oj`NJ{a;NZ;g~Hfar|>su)Ofb=MSgjmkpL8
zm*WKTR%LWN9c;i6gmkQlFAL*(f91Fl!-`C>84}g|#xWx4jxOy9+F=n0GXm_@LT&D~
zeCqbdA2P{J&0PU9%IjDnbEcqblsbRX*oP^O&5U29a?Qx)q6(Q=SuG>XWJnT&C{UWQ
z4l8D%k_Y_X%HxF^`cX<bBO?}5G3ed2rxd;pM2gD3M`{)|?5;=H1Z~tHaz8zq5)<IO
znj!hUa9`;`k=mI2J=VGC#JPS=!^6ydH4U@<Jk5SKY4a%6HD+hoZMK1RPzX5;CIPeI
z7Dt>QQj+u<;x*3vB9)Igv06Z3F`9zPILZQ9H7Z4-Yy`6L`m*)<M2FtiDI;dT-Tn3r
zq6`*tSI{J>mYVG_qy|u2Q#Kj%`W3`1DSXfvY~d}INicb;AZPn=1l`>hTae1n_T>3<
zuYGk4Y1mgF9}?v2+r1$d%xx+B44On4NXXn-WyK_z;7|;&zElPu+6vw1S8+&C89&dx
zu+<?~81Px1JHZZh-OZ6x0K<LGmBk8Pg+~`-HC&vIg}$@<OWL5B_GNSWgz8aYz1&1S
z0;c5lhe@>ax-^SDt;8#>fYCYN9M+O9g(XaI_QK9;#>VL&fl)C{B~&nxb|K+KCX4ER
z!n>veLH7A-&w|@W#s0~f(G{+sM4#Q!(0B}htypUGd$%$ZV5^M>#^3PDX~HA#W072t
zDn<RUVIWVg{rYiZ(8*4YuxzGmuYy!frrY3aYyI{=y~st2UtjEhiOdvc^Lh;1ZmKqs
zou_~Lj@#E`a>mWF1i_$F@)n2b;_06>6q=EXH2mxcgldas)hLA?2|-zd$}}h(;&ZO^
zXOBHTvI(PYVm3ZF)nw3{B^pIjA0LQrda$vR&9Zq@2Tby@`~8Lixpy37p-wBP)AjUr
zXT{ZzRzEtcu;5|3SAddZ5mg{zM<0kj3Hac%cD~*3h#xE0>D*#Oi3wk;0yMjGh}DBb
z@&&L>*e>{E_OEU17<~H`t!}BjzdnEZE93$9XD4uH6}P5(a#bv4-{x!m*ix5vKSkm7
z9XQ4>uHdJ`T7KMtSOJT4{fLg9yPnxkSan<54(6r<#<@FD&T16GgyRmdrX*~ohzm<^
z5>Qrkv`f=V8(NAYK;7u&WmOk}l|_-*s2sDUp23rZp8#WHeW=3XDH5=~zk}u}$!#bn
zz3do9+nq)p%XAL3r7zRjpdF$#j}K8}8OKo_ahVcJDyJZ1Ywb;U78%^(Ysp15UEF4c
zYQt2l+j6)dAJlOBrC;V9H!bNfN}V$dkp($1D?O~x2<@?zHr|;S36jzU;IfHY<ICGz
z#c!k+AZzYJ^NJy&4IS<ZSIrLsc=-KpSszJWzbRopVs?ktYi8Q<Yjj82PsNQZUH5;l
zdv0mkLr-w@#j)r{J4na;h(9jTUEGoR<YJ5&l~HVX-k;z`T_N9JPa5_S#dT7YSd;8F
z2MTBKiVJyT^OVFEJP|Sz8p1-76l+VYER{R?wg`v<NN(Tn=$z1Zmjqn(WXfZC64=bj
zxfw&Uv+Ic;XG9SgmCB_t;@s{c_JdCGYZMNZOH#)RFkXO#McI?=q^kTIN%8uK*GR|w
zryy$km<}gcO!W{tA3t6BzUmAPB|TzNs;4htX?k#IJ7!n-ys%DKjwJMSs2&Hx5V$LH
zCd(*t?U@b4X~rYFxvpJQ;#IySGTRC<Em+V-<UCo`_qG74=enl`O=(DbrinHYfTc`C
zBGBB*i7y-DUg`D=q8x%+`$Rgduyp=tKa^RT_<)!8Mg4J%oEv}ZkM9$O9`RfeYT2=U
zVYFjn*J^E;k_wZ$s!|yinkkj5J@MZGG@cSVD&0k&V>6|;vj3>QK0eZfoQ(dI(p_oW
z>2mYtN5!UwW_{2(W?0RHbZs{4-&%_N0w1_lt7W68-~>C_FY&*G<HSt}obxQ!LRYnl
zs3`NuljZy!OMN0Rqad-IJWy|M1Y-2%Gm{tcDAvnN|9Dd0Fx4$bd^k<&8WxCmXLSf!
zk_b7C`OLdkBV#J}sX;#daS2572|I|TfZtF7!QL<k&u>Oq0K(L&$@dOi^(>l8D?o!A
zMgVvntaV1Ej^vB^#!?)GrGaz!gRoD!4zRo$Om?x8k`Y;oCZ#sh0njq?-<0|oZ};tp
zo@QS9%@lYPPIW!Ayv|$xQ4~1y0m5|Kp`MmC{+v|d&Kf-+Ynnr94a4k3ULRE|!kopr
z<3Q`q`)04hiv6~)3P9m$6|pYqEu#6rloyf)Ot?}m7J$G$Z-D(t0)Ff6qWvS&rm`0&
z!ry4>wT*4{Qz1K$!kQ0PFARloKUAQsY%ts8mt;M^pw|ln{Id~L6@oq;DiuW)BP)-T
zOU(>@pW~`(A52pE;@MkVTOcXU0578!pQ^=2u@^-^*aHXu6A*DkF7WWY2wTs^=&NpO
zs=;<W#eE<5{mlo{sp>JI2=j~)ZK#M`a;P7_S3;ck)EC9z%&2%b#^0@0t{?&yPvVg0
z$dQzrO`g#&+Jh+4);zA)hzOsIeZA}#@ZZMjM$U6G#L3OdxQ?N^`59eQ-1aLh)2f>&
z<rRb5^Axe0n3ytuR%n07md4NhTWlOUz#Nq@P$~Jb^J3AdU5tsx8~dU!U-4^Dwt7J-
z^Jm$@lJo_-$-Vd-T8}OCd?a8I`dM&XSKP?!Cqq~y4#{@ZNS|TGmF2T;s-~Lr^|X7!
zf!YlUvA2c<DaXwBZW>F+_hh&veSSXjsD(Fu+1GoeQQMdLvul-x1;+bPDu|*rS;C>G
zw<y<q+<Pd<>|p|HnMePx^o<%{%pvk;Tox%;&~m)DYWm?@15!1-GOCzABv6NLim^+L
zX+5Pu**i?Hytk<dhQRE4@rD@}UCTc$nO6MG;+z>6k#w_5g(}Rzb*%{7pC+x712cwF
zjBKp!giWagjvwmZ8YkEDNrZ)D%Jn4ohvROTCRV#~J2u*_Z6g<ewa<yeHxkER$q8@Z
zBA+=a*Sxf5i@%nxoMw??Cmx`gwYWJzb++9oWa1BWQmrYE5>?IBWhEF3TwWIGVBuF}
zmB4QK@5;mZv_d{woTc)iis&%F<5^B}Z8ox|tMdN6msH{Kx{{_bScLBBY%#t}8uf3P
ziIz44JvD#<V7sA_7<cWd4%S;8Ma@sL3?hnh#lxeDa?l~Cs$u?u#vR^^OAQU*4X%2<
zfgX~yA71Db(k&+mviFGDYBSmtAq$TrP(2>=2KGmC&%)xkI8{vziN==un(HfJHiB6m
z*7sOTh05m+Ll7mV_l>4{cAov3d67Lg#fx~j%(v`4<S`x}Djs<6SyK|1m#&@rd{zTz
zYf)xZJi*Fgk6ETuWUta-Ykypm*$zH{^TO&r?+dHHKS7TgQv}^-X1Rg>B&18IE(-Jp
z{A|6y9I!l@r3!~y2ZTWcuwx@tDz7%?sEFFD9<uNfzKYrf2<+lr8DDvmg8Wh`u>Y$>
zTc?$cZVGgoi#i4B!@Bg<-`f0PJ)BtmtA~9nQet(h@>gvXYiVm^f%}*a>WM+Y@Xm{Z
zyr2gBa|pe>Awd>yn@3&y?^PkVhWS3;`zsmvCBR7gXd`>?Ba5-`Gl`a}vOo`fzNA3A
ztDLX0uUAaa)u-i1h4Kg<MOH6wZHXeyAH(C`+SyqKJ!t5-;O|=LNdt`gO@~(Ot3=l+
z)#)&eb0OU0lO&$^0Vx-LQX@KYAA_P~F`pA$dt*NTP=R?bggJG|7Jt0grRBF!lyg_e
zsiRo?5sgRdX9o}>vvLo(d@{-E`{THDivjwwGde`GsSKvVK?YXMzRNcu)p1o=1SE@?
z;7li}Td|`&YjvUTI8-C%Mw^-eCacRze+Q6EVmen}FTPyKexW@8UWjIM0jq+If3?W*
z;3R2vW=;M)G+gU5@Y5rHq=qM|A(3X4OnQ|^FTg2twL5st!{O^wUpHLV{?r{()7xr6
zca{(lT9Y<6p460DySEn8hC&Kg#P^lT5BNhz20U69kKdRzq!^B9o7$N@Qh0RGTla7q
zl9hD-l0$1*HL#X3A)+e$#_9c!89^f-_o&B_%Yzf@*)yr-bHRUL$|LUq<;NydY$uLE
zQKo${=RHr4_usba=XB|``YFqF`6qs+8FM}RZQ*IKo>@0kyV=alqR6|fnx5e8JW!+6
zn(A)EuH#IZkS6>{X3t=}Mr+EG>ku(2&S^gGDyk<-)ifrQzBI>1d6O(mkkrGXQY4C!
z1q4tYyCzXay8$rO&$qu0Q@zVDeB=Xtu-%i^m>Znq`Am$Em?b3B1YIY{>PuwOp*YWR
z$<i;rhm=U84<jGy%Bm_k8HoeaxPBMMk9aDrE4w@K=Q?yL2_rp^+?*p_7z%s}WeY2l
z#R77Da=zx-aazWjp+voO#D|he9@>%t$)XYih}CqA*SNICw|V?WO1yL~-DLtW?%XQ-
ztSduPiQ7qb=r8`<9{VNTSh2;XF>dFK-R9ZyLWK*%cXjP=X-D@t_*YiZHC|IH(jDqt
zwiV0Rw2Jptn9u4m#aa9A{3yPv6hGyw(e_KoQdjBOQeg6jtVD}J$MRhN>6(wb>uC*R
zE$UgTZ8dKN;@fL<ro6Zg{eHODap{b6zD|ZOX`utkazzTBAFh5=bLfSr?V7fiDg6nu
zMRsFvggl@t3Lc_Oz`gq`J6PNdV+#7BnlVINNN2mX5eU%7$>5$%K9MBEdCZBm`imdY
z$=`c+&YkE14!pZ+(T(Tm3hg}Z)*2p=#1n4uT>eHSogh46#{<OYT+TRSDsoU;Osuyn
zp$O||tMD0A%%cuZweWM$_Z+FbsG%>Y)ZSY*(GtOx5Jr?Fh4R@)&kZCzPbW~}bTm(}
z?>KI1D9F)hO;I{sx;yH(-0(#y=cwtA*I>mvy$Uui(p+(_ooDPGt=(H*T9b|e`;9B+
z-*!%##(unwe332wqYAtHeP?C*VEyc5u9>&5u%Jf`>X_!WwnaSu-ROvE(tWJB`<>RZ
zD_jpV|H-E39abI;htbcJ*&M*Fe4D=^+Di9JPLAo!*Z%4c|H@eWvi|1jY0Xc4@lQSf
zC0%ekCX>qj%Qj`<?Vt&d|1{Q<o9-AzNEHlUiXxoUj>l4lm+Ssb;t=?WQSUi!LPWT_
zefsx_I(R6BVHBUhLDwEK1iLL<I(cfBn0e&Fw`tK1PgbW}Z*EpLdhfC7<}Dv5gKyf3
z;e$!n)#Vv{L0rClpZiaF@a$J{7BWeZ@<Q2?1yxZOSLNA}U{PQY7xAOuL;t3zWH^eO
zCFU7k)4#&p?I~$}WRW6`_Ody+%|=Fr<FYp&hmvqC&Hd(;LdD60N3&Q--BwXg_`ls<
z$Jh6-C<<SBp2L^N^nSj0wrQ*B;UWI*p8}=h*>iU~_TdmC*e$4ij%{>^N_$X=4<!xj
z{=#eioIRy_vlj~jDq!@1(}ULqQ>1z>nFaWroBmykaJ0pjt>MLOl|#f%7}NDp*hOsT
zW^r$`Q^{NEO-5gZ=n&fo%+2vWGlENU^Q)~P^xJz)Vg=7zzTMsVe=8YvL0gy5Rf5j3
z;O?QX|FbB0NwRGCQUgzNGYgsCbBXy_!|u#qPfBr<dE>7C5^2!tTUvk=<?Qs}le<f0
zR=!)V7AL03#$048i2{d`|MbH@T`yCZ8h~$ki~JSj|A~7fV{3IQ>?FZZdfai1z_+p$
zzDQRR`CR+M!vd?U6|eTpdy^L%^LT4J`FEQJ!3xKn|DzHKlKM74nScqZ6&i~_6+y#A
zOZ*Yl6l7gaUo(%L><+Ilz0D)HJeO&mPMkzmflmL%Aii*ayXFMxH~H6w@A^sq8##Z!
z#8YM^Zp|0qH{erx{!SE5wM5`%H9>hZV%Bw0n5^&~M*K5!j1iwwl^^Y46R7R`FF|#F
z%XNqABF<};LY}#4UNQItzlMqdTKdd~uUWEkgP4i?SF8&a5v3oHEXjRNs0wp2p&6}z
zgXJH9{v+5mT0O)5+kF0_7B6sO2z$LCFuN`_e$3CZ9mq!3{lV>Nocsyv=-WuGD0w3@
ziF}@ByfyuSHgDpqz(;fF_aFK1f$|Mfk_$t=abLOQPdn$gxyZl(#b{koFv+r9^eLaX
zQd0M$-EjEk9jVJpw8b(0GXCK?xPPN%heqlW54Rz?I_$av*j;9p_#~jQ^Hyt9#LtmX
zDY7J$-XP8!<a!ef|JVEe3Sl8b<O!@hg@x={-jOCb`pXIYuFRz#&8qjjpM&q4(?|)~
z_RD;p8T?KECH0A`##epQ$WuWWj}QLgpN{{>VBysLh@`&yPZEjiTrknCcW!IuT&b3U
zXNQmEGUFGuL`@5R&E@&t!5R8`f0e*r;UB#H!*l<qb!JJzz_QKu4&S6~Mr&QSnyeLJ
z>Kyd>3}nAdcZ3Bq941VhJHfUKY<foKUOx`^U~_RNZ-SC_#Q<zYu&6KjbV(1w4&JFh
zOnZiz{`sL=s&sFhd&>*gpnKE9cEfFD!PTfm>)U{M>W;+|bLQjc!vhZ@J)*1mT;k@I
zZTP0AFU?K@*Dt@6UsHcMaqfS3!bD=4+h{pg4U%VJ;IQso$bK;^77#TsF5ax4eXBho
zbg<i^d9yWv$$#?`(xQ{eT{l|c(&*_eiZJ(y*M})znrzj7MmE0;J{%-#aOT1zfU)`F
zF9HCE;&=r37Fs!VPD?Q_AfdZzH>ruj=IQ57yP?!Xiw)Z%)Bj}NNJ9H3Md_rl61IR=
zEjfZ#BLkoA3+U?F!KB?B4HxT`MF#fV*oX=HPJ30P5!~X6tYpIK0_tDrL!V(v7IF;^
z%|9uSs19v_13MnR&@sA_%8g;NYpnDzHY(2^KG--r{?izIIKtJu<zH7l*w`bMDL(ex
z+@;~Am#0mO`GnW%vRaFp%*o2qWB|hc*u{w$-7MJYvGV96n5fhFC2Uogx8>-gD`ViV
zTY*;R_uy}>r=hv{tT#+KzQ5CvQS#Zg5Zsx_YRN+%Fvx##Vq7L5e^gYYMI^X#h3H=n
z<{vCy0+*GD@ni4{!Mu~7;Xr<wi@#h!hmP&nEfi9R!-`i5VDuJxXFME^3P_BcpR~`-
zHp>9h-;C({o9QYsHJE(qPs`4q2t5DPHGB6j1G|&r>KBD}Kh~+|+WRL-A5k!4xMG;3
zqMp9zke5jzT`~Ns&MqvvO1lm_!9vzVb!!iE7lUI6`#=`>ChMWiw>~uv#tjm6AwMBA
zokCVGyu<Fv9q<srw_1*l>p@J8ot8h}<>R?SUlo3polGxVwT$@iqDSA?s*G%{%$efl
zR>BekIc_9N(rb*-56=1$H-)6n7lYuUioZ--mQ5q@lsQ-FBU0DJ`?;aN{SI?gQ*OoT
z%(n6}8nS}IDV3=9e?7vzlGGJFW;p|&*`}HcC*KmBB<?;rlf~KpXM}DoObx<+`ufVE
zhn#WNq3g}Qr1a6KLGkACblTis_>88jL=h%{Z1<-<a9T0Fskf`6`{}p~gD#K8DU8hA
zzCJkE3!1nWy0<I&atBZ9R%CCv{?i(C?)<rfo}ipt!37+K_b-^L0%D;Ee%rG$P7Xkl
zW72*1d>~LVT+&{&#4V1X*U#0g+2qg1@*_yZGZMcH#vji;*=P$#)zrCeYz)UP;dP%c
zLM^T`RD{|*BI@6LVtf|3F=Biod3o=;D0P3yMCH7Z{(34mM~%y2y#izk$hd&rK)2Wi
zzXV(i=PM*`CRj5O*o1K1AUKW3=TvYol)du!y{%GCNsvS6DlgQC?EE4V)pH|Vc6gAr
zx5+yXj#gRRUn|bdQI(Hs%NijG?uD$V{Ss6Jqg@@K<RijEXu+dt(y95EdH?cp_zB2g
ze{U63fQQ{3zuq88sjJh)#MtshiN(t%{3J&a)mtbV-Bm41X)Q3Ogq3YM|51U@+<PDs
zv~G}@bdN*5T{lCL1k9mCOJ!{?q@Gxy2nGTA@jp&1aS_NN#c}KB8FQO9HpNpq>>IM&
z+pm7JSo(O}{KZU>aeLWqxT`wDeBSdy5`_n2(6%??nVS*s8&WrTJsE$GsEYqkpen58
zeg=K<TI;((oOr1=eNhg#snDrZY=)sqj<f!FMrw=guOp$(q4&rzRFdR`y@E7o_SJ=G
zBG)X^U2}++Ann^hO8QKqbp#VBXD%xFWx~$APFOdLWI>$>%F;O^q`VYr1*avXN`J`3
zZ}tQmE3?!VNW2&yukyPzA&rd;I=;tbS6DdL{l)e*SB}pUpQU(}cX6%IpLh$OrEG#;
z&boYZ$jFS4pm)l6_dGKqfKASB2q1M8jwa6!8Ui?NcT&hmY5~z_yn-lfPekt4CqcdU
z>KwgN0tRw)SXnsd0415@IES5r+lN<|z_7tTG<Avx*`9#Vj)8Z)NdEqG{h}yt>tFjd
zMeUukllo;%lygVs_-xcYcvkuDzlid5vHp7fNrDS)&KhUp1|x3s`u!%QRD2bUZ+Dly
z`Z!WGks^FXVG6!g`C<91vWl{k60lF@PMuIh$IlKH7{@w8D$?feyHY7EhzBCHI>5St
z*}W@;b<v9+72i=E6j|2I#kR>cBgt2wgm~6#jY)R0V-Lh_i=M4~ruMoaun+mi_OMX;
zw#i4w%O(8iq7C|i`O&L^Qm=yqbhTk~84~(j|9p1MOqsb*e%Y6KSTD7#@~+RQx2)kk
zTl%mvOrkpq+8pHea<~1K4)?9a=n$*6Sg{=u!8^Xh@Yfec3U8#nFUwCh=<I&wM9Yo{
zw@^lE!7eNcid*s0s2Thlwco`hz?NMk^OyX4{FLwHNBAAD7}{aup}N4CXn7-+qh4MP
zd$O1U{pWd4bAqnUKFE_0e?2~`2nt}Ou=Y+?Txve@`piJfzu1u`fG7Ic1t#$>VvPj=
zz+e-It)?K`4X{MG>+h81+tpG_1tC>0=9~mTGzbMSAnZf}N0ssoqmq5Ud$GND$wtcV
zjUdBV8iu;77eW37;jTX~Ex-rk-|$|uGjf^{{Q2T&8xUac5@eCj*FUo{vJsi&5Xt+<
zfxas?`1a&$0$iC?K%(^PRBlz7A1&(F?1AUy5g*;cG?)`$7NzR!3aow1CQEPSpZ0R;
ztJ>LIlom(5xM{7NH8@5|VAF9bTN!)z`Jl}&tPQBsx!ck*YD@~i=%LQ0XwCP=AKC+>
zN_N@|Tl!+Oy7pI}{bd!uKE)K&DhEAU<E#U%dkC)vc;zcFe<h#T@?ids*Vy*pH-6{2
zJv=Oh4tat+V$-j+nI1qWS^QEw)Adm$b|q$Qx9uN<(v~=`sPo;4>k9dk_#~XyZB*)J
zQsrdY<j2WUs3S>)$+PJJupb9>hUXV{*cL!1f+XrT7O?U<PKVk{((FAJwI3seQKT47
z<IuI;UUAm@l1rT1n-Il6l0J_JbCTQ2ginuMua6Jj_;~BnARQ{1!wJflxV?;IR%f$k
z-%ZI&L{X2L1cv*#?e!RhVQf1o7T*-Hh?u;I887DJN15Eq$>Y`7dx`nbz>u6SGdZA=
z;d4X&MlTPcmBXE0_ud<4Z*C2FEzSA}2&17kT#Gydfr8Uszs3c}lZg&@qZ9WY_xLQJ
zJ_xF>I)R<<<1F(2H_Sy?%;KXc%idM5MhK|!XU_}9Kf}4MFPt>N?qP7xcj+BJLgcrS
z9uLF6cpB>P#DL=S7^>Y67NlXU+XDSUd8pEY!332PGu??jGZqNgSGpvTR`JnDeD?a@
zGnAGD-@cFV0$s)SZ`sM)H*OHwswv7nbi?m3k+&Jy>#o=a563(l7kfe#M~LU>F`}nA
z7By2ECHXw6T`SE9CvU#SPW&MNa!_<zbUIm1u`v7IQy3eE+F3B#DpggH>I5tZ=^3GT
z2Z$YBV}z6&`4?~KBz!I(zA~BpCUOqHR_m;@_i#LxK<y}=XESv5_6#T9MI?GXuIgH5
zw#iKo<oH73`eG)*904RjU^aMZQGIz=<8s*?4^e0@4&5FLeC$Y?xtH#iRrt>IV2W6(
z;;)(h4{QA&EoY25KPnva-9Bsh8!%J9$U$zKI~=`9<C$m>kP760rB6O2BseqQS#eI-
zGe();V|x8YtbkGh1I<H@5CFf<cNUMw5Rj7AVW6}Eg(#;i5B?Jc!+nQe=ghR1t$gc%
zHnBskV6QpZ8Rp8=_kY0Wc3taFcIY3J25)yydS%Bu7ET3D32$X?$o}lf+h7ZLI|n)N
zde0XapmV3h2@Aa}BS%~bo(rCObzAniHq+K`FMfFQR@y?`z4c9^_`CIq$F#)}CaKzt
zaUKr%q$5^ARuTb%v@XSebEkg&M!l1MJeSGv^KRg_MRO}-0k&Yb1aW85I1)oa);e@9
zFCOAFT}E$HB4}+UUghzU+S6w2wyEw;kH3DOrni+n%}Z(B1E74_y}qe(rge0dts&C_
zji-F7|Bq5|QS%>8-hdR70Fmu%&mrhZ%srJe{$Q8YM#-^1m%F@cPKep{%M9=4+^R!1
zoS(1%<i-R}G=q)mXMT!5|M0)UwSU$cLM}sRjcAEROW*8y;f8+yoiBCIYzJO9_kELa
z-JYyxkecxb?*16#CV_><i^=OZv%uIkK<@6sQ77zC){=AYeZ9y1l=xkR`yP$|$s!LN
zdR3t?6*$y(5@>3_+rXPeaabs`V=Y|Yx@{uk_ctG-8N-ANI(Go?1&!Z$$oQ#b-)`7z
znE1BQdS~Dh!{1}?oPivFZu!5C+8%juijCNR9b2D3;s1SZ+1MY?a{BLcVq;AIAAh}O
Zrqo@2*AM=9?*{&*rlhS{E^ig`zW^`uz*7JK

literal 0
HcmV?d00001

diff --git a/mosty-base/src/main/java/com/mosty/base/manager/package-info.java b/mosty-base/src/main/java/com/mosty/base/manager/package-info.java
new file mode 100644
index 0000000..685ce84
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/manager/package-info.java
@@ -0,0 +1,7 @@
+/**
+ *  阿里四层模型
+ * @author kevin
+ * @date 2022/1/22 4:45 PM
+ * @since 1.0.0
+ */
+package com.mosty.base.manager;
\ No newline at end of file
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/DeptMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/DeptMapper.java
new file mode 100644
index 0000000..9bb19fc
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/DeptMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysDept;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ **/
+@Mapper
+public interface DeptMapper extends BaseMapper<SysDept> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/GajgSearchMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/GajgSearchMapper.java
new file mode 100644
index 0000000..4b1ae2b
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/GajgSearchMapper.java
@@ -0,0 +1,30 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import com.mosty.common.core.business.entity.SysDept;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 公安机关
+ */
+@Mapper
+public interface GajgSearchMapper {
+    // 公安机关全部信息
+    @ApiOperation("公安机关全部信息")
+    TbYsGajg getGajg(@Param("ssbmid") String ssbmid); // param 'sql中用了ssbmid参数'
+
+    // 从子表中关联查询到公安机关全部信息
+    @ApiOperation("从子表中关联查询到公安机关全部信息") // param 'sql中用了ssbmid参数'
+    String getGajgFromGlbl(@Param("ssbmid") String ssbmid);
+
+    // 获取到id，根据id查询公安机关详情
+    @ApiOperation("查询公安机关详情")
+    TbYsGajg getGajgById(String id);
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageInfoMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageInfoMapper.java
new file mode 100644
index 0000000..68e7ace
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageInfoMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.base.SysMessageInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ **/
+@Mapper
+public interface SysMessageInfoMapper extends BaseMapper<SysMessageInfo> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageItemMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageItemMapper.java
new file mode 100644
index 0000000..60fefde
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/SysMessageItemMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.base.SysMessageItem;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ **/
+@Mapper
+public interface SysMessageItemMapper extends BaseMapper<SysMessageItem> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/TbOrgMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/TbOrgMapper.java
new file mode 100644
index 0000000..3aeaeda
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/TbOrgMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.base.TbOrg;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbOrgMapper  extends BaseMapper<TbOrg> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/TbUserMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/TbUserMapper.java
new file mode 100644
index 0000000..5d487c9
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/TbUserMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.base.TbUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbUserMapper extends BaseMapper<TbUser> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/UserConfigMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/UserConfigMapper.java
new file mode 100644
index 0000000..f8f95cb
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/UserConfigMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUserAppHomeconfig;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserConfigMapper extends BaseMapper<SysUserAppHomeconfig> {
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/mapper/UserDeptMapper.java b/mosty-base/src/main/java/com/mosty/base/mapper/UserDeptMapper.java
new file mode 100644
index 0000000..7a9a797
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/mapper/UserDeptMapper.java
@@ -0,0 +1,22 @@
+package com.mosty.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUser;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ **/
+@Mapper
+public interface UserDeptMapper extends BaseMapper<SysUser> {
+
+    @ApiOperation("查询部门下面的所有的人员信息")
+    List<SysUser> getUserListByDeptId(List<String> deptId);
+
+    @ApiOperation("查询本部门下的所有的，不包含子部门")
+    List<SysUser> getUserListByIdAll(String deptid);
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/DeptService.java b/mosty-base/src/main/java/com/mosty/base/service/DeptService.java
new file mode 100644
index 0000000..7b7f681
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/DeptService.java
@@ -0,0 +1,64 @@
+package com.mosty.base.service;
+
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.core.business.entity.SysDept;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ **/
+public interface DeptService {
+
+    @ApiOperation("根据部门deptid获取所属分县局、所属地市州")
+    DeptInfoVo getOrgByDeptId(String deptid);
+
+    @ApiOperation("查询所有的部门信息")
+    List<DeptInfoVo> getDeptAll();
+
+    @ApiOperation("查询部门下的所有子部门信息,排除一些部门")
+    List<DeptInfoVo> getChildDept(GetDeptListDTO dto);
+
+    @ApiOperation("根据部门orgcode获取所属分县局、所属地市州")
+    DeptInfoVo getOrgByOrgcode(String orgcode);
+
+    @ApiOperation("查询分县局下的派出所信息")
+    List<SysDeptDTO> getPcsByFxjdm(String orgcode);
+
+    @ApiOperation("获取部门信息")
+    List<SysDept> getOrg(SysDeptQuery deptQuery);
+
+    @ApiOperation("获取组织机构信息列表")
+    List<SysDept> getOrganizationList(GetSysDeptListQuery query);
+
+    @ApiOperation("重置部门的部门ROOT")
+    void resetRootPath();
+
+
+    @ApiOperation("获取用户的查询条件")
+    String getSsbm(String ssbmdm, String isChild);
+
+    @ApiOperation("根据类型查询所有的部门")
+    List<SysDept> getDeptByType(String type, String ssbmdm);
+
+    @ApiOperation("查询父级部门")
+    List<String> getParentOrgCode(String ssbmdm);
+
+    @ApiOperation("查询父级部门")
+    SysDept getParentDept(String ssbmid);
+
+    @ApiOperation("查询部门信息")
+    SysDept getSysDeptBySsbmdm(String ssbmdm);
+
+    @ApiOperation("同步组织机构代码")
+    void tbZjjgDm();
+
+    @ApiOperation("同步组织机构人员")
+    void tbZzjgRy();
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/GajgSearchService.java b/mosty-base/src/main/java/com/mosty/base/service/GajgSearchService.java
new file mode 100644
index 0000000..c9af531
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/GajgSearchService.java
@@ -0,0 +1,19 @@
+package com.mosty.base.service;
+
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ **/
+public interface GajgSearchService {
+
+    @ApiOperation("公安机关所有信息")
+    TbYsGajgVo getGajg();
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/SysConfigNewService.java b/mosty-base/src/main/java/com/mosty/base/service/SysConfigNewService.java
new file mode 100644
index 0000000..3c75665
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/SysConfigNewService.java
@@ -0,0 +1,9 @@
+package com.mosty.base.service;
+
+import io.swagger.annotations.ApiOperation;
+
+public interface SysConfigNewService {
+
+    @ApiOperation("通过key获取配置信息")
+    String getValue(String pzj);
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/SysMessageService.java b/mosty-base/src/main/java/com/mosty/base/service/SysMessageService.java
new file mode 100644
index 0000000..213f96b
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/SysMessageService.java
@@ -0,0 +1,20 @@
+package com.mosty.base.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.base.SysMessageInfo;
+import com.mosty.base.model.query.base.GetMyMessageQuery;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ **/
+public interface SysMessageService {
+
+    @ApiOperation("发送消息")
+    Integer sendMsg(SysMessageInfoInsertDto dto);
+
+    @ApiOperation("获取我的消息列表")
+    IPage<SysMessageInfo> getPageList(GetMyMessageQuery dto);
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/UserConfigService.java b/mosty-base/src/main/java/com/mosty/base/service/UserConfigService.java
new file mode 100644
index 0000000..0f998ed
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/UserConfigService.java
@@ -0,0 +1,13 @@
+package com.mosty.base.service;
+
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface UserConfigService {
+
+    @ApiOperation("获取用户配置信息")
+    SysUserAppHomeconfigVo getUserConfig(int userId, int homeId);
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/UserDeptService.java b/mosty-base/src/main/java/com/mosty/base/service/UserDeptService.java
new file mode 100644
index 0000000..e138bc1
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/UserDeptService.java
@@ -0,0 +1,34 @@
+package com.mosty.base.service;
+
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ **/
+public interface UserDeptService {
+
+    @ApiOperation("查询所有的用户数据（包含对应的部门信息）")
+    List<SysUserDeptVO> getUserAll(String deptid);
+
+    @ApiOperation("查询部门下的人员信息")
+    List<SysUserDeptVO> getUserList(String deptid);
+
+    @ApiOperation("根据用户ID，获取用户部门信息")
+    DeptInfoVo getDeptInfoByUserId(String userId);
+
+    @ApiOperation("查询部门下的总人数（包含子部门）")
+    Integer getUserCount(String deptid);
+
+    @ApiOperation("查询用户是否有该部门的数据权限")
+    boolean getDataPermission(String sfz, String deptcode);
+
+    @ApiOperation("根据身份证号，获取用户部门信息")
+    DeptInfoVo getDeptInfoBySfzh(String sfzh);
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/UserInfoService.java b/mosty-base/src/main/java/com/mosty/base/service/UserInfoService.java
new file mode 100644
index 0000000..8e11fd0
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/UserInfoService.java
@@ -0,0 +1,15 @@
+package com.mosty.base.service;
+
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserInfoVO;
+import io.swagger.annotations.ApiOperation;
+
+public interface UserInfoService {
+
+    @ApiOperation("根据用户Id获取用户详情信息")
+    SysUser getUserInfo(String userId);
+
+    @ApiOperation("根据用户Id获取用户详情信息")
+    SysUser getUserInfoBySfzh(String sfzh);
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/DeptServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/DeptServiceImpl.java
new file mode 100644
index 0000000..2621832
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/DeptServiceImpl.java
@@ -0,0 +1,726 @@
+package com.mosty.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.mapper.DeptMapper;
+import com.mosty.base.mapper.TbOrgMapper;
+import com.mosty.base.mapper.TbUserMapper;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.entity.base.TbOrg;
+import com.mosty.base.model.entity.base.TbUser;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.DeptService;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.mosty.common.core.business.entity.vo.SysRoleVO;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ **/
+@Service
+@AllArgsConstructor
+public class DeptServiceImpl extends ServiceImpl<DeptMapper, SysDept>
+        implements DeptService {
+
+    private final SysRoleService sysRoleService;
+    private final TbOrgMapper tbOrgMapper;
+    private final SysUserMapper sysUserMapper;
+    private final TbUserMapper tbUserMapper;
+    private final SysUserDeptMapper sysUserDeptMapper;
+
+    @Override
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        DeptInfoVo vo = new DeptInfoVo();
+        SysDept dept = this.baseMapper.selectById(deptid);
+        if (dept != null) {
+            vo.setOrgType(dept.getOrgType());
+            vo.setOrgLevel(dept.getOrgLevel());
+            String rootPath = dept.getRootPath();
+            // 省局
+            if (dept.getParentId() == 0) {
+                this.setDept(vo, dept);
+                return vo;
+            }
+            if (rootPath != null) {
+                String[] paths = rootPath.split("_");
+                if (paths.length == 2) {
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept1.getOrgLevel())) {
+                        this.setDsz(vo, dept1);
+                    }
+                    return vo;
+                } else if (paths.length == 3) {
+//                    if ("30".equals(dept.getOrgLevel())) {
+//
+//                    }
+                    this.setFxj(vo, dept);
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept1.getOrgLevel())) {
+                        this.setDsz(vo, dept1);
+                    }
+                    return vo;
+                } else if (paths.length >= 4) {
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[2]);
+                    this.setFxj(vo, dept1);
+                    SysDept dept2 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept2.getOrgLevel())) {
+                        this.setDsz(vo, dept2);
+                    }
+                }
+            }
+        }
+        return vo;
+    }
+
+    @Override
+    public List<DeptInfoVo> getDeptAll() {
+        List<SysDept> deptList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .ne(SysDept::getOrgCode, "510000000000")
+                        .ne(SysDept::getOrgCode, "511400000000")
+                        .ne(SysDept::getOrgCode, "510100000000")
+                        .ne(SysDept::getOrgCode, "5100002626")
+        );
+        List<DeptInfoVo> list = new ArrayList<>();
+        deptList.forEach(item -> {
+            DeptInfoVo dept = this.getOrgByDeptId(String.valueOf(item.getId()));
+            list.add(dept);
+        });
+        return list;
+    }
+
+    @Override
+    public List<DeptInfoVo> getChildDept(GetDeptListDTO dto) {
+        SysDept dept = this.baseMapper.selectById(dto.getDeptid());
+        List<DeptInfoVo> list = new ArrayList<>();
+        DeptInfoVo vo = this.getOrgByDeptId(String.valueOf(dept.getId()));
+        list.add(vo);
+        // 查询下级部门
+        List<SysDept> tempList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, dept.getId())
+                        .notIn(!CollectionUtils.isEmpty(dto.getInDeptids()), SysDept::getId, dto.getInDeptids())
+                        .in(!CollectionUtils.isEmpty(dto.getLevels()), SysDept::getOrgLevel, dto.getLevels())
+                        .eq(SysDept::getXtZxbz, "0")
+        );
+        tempList.forEach(item -> {
+            DeptInfoVo temp = this.getOrgByDeptId(String.valueOf(item.getId()));
+            list.add(temp);
+        });
+        return list;
+    }
+
+    @Override
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        DeptInfoVo vo = new DeptInfoVo();
+        SysDept dept = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getOrgCode, orgcode)
+        );
+        if (dept != null) {
+            vo.setOrgType(dept.getOrgType());
+            vo.setOrgLevel(dept.getOrgLevel());
+            String rootPath = dept.getRootPath();
+            // 省局
+            if (dept.getParentId() == 0) {
+                this.setDept(vo, dept);
+                return vo;
+            }
+            if (rootPath != null) {
+                String[] paths = rootPath.split("_");
+                if (paths.length == 2) {
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept1.getOrgLevel())) {
+                        this.setDsz(vo, dept1);
+                    }
+                    return vo;
+                } else if (paths.length == 3) {
+//                    if ("30".equals(dept.getOrgLevel())) {
+//                    }
+                    this.setFxj(vo, dept);
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept1.getOrgLevel())) {
+                        this.setDsz(vo, dept1);
+                    }
+                    return vo;
+                } else if (paths.length >= 4) {
+                    this.setDept(vo, dept);
+                    SysDept dept1 = this.baseMapper.selectById(paths[2]);
+                    this.setFxj(vo, dept1);
+                    SysDept dept2 = this.baseMapper.selectById(paths[1]);
+                    if ("20".equals(dept2.getOrgLevel())) {
+                        this.setDsz(vo, dept2);
+                    }
+                }
+            }
+        } else {
+            return null;
+        }
+        return vo;
+    }
+
+    @Override
+    public List<SysDeptDTO> getPcsByFxjdm(String orgcode) {
+        List<SysDeptDTO> rList = new ArrayList<>();
+        SysDept dept = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getOrgCode, orgcode)
+        );
+        if (dept != null) {
+            List<SysDept> list = this.baseMapper.selectList(
+                    new LambdaQueryWrapper<SysDept>()
+                            .eq(SysDept::getParentId, dept.getId())
+                            .like(SysDept::getOrgName, "派出所")
+            );
+            list.forEach(item -> {
+                SysDeptDTO dto = new SysDeptDTO();
+                BeanUtils.copyProperties(item, dto);
+                rList.add(dto);
+            });
+        }
+        return rList;
+    }
+
+    @Override
+    public List<SysDept> getOrg(SysDeptQuery deptQuery) {
+        List<String> orgBizType = StringUtils.isNotBlank(deptQuery.getOrgBizTypes()) ? Arrays.asList(deptQuery.getOrgBizTypes().split(",")) : null;
+        List<String> orgLevel = StringUtils.isNotBlank(deptQuery.getOrgLevels()) ? Arrays.asList(deptQuery.getOrgLevels().split(",")) : null;
+        return this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .in(!CollectionUtils.isEmpty(orgBizType), SysDept::getOrgBizType, orgBizType)
+                        .in(!CollectionUtils.isEmpty(orgLevel), SysDept::getParentId, orgLevel)
+        );
+    }
+
+    @Override
+    public List<SysDept> getOrganizationList(GetSysDeptListQuery query) {
+        if (null == query) {
+            return null;
+        }
+
+        //组装查询参数
+        QueryWrapper<SysDept> qw = new QueryWrapper<>();
+
+        //主键
+        if (null != query.getId()) {
+            qw.eq("id", query.getId());
+        }
+
+        //组织机构代码
+        if (!StringUtils.isBlank(query.getOrgCode())) {
+            qw.eq("org_code", query.getOrgCode());
+        }
+
+        //组织机构名称
+        if (!StringUtils.isBlank(query.getOrgName())) {
+            qw.like("org_name", query.getOrgName());
+        }
+
+        //组织机构类型
+        if (!StringUtils.isBlank(query.getOrgType())) {
+            qw.in("org_type", Arrays.asList(query.getOrgType().split(",")));
+        }
+
+        //不需要的组织机构类型
+        if (!StringUtils.isBlank(query.getOrgTypeRid())) {
+            qw.notIn("org_type", Arrays.asList(query.getOrgTypeRid().split(",")));
+        }
+
+        //组织机构等级
+        if (!StringUtils.isBlank(query.getOrgLevel())) {
+            qw.in("org_level", Arrays.asList(query.getOrgLevel().split(",")));
+        }
+
+        //不需要的组织机构等级
+        if (!StringUtils.isBlank(query.getOrgLevelRid())) {
+            qw.notIn("org_level", Arrays.asList(query.getOrgLevelRid().split(",")));
+        }
+
+        //组织机构业务类型
+        if (!StringUtils.isBlank(query.getOrgBizType())) {
+            qw.in("org_biz_type", Arrays.asList(query.getOrgBizType().split(",")));
+        }
+
+        //不需要的组织机构业务类型
+        if (!StringUtils.isBlank(query.getOrgBizTypeRid())) {
+            qw.notIn("org_biz_type", Arrays.asList(query.getOrgBizTypeRid().split(",")));
+        }
+
+        //组织机构编号
+        if (!StringUtils.isBlank(query.getOrgNo())) {
+            qw.eq("org_no", query.getOrgNo());
+        }
+
+        //上级组织机构主键ID
+        if (null != query.getParentId()) {
+            qw.eq("parent_id", query.getParentId());
+        }
+
+        //组织机构简称
+        if (!StringUtils.isBlank(query.getOrgJc())) {
+            qw.like("org_jc", query.getOrgJc());
+        }
+
+        //组织机构全称
+        if (!StringUtils.isBlank(query.getOrgQc())) {
+            qw.like("org_qc", query.getOrgQc());
+        }
+
+        //组织机构地址
+        if (!StringUtils.isBlank(query.getAddress())) {
+            qw.like("address", query.getAddress());
+        }
+
+        //组织机构电话
+        if (!StringUtils.isBlank(query.getLinkTel())) {
+            qw.like("link_tel", query.getLinkTel());
+        }
+
+        //组织机构联系人
+        if (!StringUtils.isBlank(query.getLinkMan())) {
+            qw.like("link_man", query.getLinkMan());
+        }
+
+        //组织机构联系人电话
+        if (!StringUtils.isBlank(query.getLinkManTel())) {
+            qw.like("link_man_tel", query.getLinkManTel());
+        }
+
+        //组织机构主页地址
+        if (!StringUtils.isBlank(query.getWebUrl())) {
+            qw.like("web_url", query.getWebUrl());
+        }
+
+        //组织机构邮箱地址
+        if (!StringUtils.isBlank(query.getEmail())) {
+            qw.like("email", query.getEmail());
+        }
+
+        //组织机构行政区划
+        if (!StringUtils.isBlank(query.getXzqh())) {
+            qw.in("xzqh", Arrays.asList(query.getXzqh().split(",")));
+        }
+
+        //注销标志（0 有效， 1 失效）
+        if (null != query.getXtZxbz()) {
+            qw.eq("xt_zxbz", query.getXtZxbz());
+        }
+
+        //正序字段（使用英语逗号“,”分隔）
+        if (!StringUtils.isBlank(query.getOrderByAsc())) {
+            for (String s : query.getOrderByAsc().split(",")) {
+                qw.orderByAsc(s);
+            }
+        } else {
+            qw.orderByAsc("org_code");
+        }
+
+        //倒序字段（使用英语逗号“,”分隔）
+        if (!StringUtils.isBlank(query.getOrderByDesc())) {
+            for (String s : query.getOrderByDesc().split(",")) {
+                qw.orderByDesc(s);
+            }
+        }
+
+        return this.baseMapper.selectList(qw);
+    }
+
+    @Override
+    public void resetRootPath() {
+        List<SysDept> deptList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .isNotNull(SysDept::getBz)
+                        .ne(SysDept::getBz, "")
+        );
+        deptList.forEach(dept -> {
+            if (StringUtils.isNotBlank(dept.getRootPath())) {
+                // 同步rootPath
+                if (!dept.getRootPath().contains("_510000000000")) {
+                    dept.setRootPath("_510000000000" + dept.getRootPath());
+                }
+                List<String> rootPathList = Arrays.asList(dept.getRootPath().split("_"));
+                rootPathList = rootPathList.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
+                String root = rootPathList.stream().map(rootPath -> {
+                    SysDept sysDept = this.baseMapper.selectOne(
+                            new LambdaQueryWrapper<SysDept>()
+                                    .eq(SysDept::getOrgCode, rootPath)
+                    );
+                    if (sysDept != null) {
+                        return String.valueOf(sysDept.getId());
+                    }
+                    return "";
+                }).collect(Collectors.joining("_"));
+                dept.setRootPath(root + "_" + dept.getId());
+                // 同步parentId
+                if (!"0".equals(dept.getBz()) && !"".equals(dept.getBz()) && dept.getBz() != null) {
+                    String parentCode = dept.getBz();
+                    SysDept sysDept = this.baseMapper.selectOne(
+                            new LambdaQueryWrapper<SysDept>()
+                                    .eq(SysDept::getOrgCode, parentCode)
+                    );
+                    dept.setParentId(sysDept.getId());
+                    dept.setBz("");
+                }
+                this.baseMapper.updateById(dept);
+            }
+        });
+    }
+
+    @Override
+    public String getSsbm(String ssbmdm, String isChild) {
+        isChild = StringUtils.isNotBlank(isChild) ? isChild : "1";
+        UserInfo user = UserInfoManager.getUser();
+        // 如果用户信息存在，先查询用户权限
+        SysRoleVO role = null;
+        if (StringUtils.isBlank(ssbmdm)) {
+            if (user != null) {
+                ssbmdm = user.getDeptCode();
+                // 查询用户权限
+                List<SysRoleVO> userRoles = sysRoleService.getUserRoleList(user.getUserId());
+                if (!CollectionUtils.isEmpty(userRoles)) {
+                    int level = Integer.parseInt(userRoles.get(0).getDataPermissionLevel());
+                    role = userRoles.get(0);
+                    for (SysRoleVO item : userRoles) {
+                        if (level > Integer.parseInt(item.getDataPermissionLevel())) {
+                            level = Integer.parseInt(item.getDataPermissionLevel());
+                            role = item;
+                        }
+                    }
+                }
+            }
+            if (role != null && !"5".equals(role.getDataPermissionLevel())) {
+                String level = role.getDataPermissionLevel();
+                if ("1".equals(level) || "2".equals(level)) {
+                    return "1".equals(isChild) ? ssbmdm.substring(0, 2) : ssbmdm;
+                } else if ("3".equals(level)) {
+                    return "1".equals(isChild) ? ssbmdm.substring(0, 4) : ssbmdm;
+                } else if ("4".equals(level)) {
+                    //区县获取上级部门 截取到最后一个0
+                    if (StringUtils.isNotEmpty(user.getFxjDeptCode())) {
+                        return "1".equals(isChild) ? this.getssbm(user.getFxjDeptCode()) : ssbmdm;
+                    } else {
+                        return "1".equals(isChild) ? ssbmdm.substring(0, 6) : ssbmdm;
+                    }
+                } else if ("6".equals(level)) {
+                    return ssbmdm;
+                }
+            } else {
+                if ("1".equals(isChild)) {
+                    SysDept dept = this.baseMapper.selectOne(
+                            new LambdaQueryWrapper<SysDept>()
+                                    .eq(SysDept::getXtZxbz, "0")
+                                    .eq(SysDept::getOrgCode, ssbmdm)
+                    );
+                    if (dept == null) {
+                        throw new BusinessException("部门信息不存在！");
+                    }
+                    if (StringUtils.isBlank(dept.getOrgLevel())) {
+                        return ssbmdm;
+                    }
+                    switch (dept.getOrgLevel()) {
+                        case "10":
+                        case "11":
+                            return ssbmdm.substring(0, 2);
+                        case "21":
+                        case "31":
+                            return ssbmdm.substring(0, 8);
+                        case "12":
+                        case "32":
+                        case "22":
+                            return ssbmdm.substring(0, 10);
+                        case "20":
+                            return ssbmdm.substring(0, 4);
+                        case "30":
+                            return ssbmdm.substring(0, 6);
+                        default:
+                            return ssbmdm;
+                    }
+                }
+            }
+        } else {
+            if ("1".equals(isChild)) {
+                SysDept dept = this.baseMapper.selectOne(
+                        new LambdaQueryWrapper<SysDept>()
+                                .eq(SysDept::getXtZxbz, "0")
+                                .eq(SysDept::getOrgCode, ssbmdm)
+                );
+                if (dept == null) {
+                    throw new BusinessException("部门信息不存在！");
+                }
+                if (StringUtils.isBlank(dept.getOrgLevel())) {
+                    return ssbmdm;
+                }
+                switch (dept.getOrgLevel()) {
+                    case "10":
+                    case "11":
+                        return ssbmdm.substring(0, 2);
+                    case "21":
+                    case "31":
+                        return ssbmdm.substring(0, 8);
+                    case "12":
+                    case "32":
+                    case "22":
+                        return ssbmdm.substring(0, 10);
+                    case "20":
+                        return ssbmdm.substring(0, 4);
+                    case "30":
+                        return ssbmdm.substring(0, 6);
+                    default:
+                        return ssbmdm;
+                }
+            }
+        }
+        return ssbmdm;
+    }
+
+    @Override
+    public List<SysDept> getDeptByType(String type, String ssbmdm) {
+        String level = "40";
+        if ("01".equals(type)) {
+            level = "20";
+        } else if ("02".equals(type)) {
+            level = "30";
+        } else if ("03".equals(type)) {
+            level = "40";
+        }
+        String parentId = null;
+        if (StringUtils.isNotBlank(ssbmdm)) {
+            SysDept dept = this.baseMapper.selectOne(
+                    new LambdaQueryWrapper<SysDept>()
+                            .eq(SysDept::getOrgCode, ssbmdm)
+            );
+            if (dept == null) throw new BusinessException("部门未找到");
+            SysDept parentDept = this.baseMapper.selectById(dept.getId());
+            parentId = String.valueOf(parentDept.getId());
+        }
+        return this.baseMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getXtZxbz, "0")
+                        .eq(SysDept::getOrgLevel, level)
+                        .eq(StringUtils.isNotBlank(parentId), SysDept::getParentId, parentId)
+                        .orderByAsc(SysDept::getOrgNo)
+        );
+    }
+
+
+    @Override
+    public List<String> getParentOrgCode(String ssbmdm) {
+        SysDept dept = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getOrgCode, ssbmdm)
+        );
+        if (dept != null && !StringUtils.isBlank(dept.getRootPath())) {
+            List<String> arr = Arrays.asList(dept.getRootPath().split("_"));
+            return arr.stream().map(item -> {
+                SysDept tempDept = this.baseMapper.selectById(item);
+                if (tempDept != null) return tempDept.getOrgCode();
+                return null;
+            }).collect(Collectors.toList()).stream().filter(Objects::nonNull).collect(Collectors.toList());
+        }
+        return null;
+    }
+
+    @Override
+    public SysDept getParentDept(String ssbmid) {
+        SysDept dept = this.baseMapper.selectById(ssbmid);
+        if (dept != null) {
+            return this.baseMapper.selectById(dept.getParentId());
+        }
+        return null;
+    }
+
+    @Override
+    public SysDept getSysDeptBySsbmdm(String ssbmdm) {
+        return this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getOrgCode, ssbmdm)
+        );
+    }
+
+    // 设置所属单位
+    private void setDept(DeptInfoVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDeptid(String.valueOf(dept.getId()));
+            vo.setDeptcode(dept.getOrgCode());
+            vo.setDeptname(dept.getOrgName());
+        }
+    }
+
+    // 设置分县局
+    private void setFxj(DeptInfoVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setFxjid(String.valueOf(dept.getId()));
+            vo.setFxjcode(dept.getOrgCode());
+            vo.setFxjname(dept.getOrgName());
+        }
+    }
+
+    // 设置地市州
+    private void setDsz(DeptInfoVo vo, SysDept dept) {
+        if (dept != null) {
+            vo.setDszid(String.valueOf(dept.getId()));
+            vo.setDszcode(dept.getOrgCode());
+            vo.setDszname(dept.getOrgName());
+        }
+    }
+
+    @Override
+    public void tbZjjgDm() {
+        List<TbOrg> tbOrgList = this.tbOrgMapper.selectList(new LambdaQueryWrapper<TbOrg>().orderByAsc(TbOrg::getOrgId));
+        if (!CollectionUtils.isEmpty(tbOrgList)) {
+            for (TbOrg tbOrg : tbOrgList) {
+                SysDept sysDept = this.getSysDeptBySsbmdm(tbOrg.getOrgId());
+                if (ObjectUtils.isEmpty(sysDept)) {
+                    sysDept = new SysDept();
+                    sysDept.setOrgCode(tbOrg.getOrgId());
+                    sysDept.setOrgName(tbOrg.getOrgName());
+                    sysDept.setOrgType("01");
+                    sysDept.setOrgLevel(tbOrg.getOrgLevel());
+                    if (tbOrg.getOrgName().contains("派出所")) {
+                        sysDept.setOrgBizType("02");
+                    } else if (tbOrg.getOrgName().contains("特")) {
+                        sysDept.setOrgBizType("03");
+                    } else if (tbOrg.getOrgName().contains("治安")) {
+                        sysDept.setOrgBizType("04");
+                    } else if (tbOrg.getOrgName().contains("禁毒")) {
+                        sysDept.setOrgBizType("05");
+                    } else if (tbOrg.getOrgName().contains("交警")) {
+                        sysDept.setOrgBizType("06");
+                    } else if (tbOrg.getOrgName().contains("刑侦")) {
+                        sysDept.setOrgBizType("07");
+                    } else if (tbOrg.getOrgName().contains("指挥")) {
+                        sysDept.setOrgBizType("08");
+                    } else {
+                        sysDept.setOrgBizType("09");
+                    }
+                    sysDept.setOrgNo("99");
+                    sysDept.setOrgJc(tbOrg.getOrgJc());
+                    sysDept.setOrgQc(tbOrg.getOrgName());
+                    sysDept.setXtZxbz(0);
+
+                    this.baseMapper.insert(sysDept);
+                    //最后添加
+                    SysDept sysDept1 = this.getSysDeptBySsbmdm(tbOrg.getParentId());
+                    if (!ObjectUtils.isEmpty(sysDept1)) {
+                        sysDept.setRootPath(sysDept1.getRootPath() + "_" + sysDept.getId());
+                        sysDept.setParentId(sysDept1.getId());
+                    }
+                    this.baseMapper.updateById(sysDept);
+                }
+            }
+        }
+
+
+    }
+
+    @Override
+    public void tbZzjgRy() {
+        List<TbUser> tbUsers = this.tbUserMapper.selectList(new LambdaQueryWrapper<TbUser>());
+        if (!CollectionUtils.isEmpty(tbUsers)) {
+            for (TbUser user : tbUsers) {
+                SysUser sysUser1 = this.sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getIdEntityCard, user.getSfzh()).eq(SysUser::getXtZxbz, "0"));
+                if (ObjectUtils.isEmpty(sysUser1)) {
+                    SysUser sysUser = new SysUser();
+                    sysUser.setPositionName(user.getZw());
+                    sysUser.setIsVirtualUser("02");
+                    sysUser.setLoginName(user.getName());
+                    sysUser.setPassword("E10ADC3949BA59ABBEcm9OiHRC56E057F20F883E");
+                    sysUser.setUserName(user.getName());
+                    sysUser.setUserType("01");
+                    sysUser.setMobile(user.getDhhm());
+                    sysUser.setTelePhone(user.getDh());
+                    sysUser.setIdEntityCard(user.getSfzh());
+                    sysUser.setTypeName("正式民警");
+                    sysUser.setInDustRialId(user.getJh());
+                    sysUser.setInDustRialId(user.getJh());
+                    //计算男女
+                    int gender = Integer.parseInt(user.getSfzh().substring(16, 17));
+                    if (gender % 2 == 1) {
+                        sysUser.setSex("1");
+                    } else {
+                        sysUser.setSex("2");
+                    }
+                    sysUser.setNation("01");
+                    sysUser.setType("03");
+                    sysUser.setXtZxbz(0);
+                    this.sysUserMapper.insert(sysUser);
+                    //根据所属部门查询单位
+                    SysDept sysDept = this.getSysDeptBySsbmdm(user.getSsbmdm());
+                    if (!ObjectUtils.isEmpty(sysDept)) {
+                        if (sysDept.getOrgName().contains("派出所")) {
+                            sysUser.setType("03");
+                        } else if (sysDept.getOrgName().contains("特")) {
+                            sysUser.setType("01");
+                        } else if (sysDept.getOrgName().contains("交警"))  {
+                            sysUser.setType("02");
+                        }
+                        this.sysUserMapper.updateById(sysUser);
+                        SysUserDept sysUserDept = new SysUserDept();
+                        sysUserDept.setUserId(sysUser.getId());
+                        sysUserDept.setDeptId(sysDept.getId());
+                        this.sysUserDeptMapper.insert(sysUserDept);
+                    }
+
+                } else {
+                    SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(new LambdaQueryWrapper<SysUserDept>().eq(SysUserDept::getUserId, sysUser1.getId()));
+                    SysDept sysDept = this.getSysDeptBySsbmdm(user.getSsbmdm());
+                    if (!ObjectUtils.isEmpty(sysDept)) {
+                        if(ObjectUtils.isEmpty(sysUserDept)){
+                            sysUserDept =new SysUserDept();
+                            sysUserDept.setUserId(sysUser1.getId());
+                        }
+                        sysUserDept.setDeptId(sysDept.getId());
+                        this.sysUserDeptMapper.insert(sysUserDept);
+                    }
+                }
+
+
+            }
+        }
+    }
+
+    public String getssbm(String ssbmdm) {
+        if (StringUtils.isNotEmpty(ssbmdm) && ssbmdm.length() == 12) {
+            String[] split = ssbmdm.split("");
+            for (int i = split.length - 1; i >= 0; i--) {
+                String s = split[i];
+                if (!s.equals("0")) {
+                    ssbmdm = ssbmdm.substring(0, i + 1);
+                    break;
+                }
+            }
+        }
+        return ssbmdm;
+    }
+
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/GajgSearchServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/GajgSearchServiceImpl.java
new file mode 100644
index 0000000..b9f25bd
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/GajgSearchServiceImpl.java
@@ -0,0 +1,44 @@
+package com.mosty.base.service.impl;
+
+import com.mosty.base.mapper.GajgSearchMapper;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.base.service.GajgSearchService;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class GajgSearchServiceImpl implements GajgSearchService {
+
+    private GajgSearchMapper gajgSearchMapper;
+
+    @Override
+    public TbYsGajgVo getGajg() {
+        UserInfo user = UserInfoManager.get();
+        TbYsGajg gajg = this.gajgSearchMapper.getGajg(String.valueOf(user.getDeptId()));
+        if (gajg == null) {
+            String gajgId = this.gajgSearchMapper.getGajgFromGlbl(String.valueOf(user.getDeptId()));
+            gajg = this.gajgSearchMapper.getGajgById(gajgId);
+        }
+        if (gajg != null) { // 如果不为空 获取经纬度
+            TbYsGajgVo vo = new TbYsGajgVo(); // 给前段传的vo
+            BeanUtils.copyProperties(gajg, vo); // 复制属性给vo
+            if (gajg.getDtm() != null) { // 如果获取到的dtm[面不为空]
+                vo.setDtm(JtsUtils.decodePolygon(gajg.getDtm())); // 把面dtm【polygon】转换成point数组
+            }
+            return vo; // 返回所有信息
+        }
+        return null;
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/SysConfigNewServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/SysConfigNewServiceImpl.java
new file mode 100644
index 0000000..bf3b65c
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/SysConfigNewServiceImpl.java
@@ -0,0 +1,67 @@
+package com.mosty.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.service.SysConfigNewService;
+import com.mosty.common.config.Excel.DictUtils;
+import com.mosty.common.config.entity.SysConfig;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.mapper.SysConfigMapper;
+import com.mosty.common.config.mapper.SysDictItemMapper;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class SysConfigNewServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig>
+        implements SysConfigNewService {
+
+    private final SysDictItemMapper sysDictItemMapper;
+
+    /**
+     * 项目启动时，初始化字典到缓存
+     */
+    @PostConstruct
+    public void init() {
+        loadingDictCache();
+    }
+
+    /**
+     * 加载字典缓存数据
+     */
+    public void loadingDictCache() {
+        List<SysDictItem> sysDictItems = this.sysDictItemMapper.selectList(new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getXtZxbz, 0));
+        if (CollectionUtils.isNotEmpty(sysDictItems)) {
+            Map<String, List<SysDictItem>> dictDataMap = sysDictItems.stream().collect(Collectors.groupingBy(SysDictItem::getZdbh));
+            for (Map.Entry<String, List<SysDictItem>> entry : dictDataMap.entrySet()) {
+                DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictItem::getPx)).collect(Collectors.toList()));
+            }
+        }
+    }
+
+    @Override
+    public String getValue(String pzj) {
+        if (StringUtils.isBlank(pzj)) {
+            return null;
+        }
+        SysConfig config = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysConfig>()
+                        .eq(SysConfig::getPzj, pzj)
+                        .eq(SysConfig::getXtZxbz, "0")
+        );
+        return config == null ? null : config.getPzz();
+    }
+
+
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/SysMessageServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/SysMessageServiceImpl.java
new file mode 100644
index 0000000..c8e51e3
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/SysMessageServiceImpl.java
@@ -0,0 +1,88 @@
+package com.mosty.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.query.base.GetMyMessageQuery;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.model.dto.base.SysMessageItemInsertDto;
+import com.mosty.base.model.dto.base.SysMessageInfo;
+import com.mosty.base.model.dto.base.SysMessageItem;
+import com.mosty.base.mapper.SysMessageInfoMapper;
+import com.mosty.base.mapper.SysMessageItemMapper;
+import com.mosty.base.service.SysMessageService;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ **/
+@Service
+@AllArgsConstructor
+public class SysMessageServiceImpl extends ServiceImpl<SysMessageInfoMapper, SysMessageInfo>
+        implements SysMessageService {
+
+    private final SysMessageItemMapper sysMessageItemMapper;
+
+    @Override
+    @Transactional
+    public Integer sendMsg(SysMessageInfoInsertDto dto) {
+        SysMessageInfo info = new SysMessageInfo();
+        BeanUtils.copyProperties(dto, info);
+        info.setXtCjsj(new Date());
+        info.setXtLrsj(new Date());
+        info.setXtLrrid("admin");
+        info.setXtLrrxm("系统消息");
+        info.setXtLrip(IpUtil.getIpAddress());
+        info.setXtZhxgsj(new Date());
+        info.setXtZhxgrid("admin");
+        info.setXtZhxgip(IpUtil.getIpAddress());
+        info.setXtZhxgrxm("系统消息");
+        info.setXtZxbz(0);
+        info.setXtZxyy(null);
+        int count = this.baseMapper.insert(info);
+        List<SysMessageItemInsertDto> itemList = dto.getItemList();
+        itemList.forEach(itemDto -> {
+            SysMessageItem item = new SysMessageItem();
+            BeanUtils.copyProperties(itemDto, item);
+            item.setMessageId(info.getId());
+            item.setGroupId(info.getGroupId());
+            item.setXtCjsj(new Date());
+            item.setXtLrsj(new Date());
+            item.setXtLrrid("admin");
+            item.setXtLrrxm("系统消息");
+            item.setXtLrip(IpUtil.getIpAddress());
+            item.setXtZhxgsj(new Date());
+            item.setXtZhxgrid("admin");
+            item.setXtZhxgip(IpUtil.getIpAddress());
+            item.setXtZhxgrxm("系统消息");
+            item.setXtZxbz(0);
+            item.setXtZxyy(null);
+            this.sysMessageItemMapper.insert(item);
+        });
+        return count;
+    }
+
+    @Override
+    public IPage<SysMessageInfo> getPageList(GetMyMessageQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        IPage<SysMessageInfo> page = new Page<SysMessageInfo>(dto.getPageNum(), dto.getPageSize());
+        return this.baseMapper.selectPage(page,
+                new LambdaQueryWrapper<SysMessageInfo>()
+                        .eq(SysMessageInfo::getXtZxbz, 0)
+                        .last(" and id in (select a.message_id from sys_message_item a " +
+                                "where a.xt_zxbz = 0 and a.xxjsr_id = '" + user.getUserId() + "') " +
+                                "order by xt_cjsj desc")
+        );
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/UserConfigServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/UserConfigServiceImpl.java
new file mode 100644
index 0000000..8e953a1
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/UserConfigServiceImpl.java
@@ -0,0 +1,135 @@
+package com.mosty.base.service.impl;
+
+import com.alibaba.nacos.common.utils.UuidUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.mapper.UserConfigMapper;
+import com.mosty.base.service.UserConfigService;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.*;
+import com.mosty.common.core.business.entity.request.SysUserAppHomeconfigQuery;
+import com.mosty.common.core.business.entity.vo.DeleteDeptVO;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigPlateVo;
+import com.mosty.common.core.business.entity.vo.SysUserAppHomeconfigVo;
+import com.mosty.common.core.business.mapper.*;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class UserConfigServiceImpl extends ServiceImpl<UserConfigMapper, SysUserAppHomeconfig>
+        implements UserConfigService {
+
+    private final SysUserAppHomeconfigPlateMapper sysUserAppHomeconfigPlateMapper;
+    private final SysUserAppHomeconfigPlateListMapper sysUserAppHomeconfigPlateListMapper;
+    private final SysAppHomeconfigMapper sysAppHomeconfigMapper;
+    private final SysUserMapper sysUserMapper;
+    private final SysAppHomeconfigPlateMapper sysAppHomeconfigPlateMapper;
+    private final SysAppHomeconfigPlateListMapper sysAppHomeconfigPlateListMapper;
+
+    @Override
+    public SysUserAppHomeconfigVo getUserConfig(int userId, int homeId) {
+        SysUser user = this.sysUserMapper.selectById(userId);
+        if (user == null) {
+            throw new BusinessException("没有获取到用户信息！！");
+        }
+        SysUserAppHomeconfigVo vo = new SysUserAppHomeconfigVo();
+        // 获取用户配置首页
+        SysUserAppHomeconfig homeconfig = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysUserAppHomeconfig>()
+                        .eq(SysUserAppHomeconfig::getHomeid, homeId)
+                        .eq(SysUserAppHomeconfig::getUserId, userId)
+                        .eq(SysUserAppHomeconfig::getXtZxbz, DeletedEnum.NATURE.code)
+        );
+        // 获取用户模板配置
+        if (homeconfig != null) {
+            BeanUtils.copyProperties(homeconfig, vo);
+            List<SysUserAppHomeconfigPlate> plateList = this.sysUserAppHomeconfigPlateMapper.selectList(
+                    new LambdaQueryWrapper<SysUserAppHomeconfigPlate>()
+                            .eq(SysUserAppHomeconfigPlate::getPzId, homeconfig.getId())
+                            .eq(SysUserAppHomeconfigPlate::getXtZxbz, DeletedEnum.NATURE.code)
+            );
+            List<SysUserAppHomeconfigPlateVo> plates = new ArrayList<>();
+            plateList.forEach(plate -> {
+                SysUserAppHomeconfigPlateVo plateVo = new SysUserAppHomeconfigPlateVo();
+                BeanUtils.copyProperties(plate, plateVo);
+                // 获取用户配置模块
+                List<SysUserAppHomeconfigPlateList> plateItemList = this.sysUserAppHomeconfigPlateListMapper.selectList(
+                        new LambdaQueryWrapper<SysUserAppHomeconfigPlateList>()
+                                .eq(SysUserAppHomeconfigPlateList::getXtZxbz, DeletedEnum.NATURE.code)
+                                .eq(SysUserAppHomeconfigPlateList::getPzPlateId, plate.getId())
+                );
+                plateVo.setPlateList(plateItemList);
+                plates.add(plateVo);
+            });
+            vo.setPlates(plates);
+            return vo;
+        } else {
+            // 没有获取到用户信息，则保存所有的模板到用户配置表中
+            // 保存用户主页
+            SysAppHomeconfig config = this.sysAppHomeconfigMapper.selectById(homeId);
+            if (config == null) {
+                throw new BusinessException("模板在数据库中没有存在，请联系管理员添加");
+            }
+            homeconfig = new SysUserAppHomeconfig();
+            homeconfig.setHomeid(config.getId());
+            homeconfig.setHomename(config.getHomename());
+            homeconfig.setUserId(user.getId());
+            homeconfig.setUserXm(user.getUserName());
+            homeconfig.setUserSfzh(user.getIdEntityCard());
+            homeconfig.setPzsj(new Date());
+            homeconfig.setSd("02");
+            BeanUtils.copyProperties(homeconfig, vo);
+            // 配置模板
+            List<SysAppHomeconfigPlate> plateList = this.sysAppHomeconfigPlateMapper.selectList(
+                    new LambdaQueryWrapper<SysAppHomeconfigPlate>()
+                            .eq(SysAppHomeconfigPlate::getHomeid, config.getId())
+                            .eq(SysAppHomeconfigPlate::getXtZxbz, DeletedEnum.NATURE.code)
+            );
+            List<SysUserAppHomeconfigPlateVo> plates = new ArrayList<>();
+            for (SysAppHomeconfigPlate item : plateList) {
+                SysUserAppHomeconfigPlate plate = new SysUserAppHomeconfigPlate();
+                SysUserAppHomeconfigPlateVo plateVo = new SysUserAppHomeconfigPlateVo();
+                plate.setPzId(homeconfig.getId());
+                plate.setPlateId(item.getId());
+                plate.setBklx(item.getBklx());
+                plate.setBkmc(item.getBkmc());
+                plate.setBknrs(item.getBksx());
+                plate.setBksx(item.getBksx());
+                this.sysUserAppHomeconfigPlateMapper.insert(plate);
+                BeanUtils.copyProperties(plate, plateVo);
+                // 添加模块
+                List<SysAppHomeconfigPlateList> plateItemList = this.sysAppHomeconfigPlateListMapper.selectList(
+                        new LambdaQueryWrapper<SysAppHomeconfigPlateList>()
+                                .eq(SysAppHomeconfigPlateList::getPlateId, item.getId())
+                                .eq(SysAppHomeconfigPlateList::getXtZxbz, DeletedEnum.NATURE.code)
+                );
+                List<SysUserAppHomeconfigPlateList> plateUserItemList = new ArrayList<>();
+                plateItemList.forEach(itemList -> {
+                    SysUserAppHomeconfigPlateList pl = new SysUserAppHomeconfigPlateList();
+                    pl.setPzId(vo.getId());
+                    pl.setPzPlateId(plate.getPlateId());
+                    pl.setPlateListId(itemList.getId());
+                    pl.setNrmc(itemList.getNrmc());
+                    pl.setBksx(itemList.getNrsx());
+                    pl.setTzdz(itemList.getTzdz());
+                    this.sysUserAppHomeconfigPlateListMapper.insert(pl);
+                    plateUserItemList.add(pl);
+                });
+                plateVo.setPlateList(plateUserItemList);
+                plates.add(plateVo);
+            }
+            vo.setPlates(plates);
+            vo.setPzbks(plates.size());
+            this.baseMapper.insert(homeconfig);
+            return vo;
+        }
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/UserDeptServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/UserDeptServiceImpl.java
new file mode 100644
index 0000000..e34291f
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/UserDeptServiceImpl.java
@@ -0,0 +1,241 @@
+package com.mosty.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.mapper.UserDeptMapper;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.service.UserDeptService;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.SysUserDept;
+import com.mosty.common.core.business.entity.vo.SysRoleVO;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.core.business.mapper.SysDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserDeptMapper;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import com.mosty.common.core.business.service.SysRoleService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ **/
+@Service
+@AllArgsConstructor
+public class UserDeptServiceImpl extends ServiceImpl<UserDeptMapper, SysUser>
+        implements UserDeptService {
+
+    private final SysUserDeptMapper sysUserDeptMapper;
+    private final SysDeptMapper sysDeptMapper;
+    private final DeptServiceImpl deptServiceImpl;
+    private final SysUserMapper sysUserMapper;
+
+    private void getChildList(SysDept dept, List<String> deptIds) {
+        deptIds.add(String.valueOf(dept.getId()));
+        List<SysDept> tempList1 = this.sysDeptMapper.selectList(
+                new LambdaQueryWrapper<SysDept>()
+                        .eq(SysDept::getParentId, dept.getId())
+        );
+        if (tempList1.size() > 0) {
+            deptIds.addAll(tempList1.stream().map(item -> String.valueOf(item.getId())).collect(Collectors.toList()));
+            tempList1.forEach(item -> this.getChildList(item, deptIds));
+        }
+    }
+
+    @Override
+    public Integer getUserCount(String deptid) {
+        SysDept dept = this.sysDeptMapper.selectById(deptid);
+        List<String> deptIds = new ArrayList<>();
+        this.getChildList(dept, deptIds);
+        List<SysUser> userList = this.baseMapper.getUserListByDeptId(deptIds);
+        return userList == null ? 0 : userList.size();
+    }
+
+    private final SysRoleService sysRoleService;
+
+    @Override
+    public boolean getDataPermission(String sfz, String deptcode) {
+        SysUser user = this.sysUserMapper.selectOne(
+                new QueryWrapper<SysUser>()
+                        .eq("id_entity_card", sfz)
+                        .last(" limit 1")
+        );
+        if (user == null) return false;
+        // 查询用户权限
+        List<SysRoleVO> userRoles = sysRoleService.getUserRoleList(user.getId());
+        SysRoleVO role = null;
+        if (!CollectionUtils.isEmpty(userRoles)) {
+            int level = Integer.parseInt(userRoles.get(0).getDataPermissionLevel());
+            role = userRoles.get(0);
+            for (SysRoleVO item : userRoles) {
+                if (level > Integer.parseInt(item.getDataPermissionLevel())) {
+                    level = Integer.parseInt(item.getDataPermissionLevel());
+                    role = item;
+                }
+            }
+        }
+        // 本部门及以下
+        SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                new LambdaQueryWrapper<SysUserDept>()
+                        .eq(SysUserDept::getUserId, user.getId())
+                        .last(" limit 1")
+        );
+        if (sysUserDept == null) return false;
+        SysDept dept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+        if (dept == null) return false;
+        // 如果拥有权限,并不是本部门及以下权限
+        if (role != null && !"5".equals(role.getDataPermissionLevel())) {
+            String level = role.getDataPermissionLevel();
+            // 全部，全省，全市 都是全部数据权限
+            if ("1".equals(level) || "2".equals(level) || "3".equals(level)) return true;
+            if ("4".equals(level)) {
+                DeptInfoVo deptInfoVo = this.deptServiceImpl.getOrgByDeptId(String.valueOf(dept.getId()));
+                // 前6位为县局数据权限，相等则表示有县局权限
+                if (deptInfoVo.getFxjcode().substring(0, 6).equals(deptcode.substring(0, 6))) return true;
+            }
+            // 本部门权限，code全等
+            return "6".equals(level) && dept.getOrgCode().equals(deptcode);
+        } else {
+            return this.level5Data(deptcode, dept);
+        }
+    }
+
+    // 本部门及以下数据权限（根据orglevel判断权限）
+    private boolean level5Data(String deptcode, SysDept dept) {
+        String orglevel = dept.getOrgLevel();
+        String userSsbmdm = dept.getOrgCode();
+        if (StringUtils.isNotEmpty(orglevel)) {
+            switch (orglevel) {
+                case "10":
+                case "11":
+                    userSsbmdm = userSsbmdm.substring(0, 2);
+                    break;
+                case "21":
+                case "31":
+                    userSsbmdm = userSsbmdm.substring(0, 8);
+                    break;
+                case "12":
+                case "32":
+                case "22":
+                    userSsbmdm = userSsbmdm.substring(0, 10);
+                    break;
+                case "20":
+                    userSsbmdm = userSsbmdm.substring(0, 4);
+                    break;
+                case "30":
+                    userSsbmdm = userSsbmdm.substring(0, 6);
+                    break;
+            }
+        }
+        return deptcode.indexOf(userSsbmdm) == 0;
+    }
+
+    @Override
+    public List<SysUserDeptVO> getUserAll(String deptid) {
+        SysDept dept = this.sysDeptMapper.selectById(deptid);
+        List<String> deptIds = new ArrayList<>();
+        this.getChildList(dept, deptIds);
+        List<SysUser> userList = this.baseMapper.getUserListByDeptId(deptIds);
+        List<SysUserDeptVO> list = new ArrayList<>();
+        userList.forEach(user -> {
+            SysUserDeptVO vo = new SysUserDeptVO();
+            BeanUtils.copyProperties(user, vo);
+            // 查询所在部门ID
+            SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                    new QueryWrapper<SysUserDept>()
+                            .eq("user_id", String.valueOf(user.getId()))
+                            .last(" limit 1")
+            );
+            if (sysUserDept != null) {
+                SysDept sysDept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+                if (sysDept != null) {
+                    vo.setDeptId(sysDept.getId());
+                    vo.setDeptName(sysDept.getOrgName());
+                }
+            }
+            list.add(vo);
+        });
+        return list;
+    }
+
+    @Override
+    public List<SysUserDeptVO> getUserList(String deptid) {
+        List<SysUser> userList = this.baseMapper.getUserListByIdAll(deptid);
+        List<SysUserDeptVO> list = new ArrayList<>();
+        userList.forEach(user -> {
+            SysUserDeptVO vo = new SysUserDeptVO();
+            BeanUtils.copyProperties(user, vo);
+            // 查询所在部门ID
+            SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                    new QueryWrapper<SysUserDept>()
+                            .eq("user_id", String.valueOf(user.getId()))
+                            .last(" limit 1")
+            );
+            if (sysUserDept != null) {
+                SysDept sysDept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+                if (sysDept != null) {
+                    vo.setDeptId(sysDept.getId());
+                    vo.setDeptName(sysDept.getOrgName());
+                }
+            }
+            list.add(vo);
+        });
+        return list;
+    }
+
+    @Override
+    public DeptInfoVo getDeptInfoByUserId(String userId) {
+        SysUserDept sysUserDept = this.sysUserDeptMapper.selectOne(
+                new QueryWrapper<SysUserDept>()
+                        .eq("user_id", String.valueOf(userId))
+                        .last(" limit 1")
+        );
+        if (sysUserDept != null) {
+            SysDept sysDept = this.sysDeptMapper.selectById(sysUserDept.getDeptId());
+            if (sysDept != null) {
+                return this.deptServiceImpl.getOrgByDeptId(String.valueOf(sysDept.getId()));
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public DeptInfoVo getDeptInfoBySfzh(String sfzh) {
+        SysUser user = this.sysUserMapper.selectOne(
+                new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getIdEntityCard, sfzh)
+                        .last(" limit 1")
+        );
+        if (ObjectUtils.isEmpty(user)) {
+            SysDept sysDept = this.sysDeptMapper.selectById(user.getId());
+            if (sysDept != null) {
+                return this.deptServiceImpl.getOrgByDeptId(String.valueOf(sysDept.getId()));
+            }
+        }
+        return null;
+    }
+
+    public String getssbm(String ssbmdm) {
+        if (StringUtils.isNotEmpty(ssbmdm) && ssbmdm.length() == 12) {
+            String[] split = ssbmdm.split("");
+            for (int i = split.length - 1; i >= 0; i--) {
+                String s = split[i];
+                if (!s.equals("0")) {
+                    ssbmdm = ssbmdm.substring(0, i + 1);
+                    break;
+                }
+            }
+        }
+        return ssbmdm;
+    }
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/service/impl/UserInfoServiceImpl.java b/mosty-base/src/main/java/com/mosty/base/service/impl/UserInfoServiceImpl.java
new file mode 100644
index 0000000..577c5d8
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/service/impl/UserInfoServiceImpl.java
@@ -0,0 +1,31 @@
+package com.mosty.base.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.service.UserInfoService;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+
+@Service
+@AllArgsConstructor
+public class UserInfoServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
+        implements UserInfoService {
+    @Override
+    public SysUser getUserInfo(String userId) {
+        return this.baseMapper.selectById(userId);
+    }
+
+    @Override
+    public SysUser getUserInfoBySfzh(String sfzh) {
+        return this.baseMapper.selectOne(
+                new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getIdEntityCard, sfzh)
+                        .last(" limit 1")
+        );
+    }
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/utils/HttpUtils.java b/mosty-base/src/main/java/com/mosty/base/utils/HttpUtils.java
new file mode 100644
index 0000000..676c72e
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/utils/HttpUtils.java
@@ -0,0 +1,584 @@
+package com.mosty.base.utils;
+
+import com.alibaba.fastjson.JSON;
+import okhttp3.*;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.xfire.client.Client;
+import org.codehaus.xfire.transport.http.CommonsHttpMessageSender;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class HttpUtils {
+    private static Logger logger = LoggerFactory
+            .getLogger(HttpUtils.class);
+    public static final String POST = "POST";
+
+    public static final String GET = "GET";
+
+    public static final int CONNECTTIMEOUT = 10 * 60 * 1000;
+
+    public static final int READTIMEOUT = 10 * 60 * 1000;
+
+    public static final String charset = "utf-8";
+
+    public static final String DEFAULT_CONTENT_TYPE = "application/x-www-form-urlencoded";
+
+    public static final String JSON_CONTENT_TYPE = "application/json";
+
+    public static final String XML_CONTENT_TYPE = "application/xml";
+
+/*    public static void main(String[] args) {
+        StringBuffer reqXml = new StringBuffer();
+        reqXml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        reqXml.append("<xml><sminfo_input><systemid>");
+        reqXml.append("39a15b33e62e453d97378e326a3960f4");// 短信平台为我们分配的短信接口调用帐号
+        reqXml.append("</systemid><extension_no>06666</extension_no><tousermobile>");
+        reqXml.append("18108089373");
+        reqXml.append("</tousermobile><content>");
+        reqXml.append("高新短信测试");
+        reqXml.append("</content><fromusername>高新智慧公安</fromusername></sminfo_input></xml>");
+        Object[] webserviceR = HttpUtils.httprequest(
+                "http://dx.sc/services/IMsInterfaceNewService?wsdl", reqXml.toString());// new
+        if (webserviceR != null) {
+            XML xml = HttpUtils.sendMessageAck(webserviceR[0].toString());
+            System.out.println("12312312312312");
+
+        } else {
+            System.out.println("cssdasdasdas");
+        }
+        System.out.println("ssdasdasdas");
+    }*/
+
+    /*****
+     * webservice请求发送
+     *
+     * @param wsdl
+     * @param reqXml
+     * @return
+     */
+//    public static Object[] httprequest(String wsdl, String reqXml) {
+//        try {
+//            URL _url = new URL(wsdl.trim());
+//            HttpURLConnection httpConnection = (HttpURLConnection) _url
+//                    .openConnection();
+//            httpConnection.setConnectTimeout(5000);
+//            httpConnection.setReadTimeout(3000);// 设置http连接的读超时,单位是毫秒
+//            httpConnection.connect();
+//            Client _client = new Client(httpConnection.getInputStream(), null);
+//            _client.setProperty(CommonsHttpMessageSender.HTTP_TIMEOUT,
+//                    String.valueOf(3000));// 设置发送的超时限制,单位是毫秒;
+//            _client.setProperty(CommonsHttpMessageSender.DISABLE_KEEP_ALIVE,
+//                    "true");
+//            _client.setProperty(
+//                    CommonsHttpMessageSender.DISABLE_EXPECT_CONTINUE, "true");
+//            return _client.invoke("sendMessage",
+//                    new Object[]{reqXml});
+//        } catch (Exception e) {
+//            logger.error(e.getMessage());
+//        }
+//        return null;
+//    }
+
+
+    /****
+     * 将webservice请求结果生成对象
+     *
+     * @param sendMsgR
+     * @return
+     */
+    public static XML sendMessageAck(String sendMsgR) {
+        logger.info("短信接口反馈内容：" + sendMsgR);
+        XML xml = new XML();
+        try {
+            List<Class> classes = new ArrayList<Class>();
+            classes.add(XML.class);
+            classes.add(Sminfo_return.class);
+            try {
+                xml = (XML) XStreamUtil.Xml2Object(classes, sendMsgR);
+                if (xml == null) {
+                    throw new Exception("数据为空");
+                }
+                if (xml.getSminfo_return() == null) {
+                    throw new Exception("数据为空");
+                }
+                if (StringUtils.isBlank(xml.getSminfo_return().getRenturncode())) {
+                    throw new Exception("数据为空");
+                }
+                if (xml.getSminfo_return()
+                        .getRenturncode().equals("1")) {
+                    throw new Exception("短信接口调用失败");
+                }
+                xml.setMsg("短信接口调用成功");
+                xml.setState("1");
+            } catch (Exception e) {
+                throw new Exception("短信接口返回数据有异常");
+            }
+        } catch (Exception e) {
+            xml.setMsg(e.getMessage());
+            xml.setState("0");
+            logger.error(e.getMessage());
+            return xml;
+        }
+        return xml;
+    }
+
+
+    public static String executePost(String urlStr, Map<String, Object> params,
+                                     Map<String, String> headerOpitions) {
+        return executeHttpMethod(POST, urlStr, params, headerOpitions);
+    }
+
+    /**
+     * post请求
+     *
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executePost(String urlStr, Map<String, Object> params) {
+        return executeHttpMethod(POST, urlStr, params);
+    }
+
+    /**
+     * @param urlStr
+     * @param jsonStr
+     * @return
+     * @Title http POST json数据
+     * @author lijiaqi
+     * @description
+     */
+    public static String executePostJSON(String urlStr, String jsonStr) {
+        return executePost(urlStr, jsonStr, JSON_CONTENT_TYPE);
+    }
+
+    /**
+     * @param urlStr
+     * @param xmlStr
+     * @return
+     * @Title http post xml数据
+     * @author lijiaqi
+     * @description
+     */
+    public static String executePostXML(String urlStr, String xmlStr) {
+        return executePost(urlStr, xmlStr, XML_CONTENT_TYPE);
+    }
+
+    public static String executePost(String urlStr, String postStr, String contenType) {
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        String method = "POST";
+        InputStreamReader in = null;
+        try {
+
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type", contenType);
+            connection.setRequestProperty("Charset", "UTF-8");
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                dop.write(postStr.getBytes("UTF-8"));
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+            if (code > 400) {
+                System.err.println("请求出错状态码： " + code);
+                throw new RuntimeException("code " + code);
+
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException("读取数据失败", e);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+
+    }
+
+    /**
+     * post请求
+     *
+     * @param urlStr
+     * @return
+     */
+    public static String executePost(String urlStr, String postStr) {
+        return executePost(urlStr, postStr, "application/x-www-form-urlencoded");
+    }
+
+    /**
+     * get请求
+     *
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executeGet(String urlStr, Map<String, Object> params) {
+        return executeHttpMethod(GET, urlStr, params);
+    }
+
+    /**
+     * get请求
+     *
+     * @param urlStr
+     * @param params
+     * @return
+     */
+    public static String executeGet(String urlStr, Map<String, Object> params,
+                                    Map<String, String> headerOpitions) {
+        return executeHttpMethod(GET, urlStr, params, headerOpitions);
+    }
+
+    public static String executeHttpMethod(String method, String urlStr,
+                                           Map<String, Object> params) {
+        return executeHttpMethod(method, urlStr, params, null);
+    }
+
+    public static String executeHttpMethod(String method, String urlStr, Map<String, Object> params,
+                                           Map<String, String> headerOptions, String proxyHost,
+                                           int proxyPort) {
+        Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        InputStreamReader in = null;
+        try {
+            if (method.equals(GET)) {
+                urlStr = String.format("%s?%s", urlStr, buildParamsString(params));
+            }
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection(proxy);
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charset", "UTF-8");
+
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(10000);
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                // 构建传递参数
+                String paramStr = buildParamsString(params);
+                dop.write(paramStr.getBytes());
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+
+            if (code > 400) {
+                throw new RuntimeException("code " + code);
+            }
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+    }
+
+    public static String executeHttpMethod(String method, String urlStr, Map<String, Object> params,
+                                           Map<String, String> headerOptions) {
+        String result = null;
+        URL url = null;
+        HttpURLConnection connection = null;
+        InputStreamReader in = null;
+        try {
+            if (method.equals(GET)) {
+                urlStr = String.format("%s?%s", urlStr, buildParamsString(params));
+            }
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setConnectTimeout(60000);
+            connection.setReadTimeout(60000);
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charset", "UTF-8");
+
+            if (headerOptions != null && headerOptions.size() > 0) {
+                for (String key : headerOptions.keySet()) {
+                    connection.setRequestProperty(key, headerOptions.get(key));
+                }
+            }
+
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+            if (method.equals(POST)) {
+                DataOutputStream dop = new DataOutputStream(connection.getOutputStream());
+                // 构建传递参数
+                String paramStr = buildParamsString(params);
+                dop.write(paramStr.getBytes());
+                dop.flush();
+                dop.close();
+            }
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+
+            if (code > 400) {
+                throw new RuntimeException("code " + code);
+            }
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = new InputStreamReader(connection.getInputStream());
+                BufferedReader bufferedReader = new BufferedReader(in);
+                StringBuffer strBuffer = new StringBuffer();
+                String line = null;
+                while ((line = bufferedReader.readLine()) != null) {
+                    strBuffer.append(line);
+                }
+                result = strBuffer.toString();
+            }
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 是否是存在的文件
+     *
+     * @param ulrStr
+     * @return
+     */
+    public static boolean isNetFileAvailable(String ulrStr) {
+        try {
+            //设置此类是否应该自动执行 HTTP 重定向（响应代码为 3xx 的请求）。
+            HttpURLConnection.setFollowRedirects(false);
+            //到 URL 所引用的远程对象的连接
+            HttpURLConnection con = (HttpURLConnection) new URL(ulrStr).openConnection();
+            /* 设置 URL 请求的方法， GET POST HEAD OPTIONS PUT DELETE TRACE 以上方法之一是合法的，具体取决于协议的限制。*/
+            con.setRequestMethod("HEAD");
+            //从 HTTP 响应消息获取状态码
+            return (con.getResponseCode() == HttpURLConnection.HTTP_OK);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 构建参数字符串
+     *
+     * @param params
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    private static String buildParamsString(Map<String, Object> params) throws UnsupportedEncodingException {
+        StringBuffer paramsBuffer = new StringBuffer();
+        int flag = 0;
+        if (params != null) {
+            for (String key : params.keySet()) {
+                if (flag != 0) {
+                    paramsBuffer.append("&");
+                }
+                String value = URLEncoder.encode(String.valueOf(params.get(key)), "utf-8");
+                paramsBuffer.append(key).append("=").append(value);
+                flag = 1;
+            }
+        }
+        return paramsBuffer.toString();
+    }
+
+    public static byte[] getByteArrayFromUrl(String urlStr) {
+        URL url = null;
+        HttpURLConnection connection = null;
+        InputStream in = null;
+        byte[] content = null;
+        try {
+            url = new URL(urlStr);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setDoInput(true);
+            connection.setDoOutput(true);
+            connection.setRequestMethod("GET");
+            connection.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded; charset=UTF-8");
+            connection.setRequestProperty("Charset", "UTF-8");
+            connection.setConnectTimeout(CONNECTTIMEOUT);
+            connection.setReadTimeout(READTIMEOUT);
+            // 连接
+            connection.connect();
+            int code = connection.getResponseCode();
+
+            if (code > 400) {
+                throw new RuntimeException("code " + code);
+            }
+            // 如果返回状态码200
+            if (200 == code) {
+                // 读取返回数据
+                in = connection.getInputStream();
+                content = IOUtils.toByteArray(in);
+            }
+
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            throw new RuntimeException("不合法的http地址", e);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException("读取数据失败", e);
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    throw new RuntimeException("关闭流失败", e);
+                }
+            }
+        }
+        return content;
+    }
+
+
+    public static String previewURLs1(String sbbh) throws Exception {
+
+        OkHttpClient client = (new OkHttpClient()).newBuilder().build();
+        Request request = (new Request.Builder()).url("http://80.75.112.19:18080/api/play/start/51050100002000111603/" + sbbh).method("GET", (okhttp3.RequestBody) null).addHeader("Cookie", "").build();
+        Response response = client.newCall(request).execute();
+        boolean isf = false;
+        if (response.code() == 401) {
+            Login();
+            //String s = previewURLs1(sbbh);
+            //return s;
+            isf = true;
+        }
+        if (isf) {
+            previewURLs1(sbbh);
+        }
+        String body = response.body().string();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(body)) {
+            Map<String, Object> hashMap = (Map) JSON.parseObject(body, HashMap.class);
+            int code = (Integer) hashMap.get("code");
+            if (code == 0) {
+                Map<String, Object> urlMap = (Map) hashMap.get("data");
+                String hls = urlMap.get("hls").toString();
+                System.out.println(hls.toString());
+                return hls;
+            } else {
+                String s = previewURLs1(sbbh);
+                return s;
+            }
+        } else {
+            return null;
+        }
+
+    }
+
+
+    private static String Login() throws IOException {
+        OkHttpClient client = (new OkHttpClient()).newBuilder().build();
+        Request request = (new Request.Builder()).url("http://80.75.112.19:18080/api/user/login?username=admin&password=fad1b644f95eeaaf01816369e4209352").method("GET", (okhttp3.RequestBody) null).build();
+        Response response = client.newCall(request).execute();
+//        int code = response.code();
+//        String body = response.body().string();
+        Headers headers = response.headers();
+        System.out.println(headers.get("Set-Cookie"));
+        return headers.get("Set-Cookie");
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        String s = previewURLs1("51050200001310072154");
+
+        System.out.println(s);
+    }
+
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/utils/Sminfo_return.java b/mosty-base/src/main/java/com/mosty/base/utils/Sminfo_return.java
new file mode 100644
index 0000000..de89b36
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/utils/Sminfo_return.java
@@ -0,0 +1,51 @@
+package com.mosty.base.utils;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("sminfo_return")
+public class Sminfo_return {
+	@XStreamAlias("renturncode")
+	public String renturncode = "";
+
+	@XStreamAlias("error_code")
+	public String error_code = "";
+
+	@XStreamAlias("sm_id")
+	public String sm_id = "";
+
+	@XStreamAlias("message")
+	public String message = "";
+
+	public String getRenturncode() {
+		return renturncode;
+	}
+
+	public void setRenturncode(String renturncode) {
+		this.renturncode = renturncode;
+	}
+
+	public String getError_code() {
+		return error_code;
+	}
+
+	public void setError_code(String error_code) {
+		this.error_code = error_code;
+	}
+
+	public String getSm_id() {
+		return sm_id;
+	}
+
+	public void setSm_id(String sm_id) {
+		this.sm_id = sm_id;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/utils/XML.java b/mosty-base/src/main/java/com/mosty/base/utils/XML.java
new file mode 100644
index 0000000..bd48bf2
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/utils/XML.java
@@ -0,0 +1,38 @@
+package com.mosty.base.utils;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("xml")
+public class XML {
+	    @XStreamAlias("sminfo_return")
+        private Sminfo_return sminfo_return;
+	    
+	    private String state;
+	    
+	    private String msg;
+
+		public Sminfo_return getSminfo_return() {
+			return sminfo_return;
+		}
+
+		public void setSminfo_return(Sminfo_return sminfo_return) {
+			this.sminfo_return = sminfo_return;
+		}
+
+		public String getState() {
+			return state;
+		}
+
+		public void setState(String state) {
+			this.state = state;
+		}
+
+		public String getMsg() {
+			return msg;
+		}
+
+		public void setMsg(String msg) {
+			this.msg = msg;
+		}
+        
+}
diff --git a/mosty-base/src/main/java/com/mosty/base/utils/XStreamUtil.java b/mosty-base/src/main/java/com/mosty/base/utils/XStreamUtil.java
new file mode 100644
index 0000000..e3bff49
--- /dev/null
+++ b/mosty-base/src/main/java/com/mosty/base/utils/XStreamUtil.java
@@ -0,0 +1,122 @@
+package com.mosty.base.utils;
+
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class XStreamUtil {
+	private static Map<Class, Class> mClasses = new HashMap<Class, Class>();
+	private static XStream xStream = new XStream(new DomDriver());
+	private static Map<String, Class> wClasses = new HashMap<String, Class>();
+
+	/**
+	 * 
+	 * @param clsz
+	 *            每一层的标签对应的class (注意! 不是每一个标签!)
+	 * @param fileName
+	 *            文件路径("/sdcard/test.xml")
+	 * @param NULL
+	 *            暂没用到;
+	 * @return 返回的是最外层对象：
+	 */
+	public static Object Xml2Object(List<Class> clsz, String fileName, String NULL) {
+		for (Class cls : clsz) {
+			if (mClasses.containsKey(cls))
+				continue;
+			mClasses.put(cls, cls);
+			xStream.processAnnotations(cls);
+		}
+		try {
+			// 这个是设置编码,因为可能编码不同会显现乱码，这个应该还没有具体解决乱码问题
+			BufferedReader br = new BufferedReader(
+					new InputStreamReader(new FileInputStream(fileName), "GBK"));
+			return xStream.fromXML(br);
+			// return xStream.fromXML(new FileReader(new
+			// File(fileName)));//这个是直接读
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 
+	 * @param clsz
+	 *            : 每一层的标签对应的class
+	 * @param str
+	 *            : xml 解析出来的String
+	 * @return 返回的是最外层对象：
+	 */
+	public static Object Xml2Object(List<Class> clsz, String str) {
+		for (Class cls : clsz) {
+//			if (mClasses.containsKey(cls))
+//				continue;
+			mClasses.put(cls, cls);
+			xStream.processAnnotations(cls);
+		}
+		
+		return xStream.fromXML(str);
+	}
+	public static Object Xml2Object(Map<String, Class> data,String str) {
+		 for (Map.Entry<String, Class> entry:data.entrySet() ) {
+			 xStream.alias(entry.getKey(),entry.getValue());
+		}
+		
+		return xStream.fromXML(str);
+	}
+	
+	/*--------------------------------------------*/
+	/*
+	 * Xml2Object 与 Object2Xml 的区别在于
+	 * xStream.processAnnotations(cls);
+	 * xStream.alias(cls.node, cls.cls);
+	 */
+	/*-------------------------------------------*/
+	/**
+	 * 
+	 * @param clsz
+	 *            这个和上面的不同就是，这个写入的时候需要 标签 和 type(class); 所以定义了一个类，方便点;
+	 * @param obj
+	 *            这个是读取到的对象
+	 * @return
+	 */
+	public static String Object2Xml(List<XStreamNode> clsz, Object obj) {
+		for (XStreamNode cls : clsz) {
+			if (wClasses.containsKey(cls.node))
+				continue;
+			wClasses.put(cls.node, cls.cls);
+			xStream.alias(cls.node, cls.cls);
+		}
+		return xStream.toXML(obj);
+
+	}
+
+	static class XStreamNode {
+		public XStreamNode(String node, Class cls) {
+			// TODO Auto-generated constructor stub
+			this.node = node;
+			this.cls = cls;
+		}
+
+		public String node;
+		public Class cls;
+	}
+	
+	 public static <T> T  toBean(String xmlStr,Class<T> cls){
+         //注意：不是new Xstream(); 否则报错：java.lang.NoClassDefFoundError: org/xmlpull/v1/XmlPullParserFactory
+         XStream xstream=new XStream(new DomDriver());
+         xstream.processAnnotations(cls);
+         T obj=(T)xstream.fromXML(xmlStr);
+         return obj;         
+     } 
+
+}
diff --git a/mosty-base/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mosty-base/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000..35ec65d
--- /dev/null
+++ b/mosty-base/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "spring.cloud.nacos.discovery.server-addr",
+      "type": "java.lang.String",
+      "description": "Description for spring.cloud.nacos.discovery.server-addr."
+  }
+] }
\ No newline at end of file
diff --git a/mosty-base/src/main/resources/application.yml b/mosty-base/src/main/resources/application.yml
new file mode 100644
index 0000000..bbb62db
--- /dev/null
+++ b/mosty-base/src/main/resources/application.yml
@@ -0,0 +1,132 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_base?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+
+#mybatis:
+#  mapper-locations: classpath:mapper/*.xml
+
+swagger:
+  host: 80.155.0.84
+  port: 80
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+minio:
+  endpoint: http://192.168.200.131:9009
+  downloadEndpoint: http://192.168.200.131:9009
+  accessKey: admin
+  secretKey: mosty888
+
+config:
+  defaultPassword: 123456
+  orgCode: 510600000000
+  
+login:
+  check:
+    kaptcha: false
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api_file_v2  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+
+dict:
+  element:
+    # 民族
+    nation: D_BZ_MZ
+    # 性别
+    gender: D_BZ_XB
+    # 血型
+    blood-type: D_BZ_XX
+    # 学历
+    education: D_BZ_WHCD
+    # 政治面貌
+    political-outlook: D_BZ_ZZMM
+    # 婚姻状况
+    marital-status: D_BZ_HYZK
+    # 亲属关系
+    relationship: D_BZ_QSGXDM
+    # 车辆型号
+    vehicle-model: D_JDC_CLLX
+    # 车辆颜色
+    vehicle-color: D_JDC_CSYS
+    # 机动车号牌种类
+    vehicle-number-type: D_JDC_HPZL
+    # 车牌号
+    car-number: D_BZ_HPSSD
+
+exclude:
+  pathPatterns:
+    token:
+      - /loginCheckKaptcha
+      - /login
+      - /token
+      - /kaptcha
+      - /loginOut
+      - /sysTask/addSysTask
+      - /sysTask/*
+      - /idCardNoLogin
+      - /sysTaskReport/*
+      - /sysTaskReport/groupCount/*
+      - /sysTaskReport/lineChart/*
+      - /yjxx/token/*
+      - /tbJq/querySgfx
+      - /tbJq/queryZtfx
+      - /tbYjxx/insert
+      - /tbYjxx/getList
+      - /image/base64
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
diff --git a/mosty-base/src/main/resources/bootstrap.yml b/mosty-base/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..e36e907
--- /dev/null
+++ b/mosty-base/src/main/resources/bootstrap.yml
@@ -0,0 +1,40 @@
+server:
+  port: 8005
+  servlet:
+    context-path: /mosty-base/
+spring:
+  application:
+    name: mosty-base
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-base/src/main/resources/logback-spring.xml b/mosty-base/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-base/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-base/src/main/resources/mapper/DeptMapper.xml b/mosty-base/src/main/resources/mapper/DeptMapper.xml
new file mode 100644
index 0000000..ba0986b
--- /dev/null
+++ b/mosty-base/src/main/resources/mapper/DeptMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.mapper.UserDeptMapper">
+
+    <!--查询部门下的所有的人员信息-->
+    <select id="getUserListByDeptId" resultType="com.mosty.common.core.business.entity.SysUser">
+        select a.* from sys_user a ,sys_dept b,sys_user_dept c where a.id = c.user_id
+        and a.xt_zxbz = '0' and b.xt_zxbz = '0'
+        and c.dept_id = b.id and a.is_virtual_user = '02' and b.id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--查询本部门下的所有的，不包含子部门-->
+    <select id="getUserListByIdAll" resultType="com.mosty.common.core.business.entity.SysUser">
+        select a.* from sys_user a ,sys_dept b,sys_user_dept c where a.id = c.user_id
+        and a.xt_zxbz = '0' and b.xt_zxbz = '0'
+        and c.dept_id = b.id  and b.id = #{deptid}
+    </select>
+</mapper>
+
+
diff --git a/mosty-base/src/main/resources/mapper/GajgSearchMapper.xml b/mosty-base/src/main/resources/mapper/GajgSearchMapper.xml
new file mode 100644
index 0000000..1268158
--- /dev/null
+++ b/mosty-base/src/main/resources/mapper/GajgSearchMapper.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.mapper.GajgSearchMapper">
+
+<!--    映射  property实体类 column数据库字段-->
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsGajg" id="tbYsGajg">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ysdl" column="ysdl" jdbcType="VARCHAR"/>
+        <result property="yszl" column="yszl" jdbcType="VARCHAR"/>
+        <result property="ysxl" column="ysxl" jdbcType="VARCHAR"/>
+        <result property="gajgmc" column="gajgmc" jdbcType="VARCHAR"/>
+        <result property="gajgjc" column="gajgjc" jdbcType="VARCHAR"/>
+        <result property="wzXzqh" column="wz_xzqh" jdbcType="VARCHAR"/>
+        <result property="wzXz" column="wz_xz" jdbcType="VARCHAR"/>
+        <result property="wzBc" column="wz_bc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="dtm" column="dtm" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dtm1" column="dtm1" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dtm2" column="dtm2" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="lybm" column="lybm" jdbcType="VARCHAR"/>
+        <result property="lyid" column="lyid" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+<!--    公共sql 全部字段-->
+    <sql id="base_column_list">
+        id
+        ,ysdl,yszl,ysxl,gajgmc,gajgjc,wz_xzqh,wz_xz,wz_bc,jd,wd,ssbmid,ssxgajid,sssgajid,
+        zbhash,lybm,lyid,jsnr,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+<!--    公共sql 面 , 业务层转成了point点：jd、wd-->
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb,
+        ST_ASWKT(dtm) as dtm,
+        ST_ASWKT(dtm1) as dtm1,
+        ST_ASWKT(dtm2) as dtm2
+    </sql>
+
+    <!-- 从子表中关联查询到公安机关主键Id -->
+    <select id="getGajgFromGlbl" resultType="String">
+        select gajg_id from mosty_yszx.tb_ys_gajg_glbm where ssbmid = #{ssbmid} and
+        xt_scbz = '0' and xt_sjzt = '1'
+        limit 1
+    </select>
+
+<!--    引用映射 通过主表查询全部信息-->
+    <select id="getGajg" resultMap="tbYsGajg">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from mosty_yszx.tb_ys_gajg where ssbmid = #{ssbmid}
+        and (ysxl = '001001003' or ysxl = '001001004') and xt_scbz = '0' and xt_sjzt = '1'
+        limit 1
+    </select>
+
+    <!--    引用映射 通过子表查询全部信息-->
+    <select id="getGajgById" resultMap="tbYsGajg">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from mosty_yszx.tb_ys_gajg where xt_scbz = '0' and xt_sjzt = '1'
+        and id = #{id}
+    </select>
+</mapper>
+
+
diff --git a/mosty-base/src/main/resources/rebel.xml b/mosty-base/src/main/resources/rebel.xml
new file mode 100644
index 0000000..b11d196
--- /dev/null
+++ b/mosty-base/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-base</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-base/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-bkzx/mosty-bkzx.iml b/mosty-bkzx/mosty-bkzx.iml
new file mode 100644
index 0000000..46e85c5
--- /dev/null
+++ b/mosty-bkzx/mosty-bkzx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353924" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-bkzx/pom.xml b/mosty-bkzx/pom.xml
new file mode 100644
index 0000000..e71ff41
--- /dev/null
+++ b/mosty-bkzx/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-bkzx</artifactId>
+    <description>布控中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/MostyBkzxApplication.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/MostyBkzxApplication.java
new file mode 100644
index 0000000..d0f739d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/MostyBkzxApplication.java
@@ -0,0 +1,29 @@
+package com.mosty.bkzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ *	布控中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.bkzx.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+public class MostyBkzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyBkzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/config/FeignConfig.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/FeignConfig.java
new file mode 100644
index 0000000..9ac8b15
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.bkzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/config/GlobalYmlConfig.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..a9f1c27
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.bkzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/config/WebMvcConfig.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..53640dd
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.bkzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkClController.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkClController.java
new file mode 100644
index 0000000..ff6408d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkClController.java
@@ -0,0 +1,95 @@
+package com.mosty.bkzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkClInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkClJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import com.mosty.base.model.query.bkzx.TbBkClSearchDto;
+import com.mosty.bkzx.service.TbBkClService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 布控车辆接口
+ **/
+@Api(tags = "布控车辆接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbBkCl")
+public class TbBkClController {
+
+    private final TbBkClService tbBkClService;
+
+    @ApiOperation("新增布控车辆")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增布控车辆", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbBkClInsertDto dto) {
+        return ResponseResult.success(this.tbBkClService.addEntity(dto));
+    }
+
+    @ApiOperation("分页查询车辆布控列表")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbBkCl>> getPageList(TbBkClSearchDto dto) {
+        return ResponseResult.success(this.tbBkClService.getPageList(dto));
+    }
+
+    @ApiOperation("查询布控车辆详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbBkCl> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkClService.getInfo(id));
+    }
+
+    @ApiOperation("修改布控车辆")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改布控车辆", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editCar(@RequestBody TbBkClInsertDto dto) {
+        return ResponseResult.success(this.tbBkClService.editCar(dto));
+    }
+
+    @ApiOperation("删除和批量删除布控车辆")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除和批量删除布控车辆", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> delCar(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbBkClService.delCar(ids));
+    }
+
+    @ApiOperation("结束布控")
+    @JwtSysUser
+    @PostMapping("endBk/{id}")
+    @Log(title = "结束布控", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> endBk(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkClService.endBk(id));
+    }
+
+    @ApiOperation("重新布控")
+    @JwtSysUser
+    @PostMapping("startBk/{id}")
+    @Log(title = "重新布控", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> startBk(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkClService.startBk(id));
+    }
+
+    @ApiOperation("布控车辆审批")
+    @JwtSysUser
+    @PostMapping("judge")
+    @Log(title = "布控车辆审批", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> judge(@RequestBody TbBkClJudgeDto dto) {
+        return ResponseResult.success(this.tbBkClService.judge(dto));
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkDbController.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkDbController.java
new file mode 100644
index 0000000..627638a
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkDbController.java
@@ -0,0 +1,118 @@
+package com.mosty.bkzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkDbBkDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbSearchDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbUpDto;
+import com.mosty.base.model.entity.bkzx.TbBkDb;
+import com.mosty.bkzx.service.TbBkDbService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "布控库管理服务")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbBkDb")
+public class TbBkDbController {
+    private final TbBkDbService tbBkDbService;
+
+    /**
+     * 新建布控数据库信息
+     *
+     * @return
+     */
+    @ApiOperation("新建布控库")
+    @JwtSysUser
+    @Log(title = "新建各市布控数据库", businessType = BusinessType.INSERT)
+    @PostMapping("/builderDb")
+    public ResponseResult<?> builderDb(@RequestBody TbBkDbInsertDto dto) {
+        if (null == dto) {
+            throw new BusinessException("新建布控数据库信息无效！");
+        }
+        dto.checkData();
+        tbBkDbService.builderDb(dto);
+        return ResponseResult.success("创建布控数据库成功！");
+    }
+
+    @ApiOperation("删除布控数据库")
+    @JwtSysUser
+    @Log(title = "布控数据库删除", businessType = BusinessType.DELETE)
+    @PostMapping("/del")
+    public ResponseResult<?> delDb(@RequestBody List<Long> keys) {
+        if (CollectionUtils.isEmpty(keys)) {
+            throw new BusinessException("删除布控数据库记录集合无效！");
+        }
+        tbBkDbService.delDb(keys);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("布控数据库分页查询")
+    @JwtSysUser
+    @GetMapping("/pagelist")
+    public ResponseResult<IPage<TbBkDb>> getPageList(TbBkDbSearchDto repar) {
+        if (null == repar) {
+            throw new BusinessException("布控数据库分页查询参数无效！");
+        }
+        return ResponseResult.success(tbBkDbService.getPageList(repar));
+    }
+
+    @ApiOperation("建库的区域选择")
+    @JwtSysUser
+    @GetMapping("/arelist")
+    public ResponseResult<List<Map>> getAreList() {
+        return ResponseResult.success(tbBkDbService.getAreList());
+    }
+
+    @ApiOperation("布控数据详情信息")
+    @JwtSysUser
+    @GetMapping("/detail")
+    public ResponseResult<TbBkDb> detail(@RequestParam(name = "id", required = true) String id) {
+        if (StringUtils.isEmpty(id)) {
+            throw new BusinessException("数据库主键数据无效！");
+        }
+        return ResponseResult.success(tbBkDbService.getDetail(id));
+    }
+
+    @ApiOperation("对大华数据库进行布控")
+    @JwtSysUser
+    @PostMapping("/bkdb")
+    public ResponseResult<?> bKDb(@RequestBody TbBkDbBkDto reqPar) {
+        if (null == reqPar || null == reqPar.getId() || reqPar.getBkKssj() == null || reqPar.getBkJssj() == null) {
+            throw new BusinessException("布控数据库参数异常，请核查 ！");
+        }
+        return ResponseResult.success(tbBkDbService.bKDb(reqPar));
+    }
+
+    @ApiOperation("对数据库布控进行撤销布控操作")
+    @JwtSysUser
+    @PostMapping("/unbkdb")
+    public ResponseResult<?> unBkDb(@RequestBody List<Long> id) {
+        if (CollectionUtils.isEmpty(id)) {
+            throw new BusinessException("撤销布控数据库信息无效！");
+        }
+        return ResponseResult.success(tbBkDbService.unBkDb(id));
+    }
+
+    @ApiOperation("编辑数据库基础信息")
+    @JwtSysUser
+    @PostMapping("/modify")
+    public ResponseResult<?> modify(@RequestBody TbBkDbUpDto upDto) {
+        if (null == upDto || StringUtils.isEmpty(upDto.getId())) {
+            throw new BusinessException("修改参数无效！");
+        }
+        return ResponseResult.success(tbBkDbService.modify(upDto));
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkRyController.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkRyController.java
new file mode 100644
index 0000000..3c140a8
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/TbBkRyController.java
@@ -0,0 +1,95 @@
+package com.mosty.bkzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkRyInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkRyJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import com.mosty.base.model.query.bkzx.TbBkRySearchDto;
+import com.mosty.bkzx.service.TbBkRyService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 布控人员接口
+ **/
+@Api(tags = "布控人员接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbBkRy")
+public class TbBkRyController {
+
+    private final TbBkRyService tbBkRyService;
+
+    @ApiOperation("新增布控人员")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增布控人员", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbBkRyInsertDto dto) {
+        return ResponseResult.success(this.tbBkRyService.addEntity(dto));
+    }
+
+    @ApiOperation("分页查询人员布控列表")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbBkRy>> getPageList(TbBkRySearchDto dto) {
+        return ResponseResult.success(this.tbBkRyService.getPageList(dto));
+    }
+
+    @ApiOperation("查询布控人员详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbBkRy> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkRyService.getInfo(id));
+    }
+
+    @ApiOperation("修改布控人员")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改布控人员", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editPerson(@RequestBody TbBkRyInsertDto dto) {
+        return ResponseResult.success(this.tbBkRyService.editPerson(dto));
+    }
+
+    @ApiOperation("删除和批量删除布控人员")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除和批量删除布控人员", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> delPerson(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbBkRyService.delPerson(ids));
+    }
+
+    @ApiOperation("结束布控")
+    @JwtSysUser
+    @PostMapping("endBk/{id}")
+    @Log(title = "结束布控", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> endBk(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkRyService.endBk(id));
+    }
+
+    @ApiOperation("重新布控")
+    @JwtSysUser
+    @PostMapping("startBk/{id}")
+    @Log(title = "重新布控", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> startBk(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbBkRyService.startBk(id));
+    }
+
+    @ApiOperation("布控人员审批")
+    @JwtSysUser
+    @PostMapping("judge")
+    @Log(title = "布控人员审批", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> judge(@RequestBody TbBkRyJudgeDto dto) {
+        return ResponseResult.success(this.tbBkRyService.judge(dto));
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/XdxxController.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/XdxxController.java
new file mode 100644
index 0000000..0c56af3
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/controller/XdxxController.java
@@ -0,0 +1,65 @@
+package com.mosty.bkzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.XdxxQuery;
+import com.mosty.bkzx.service.XdxxService;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "系统字典--原magic接口")
+@RequestMapping("/xdxx")
+public class XdxxController extends BaseController {
+
+    @Resource
+    private XdxxService xdxxService;
+
+    @GetMapping("/queryXdxxBYSzfh")
+    @ApiOperation(value = "根据身份证号查询行动信息列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> queryXdxxBYSzfh(XdxxQuery dto) {
+        return ResponseResult.success(this.xdxxService.queryXdxxBYSzfh(dto));
+    }
+
+    @GetMapping("/xdrylb")
+    @ApiOperation(value = "行动人员列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> xdrylb(XdxxQuery dto) {
+        return ResponseResult.success(this.xdxxService.xdrylb(dto));
+    }
+
+    @GetMapping("/xdrytj")
+    @ApiOperation(value = "行动人员统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> xdrytj(XdxxQuery dto) {
+        return ResponseResult.success(this.xdxxService.xdrytj(dto));
+    }
+
+    @GetMapping("/xdxxlb")
+    @ApiOperation(value = "行动信息列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> xdxxlb(XdxxQuery dto) {
+        return ResponseResult.success(this.xdxxService.xdxxlb(dto));
+    }
+
+    @GetMapping("/xdxxtj")
+    @ApiOperation(value = "行动信息统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> xdxxtj(XdxxQuery dto) {
+        return ResponseResult.success(this.xdxxService.xdxxtj(dto));
+    }
+}
+
+
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkClMapper.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkClMapper.java
new file mode 100644
index 0000000..07dec04
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkClMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/14
+ * 布控车辆Mapper
+ **/
+@Mapper
+public interface TbBkClMapper extends BaseMapper<TbBkCl> {
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkDbMapper.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkDbMapper.java
new file mode 100644
index 0000000..485d674
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkDbMapper.java
@@ -0,0 +1,9 @@
+package com.mosty.bkzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.bkzx.TbBkDb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbBkDbMapper extends BaseMapper<TbBkDb> {
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkRyMapper.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkRyMapper.java
new file mode 100644
index 0000000..93addbe
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/TbBkRyMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 人员布控Mapper
+ **/
+@Mapper
+public interface TbBkRyMapper extends BaseMapper<TbBkRy> {
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/XdxxMapper.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/XdxxMapper.java
new file mode 100644
index 0000000..dfbb92b
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mapper/XdxxMapper.java
@@ -0,0 +1,35 @@
+package com.mosty.bkzx.mapper;
+
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface XdxxMapper {
+
+    @ApiOperation("根据身份证号查询行动信息数量")
+    int queryXdxxBYSzfhCount(Map<String, Object> map);
+
+    @ApiOperation("根据身份证号查询行动信息列表")
+    List<Map<String, Object>> queryXdxxBYSzfh(Map<String, Object> map);
+
+    @ApiOperation("行动人员数量")
+    int xdrylbCount(Map<String, Object> map);
+
+    @ApiOperation("行动人员列表")
+    List<Map<String, Object>> xdrylb(Map<String, Object> map);
+
+    @ApiOperation("行动人员统计")
+    List<Map<String, Object>> xdrytj(Map<String, Object> map);
+
+    @ApiOperation("行动信息数量")
+    int xdxxlbCount(Map<String, Object> map);
+
+    @ApiOperation("行动信息列表")
+    List<Map<String, Object>> xdxxlb(Map<String, Object> map);
+
+    @ApiOperation("行动信息统计")
+    List<Map<String, Object>> xdxxtj(Map<String, Object> map);
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..67f34ce
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,118 @@
+package com.mosty.bkzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+			//根据属性名字设置要填充的值
+			if (metaObject.hasGetter("xtSjzt")) {
+				if (metaObject.getValue("xtSjzt") == null) {
+					this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+				}
+			}
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptCode()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtZhgxrid")) {
+                if (metaObject.getValue("xtZhgxrid") == null) {
+                    this.strictInsertFill(metaObject, "xtZhgxrid", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, userInfo.getDeptCode());
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/MybatisPlusConfig.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..a0ca5e5
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.bkzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/remote/TbBaseAdaptRemoteService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..2ebcdf5
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,68 @@
+package com.mosty.bkzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ *  调用部门信息远程适配层
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    /**
+     * 根据部门编码查询部门信息
+     * @param orgCode 部门编码
+     * @return 部门信息
+     */
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+
+    public String downloadBaes64(String id) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+        ResponseResult<String> responseResult = mostyBaseFeignService.downloadBaes64(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询URl异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkClService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkClService.java
new file mode 100644
index 0000000..385b10d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkClService.java
@@ -0,0 +1,42 @@
+package com.mosty.bkzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkClInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkClJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import com.mosty.base.model.query.bkzx.TbBkClSearchDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 车辆布控服务类
+ **/
+public interface TbBkClService {
+
+    @ApiOperation("新增布控车辆")
+    int addEntity(TbBkClInsertDto dto);
+
+    @ApiOperation("分页查询车辆布控列表")
+    IPage<TbBkCl> getPageList(TbBkClSearchDto dto);
+
+    @ApiOperation("查询布控车辆详情")
+    TbBkCl getInfo(String id);
+
+    @ApiOperation("修改布控车辆")
+    int editCar(TbBkClInsertDto dto);
+
+    @ApiOperation("删除和批量删除布控车辆")
+    int delCar(List<String> ids);
+
+    @ApiOperation("结束布控")
+    int endBk(String id);
+
+    @ApiOperation("重新布控")
+    int startBk(String id);
+
+    @ApiOperation("布控车辆审批")
+    int judge(TbBkClJudgeDto dto);
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkDbService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkDbService.java
new file mode 100644
index 0000000..2c87762
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkDbService.java
@@ -0,0 +1,99 @@
+package com.mosty.bkzx.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkDbBkDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbSearchDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbUpDto;
+import com.mosty.base.model.entity.bkzx.TbBkDb;
+import com.mosty.common.base.exception.BusinessException;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 布控数据库服务
+ */
+public interface TbBkDbService {
+
+    /**
+     * 创建布控数据库
+     * @param dto
+     * @throws BusinessException
+     */
+    void builderDb(TbBkDbInsertDto dto) throws BusinessException;
+
+    /**
+     * 布控数据库记录删除
+     * @param records
+     * @throws BusinessException
+     */
+    void delDb(List<Long> records) throws  BusinessException;
+
+    /**
+     * 根据条件查询布控数据库列表
+     * @return
+     * @throws BusinessException
+     */
+    List<TbBkDb>  selectList(Wrapper<TbBkDb> wrapper) throws  BusinessException;
+
+    /**
+     * 按条件查询单条记录
+     * @param wrapper
+     * @return
+     * @throws BusinessException
+     */
+    TbBkDb selectByOne(Wrapper<TbBkDb> wrapper) throws  BusinessException;
+
+    /**
+     * 更新数据
+     * @param entity
+     * @return
+     */
+    int updateEntity(TbBkDb entity);
+
+    /**
+     * 布控数据库信息分页查询
+     * @param repar
+     * @return
+     */
+    IPage<TbBkDb> getPageList(TbBkDbSearchDto repar);
+
+    /**
+     * 对数据库进行布控
+     * @param reqPar
+     * @return
+     */
+    Object bKDb(TbBkDbBkDto reqPar);
+
+    /**
+     * 撤销数据库的布控操作
+     * @param idKeys
+     * @return
+     */
+    Object unBkDb(List<Long> idKeys);
+
+    /**
+     * 编辑数据库基础信息
+     * @param upDto
+     * @return
+     */
+    Object modify(TbBkDbUpDto upDto);
+
+    /**
+     * 获取指定数据详情信息
+     * @param id
+     * @return
+     */
+    TbBkDb getDetail(String id);
+
+    /**
+     * 获取建库区域列表
+     * @return
+     */
+    List<Map> getAreList();
+
+    boolean updateBatchById(Collection<TbBkDb> entityList, int batchSize);
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkRyService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkRyService.java
new file mode 100644
index 0000000..baa09e5
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/TbBkRyService.java
@@ -0,0 +1,42 @@
+package com.mosty.bkzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.TbBkRyInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkRyJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import com.mosty.base.model.query.bkzx.TbBkRySearchDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 人员布控服务类
+ **/
+public interface TbBkRyService {
+
+    @ApiOperation("新增布控人员")
+    int addEntity(TbBkRyInsertDto dto);
+
+    @ApiOperation("分页查询人员布控列表")
+    IPage<TbBkRy> getPageList(TbBkRySearchDto dto);
+
+    @ApiOperation("查询布控人员详情")
+    TbBkRy getInfo(String id);
+
+    @ApiOperation("修改布控人员")
+    int editPerson(TbBkRyInsertDto dto);
+
+    @ApiOperation("删除和批量删除布控人员")
+    int delPerson(List<String> ids);
+
+    @ApiOperation("结束布控")
+    int endBk(String id);
+
+    @ApiOperation("重新布控")
+    int startBk(String id);
+
+    @ApiOperation("布控人员审批")
+    int judge(TbBkRyJudgeDto dto);
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/ThridBkService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/ThridBkService.java
new file mode 100644
index 0000000..8e96f12
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/ThridBkService.java
@@ -0,0 +1,195 @@
+package com.mosty.bkzx.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.enums.BKCSTypeEnum;
+import com.mosty.base.enums.BKDbTypeEnum;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import com.mosty.base.model.entity.bkzx.TbBkDb;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.bkzx.sjjs.dto.ResponseStatusObject;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 第三方布控数据库服务接口
+ */
+public interface ThridBkService {
+    /**
+     * 创建布控数据库
+     * @param dto  创建数布控数据库基础信息模型
+     * @param  userInfo  当前登陆用户信息
+     * @param  detpVo   部门信息
+     * @return
+     * @throws BusinessException
+     */
+    default ResultData  createDb(List<TbBkDb> dto, UserInfo userInfo, DeptInfoVo detpVo) throws BusinessException{
+        return null;
+    };
+
+    /**
+     * 修改布控数据库信息
+     * @param dbInfo  数据库信息
+     * @return
+     * @throws BusinessException
+     */
+    default ResultData  modifyDb(TbBkDb dbInfo) throws  BusinessException{
+        return  null;
+    }
+
+    /**
+     * 删除布控数据库
+     * @param args
+     * @return
+     * @throws BusinessException
+     */
+    default  ResultData  delDb(Map<String, Object> args) throws  BusinessException{
+        return  null;
+    }
+
+    /**
+     * 开始进行布控
+     * @param arg
+     * @throws BusinessException
+     */
+    void startBKHandler(BkHand arg) throws  BusinessException;
+
+    /**
+     * 删除布控信息
+     * @param records
+     * @return
+     */
+//    List<Long>  delBuKong(List<TbBkRecords> records);
+
+    /**
+     * 布控数据库
+     * @param bkdbitems
+     * @param  bkdbitems 厂商
+     */
+    default  List<ResponseStatusObject> startBkDb(List<TbBkDb> bkdbitems, UserInfo user){
+        throw  new BusinessException("暂未实现数据库布控操作！");
+    }
+
+
+    /**
+     * 编辑人员信息
+     * @param bkRy
+     * @throws BusinessException
+     */
+//    default void  updatePerson(TbBkRy bkRy, TbBkRecords record) throws BusinessException{}
+
+    /**
+     * 编辑车辆信息
+     * @param bkCl
+     * @param record
+     * @throws BusinessException
+     */
+//    default void  updateVehicle(TbBkCl bkCl, TbBkRecords record) throws  BusinessException{}
+
+    /**
+     * 撤销对数据库的布控操作
+     * @param value
+     * @return
+     */
+    default List<String> cancleDbBuKong(List<TbBkDb> value){
+        return  null;
+    }
+
+    @Data
+    public static class ResultData{
+        /**
+         * 数据返回的厂商类型
+         */
+        private BKCSTypeEnum csType;
+
+        /**
+         * 接口返回的数据对象
+         */
+        private  JSONObject  object = null;
+
+        /**
+         * 返回对象信息
+         */
+        private  Object      resultObject = null;
+
+        /**
+         * 操作成功的records的主键key集合和
+         */
+        private  List<String> primKeys;
+
+        public  ResultData(){
+            this.csType = null;
+            this.object = null;
+            this.resultObject = null;
+        };
+
+        public  ResultData(BKCSTypeEnum csType){
+            this.csType = csType;
+        }
+
+    }
+
+    @Data
+    public  static  class  BkHand  implements Serializable {
+        /**
+         * 布控库列表信息
+         */
+        private List<TbBkDb> bkDbList;
+
+        /**
+         * 布控类型，人或车
+         */
+        private BKDbTypeEnum dbTypeEnum;
+
+        /**
+         * 布控人员信息
+         */
+        private TbBkRy tbBkRy;
+
+        /**
+         * 布控的车辆信息
+         */
+        private TbBkCl tbBkCl;
+
+        public  void  checkData(){
+            if(null == dbTypeEnum){
+                throw  new BusinessException("布控类型参数无效！");
+            }
+            if(CollectionUtils.isEmpty(bkDbList)){
+                throw new BusinessException("未找到需要布控的布控数据库信息！");
+            }
+            switch (dbTypeEnum){
+                case Personnel:
+                    if(null == tbBkRy){
+                        throw  new BusinessException("布控人员信息无效！");
+                    }
+                    break;
+                case Car:
+                    if(null == tbBkCl){
+                        throw  new BusinessException("布控车辆信息无效！");
+                    }
+                    break;
+            }
+        }
+    }
+
+
+    @Data
+    public static  class  DbInfo{
+        /**
+         * 建立成功数据库主键
+         */
+        private  String  dbKey;
+
+        /**
+         * 标说数据库是否是隐藏属性
+         */
+        private  boolean hidden =false;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/XdxxService.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/XdxxService.java
new file mode 100644
index 0000000..1b2890c
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/XdxxService.java
@@ -0,0 +1,26 @@
+package com.mosty.bkzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.bkzx.XdxxQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface XdxxService {
+
+    @ApiOperation("根据身份证号查询行动信息列表")
+    IPage<Map<String, Object>> queryXdxxBYSzfh(XdxxQuery dto);
+
+    @ApiOperation("行动人员列表")
+    IPage<Map<String, Object>> xdrylb(XdxxQuery dto);
+
+    @ApiOperation("行动人员统计")
+    List<Map<String, Object>> xdrytj(XdxxQuery dto);
+
+    @ApiOperation("行动信息列表")
+    IPage<Map<String, Object>>  xdxxlb(XdxxQuery dto);
+
+    @ApiOperation("行动信息统计")
+    List<Map<String, Object>> xdxxtj(XdxxQuery dto);
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkClServiceImpl.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkClServiceImpl.java
new file mode 100644
index 0000000..5103a55
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkClServiceImpl.java
@@ -0,0 +1,242 @@
+package com.mosty.bkzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.model.dto.bkzx.TbBkClInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkClJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import com.mosty.base.model.query.bkzx.TbBkClSearchDto;
+import com.mosty.bkzx.mapper.TbBkClMapper;
+import com.mosty.bkzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.bkzx.service.TbBkClService;
+import com.mosty.bkzx.sjjs.client.HttpClient;
+import com.mosty.bkzx.sjjs.domain.ResponseStatusList;
+import com.mosty.bkzx.sjjs.entity.MotorVehic;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 布控车辆服务-实现
+ **/
+@AllArgsConstructor
+@Service
+public class TbBkClServiceImpl extends ServiceImpl<TbBkClMapper, TbBkCl>
+        implements TbBkClService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int addEntity(TbBkClInsertDto dto) {
+        // 查询是否有重复的数据
+        TbBkCl clItem = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbBkCl>()
+                        .eq(TbBkCl::getXtSjzt, "1")
+                        .eq(TbBkCl::getCphm, dto.getCphm())
+                        .eq(TbBkCl::getCplxdm, dto.getCplxdm())
+                        .last(" limit 1")
+        );
+        if (clItem != null) {
+            throw new BusinessException("该车辆已经存在，请修改布控状态或重新录入");
+        }
+        UserInfo user = UserInfoManager.get();
+        // 计算布控天数
+        int bkts = 0;
+        try {
+            bkts = DateUtils.daysBetween(dto.getBkkssj(), dto.getBkjssj());
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("时间格式转换异常");
+        }
+        TbBkCl Cl = new TbBkCl();
+        BeanUtils.copyProperties(dto, Cl);
+        Cl.setBkts(bkts);
+        Cl.setShzt("0");
+        Cl.setBkzt("0");
+        Cl.setXtSjly("1");
+        Cl.setSqrid(String.valueOf(user.getUserId()));
+        Cl.setSqrsfzh(user.getIdEntityCard());
+        Cl.setSqrxm(user.getUserName());
+        Cl.setSsbm(user.getDeptName());
+        Cl.setSsbmdm(String.valueOf(user.getDeptId()));
+        Cl.setSfqsbkcg("0");
+        Cl.setSfqsebkcg("0");
+        return this.baseMapper.insert(Cl);
+    }
+
+    @Override
+    public IPage<TbBkCl> getPageList(TbBkClSearchDto dto) {
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        QueryWrapper<TbBkCl> qw = new QueryWrapper<>();
+        IPage<TbBkCl> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.lambda()
+                        .eq(StringUtils.isNotBlank(dto.getCplxdm()), TbBkCl::getCplxdm, dto.getCplxdm())
+                        .eq(StringUtils.isNotBlank(dto.getBkjb()), TbBkCl::getBkjb, dto.getBkjb())
+                        .eq(StringUtils.isNotBlank(dto.getShzt()), TbBkCl::getShzt, dto.getShzt())
+                        .eq(StringUtils.isNotBlank(dto.getBkzt()), TbBkCl::getBkzt, dto.getBkzt())
+                        .like(StringUtils.isNotBlank(dto.getCphm()), TbBkCl::getCphm, dto.getCphm())
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbBkCl::getSsbmdm, dto.getSsbmdm())
+                        .orderByDesc(TbBkCl::getXtCjsj)
+        );
+        // 查询状态是否过期
+        List<TbBkCl> ClList = page.getRecords();
+        ClList.forEach(item -> {
+            if ("1".equals(item.getBkzt())) {
+                if (new Date().getTime() >= item.getBkjssj().getTime()) {
+                    item.setBkzt("2");
+                    this.baseMapper.updateById(item);
+                }
+            }
+        });
+        page.setRecords(ClList);
+        return page;
+    }
+
+    @Override
+    public TbBkCl getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int editCar(TbBkClInsertDto dto) {
+        // 查询是否有重复的数据
+        TbBkCl clItem = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbBkCl>()
+                        .eq(TbBkCl::getXtSjzt, "1")
+                        .eq(TbBkCl::getCphm, dto.getCphm())
+                        .eq(TbBkCl::getCplxdm, dto.getCplxdm())
+                        .last(" limit 1")
+                        .ne(TbBkCl::getId, dto.getId())
+        );
+        if (clItem != null) {
+            throw new BusinessException("该车辆已经存在，请修改布控状态或重新录入");
+        }
+        UserInfo user = UserInfoManager.get();
+        // 计算布控天数
+        int bkts = 0;
+        try {
+            bkts = DateUtils.daysBetween(dto.getBkkssj(), dto.getBkjssj());
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("时间格式转换异常");
+        }
+        TbBkCl Cl = this.getInfo(dto.getId());
+        BeanUtils.copyProperties(dto, Cl);
+        Cl.setBkts(bkts);
+        Cl.setShzt("0");
+        Cl.setBkzt("0");
+        Cl.setSqrid(String.valueOf(user.getUserId()));
+        Cl.setSqrsfzh(user.getIdEntityCard());
+        Cl.setSqrxm(user.getUserName());
+        Cl.setSsbm(user.getDeptName());
+        Cl.setSsbmdm(user.getDeptCode());
+        return this.baseMapper.updateById(Cl);
+    }
+
+    @Override
+    public int delCar(List<String> ids) {
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public int endBk(String id) {
+        TbBkCl Cl = this.baseMapper.selectById(id);
+        if (Cl != null) {
+            Cl.setBkzt("2");
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(Cl.getBkid())) {
+                HttpClient.delMotor(Cl.getBkid(), Cl.getBkkid());
+            }
+            return this.baseMapper.updateById(Cl);
+        }
+        return 0;
+    }
+
+    @Override
+    public int startBk(String id) {
+        TbBkCl Cl = this.baseMapper.selectById(id);
+        // 查看布控时间是否过期
+        if (Cl != null) {
+            if (new Date().getTime() >= Cl.getBkjssj().getTime()) {
+                throw new BusinessException("布控结束时间已过，请重新修改布控时间！！");
+            }
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(Cl.getBkid())) {
+                HttpClient.delMotor(Cl.getBkid(), Cl.getBkkid());
+            }
+            Cl.setBkzt("0");
+            Cl.setShzt("0");
+            return this.baseMapper.updateById(Cl);
+        }
+        return 0;
+    }
+
+    @Override
+    public int judge(TbBkClJudgeDto dto) {
+        TbBkCl cl = this.baseMapper.selectById(dto.getId());
+        if (cl == null) {
+            throw new BusinessException("布控车辆信息不存在");
+        }
+        cl.setShzt(dto.getShzt());
+        if ("1".equals(dto.getShzt())) {
+            if (cl.getBkjssj().getTime() <= new Date().getTime() + 60 * 60 * 1000) {
+                throw new BusinessException("布控结束时间不正确，请确保结束时间在1小时之后！");
+            }
+            cl.setBkzt("1");
+        } else if ("2".equals(dto.getShzt())) {
+            cl.setBkzt("3");
+        }
+        cl.setShsm(StringUtils.isBlank(dto.getShsm()) ? "审核通过" : dto.getShsm());
+        UserInfo userInfo = UserInfoManager.get();
+        cl.setShryid(String.valueOf(userInfo.getUserId()));
+        cl.setShrybm(userInfo.getDeptName());
+        cl.setShrybmdm(String.valueOf(userInfo.getDeptId()));
+        cl.setShryxm(userInfo.getUserName());
+
+        if (cl.getShzt().equals("1")) {
+            //向大华布控推送成员
+            MotorVehic motorVehic = new MotorVehic();
+            motorVehic.setPlateClass(cl.getCplxdm());
+            motorVehic.setPlateNo(cl.getCphm());
+            //调用大华布控添加车辆
+            //设置布控库车辆id 和 设置布控库
+            String faceId = cl.getBkkid() + "07" + String.valueOf((int) ((Math.random() * 9 + 1) * 10000));
+            motorVehic.setMotorVehicleID(faceId);
+            motorVehic.setTabID(cl.getBkkid());
+            String faces = HttpClient.insertMotor(motorVehic);
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(faces)) {
+                ResponseStatusList responseStatusList = JSONObject.parseObject(faces, ResponseStatusList.class);
+                if (null != responseStatusList && responseStatusList.getResponseStatusListObject().getResponseStatusObject().get(0).getStatusCode().equals("0")) {
+                    //保存布控库车辆id
+                    cl.setBkid(faceId);
+                }
+            }
+        } else {
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(cl.getBkid())) {
+                HttpClient.delMotor(cl.getBkid(), cl.getBkkid());
+            }
+        }
+
+        return this.baseMapper.updateById(cl);
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkDbServiceImpl.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkDbServiceImpl.java
new file mode 100644
index 0000000..5b6c31b
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkDbServiceImpl.java
@@ -0,0 +1,467 @@
+package com.mosty.bkzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.enums.BKCSTypeEnum;
+import com.mosty.base.enums.BKDbTypeEnum;
+import com.mosty.base.enums.BkTypeEnum;
+import com.mosty.base.model.dto.bkzx.TbBkDbBkDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbSearchDto;
+import com.mosty.base.model.dto.bkzx.TbBkDbUpDto;
+import com.mosty.base.model.entity.bkzx.TbBkDb;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.bkzx.mapper.TbBkDbMapper;
+import com.mosty.bkzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.bkzx.service.TbBkDbService;
+import com.mosty.bkzx.service.ThridBkService;
+import com.mosty.bkzx.sjjs.client.AccountUtils;
+import com.mosty.bkzx.sjjs.dto.ResponseStatusObject;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.base.util.SpringIocContext;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Service
+public class TbBkDbServiceImpl extends ServiceImpl<TbBkDbMapper, TbBkDb> implements TbBkDbService {
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final AccountUtils accountUtils;
+
+
+    @Override
+    public boolean updateBatchById(Collection<TbBkDb> entityList, int batchSize) {
+        return super.updateBatchById(entityList, batchSize);
+    }
+
+    @Override
+    public void builderDb(TbBkDbInsertDto dto) throws BusinessException {
+        UserInfo user = UserInfoManager.get();
+        if (null == user) {
+            throw new BusinessException("当前登陆用户信息无效！");
+        }
+
+        List<AccountUtils.Accounts> _accounts = this.accountUtils.findAccountsByArce(dto.getAreaCode());
+        if (CollectionUtils.isEmpty(_accounts)) {
+            throw new BusinessException("所要创建布控数据库区哉未找到，请重试！");
+        }
+
+//        this.builderDb(dto, user, _deptVo.getData(), _accounts);
+    }
+
+    /**
+     * 布控数据库删除
+     *
+     * @param records
+     * @throws BusinessException
+     */
+    @Override
+    public void delDb(List<Long> records) throws BusinessException {
+        if (CollectionUtils.isEmpty(records)) {
+            throw new BusinessException("删除布控数据库记录集合无效！");
+        }
+        List<TbBkDb> _daoes = this.baseMapper.selectList(new LambdaQueryWrapper<TbBkDb>().in(TbBkDb::getId, records));
+        if (CollectionUtils.isEmpty(_daoes)) {
+            throw new BusinessException("删除的布控数据库信息不存在！");
+        }
+        this.baseMapper.deleteBatchIds(_daoes.stream().map(_tp -> _tp.getId()).collect(Collectors.toList()));
+    }
+
+    @Override
+    public List<TbBkDb> selectList(Wrapper<TbBkDb> wrapper) throws BusinessException {
+        return this.baseMapper.selectList(wrapper);
+    }
+
+    @Override
+    public TbBkDb selectByOne(Wrapper<TbBkDb> wrapper) throws BusinessException {
+        return this.baseMapper.selectOne(wrapper);
+    }
+
+    @Override
+    public int updateEntity(TbBkDb entity) {
+        if (null == entity) {
+            return 0;
+        }
+        return this.baseMapper.updateById(entity);
+    }
+
+    /**
+     * 布控数据库分页查询
+     *
+     * @param reqPar
+     * @return
+     */
+    @Override
+    public IPage<TbBkDb> getPageList(TbBkDbSearchDto reqPar) {
+        if (null == reqPar) {
+            throw new BusinessException("布控数据库分页查询请求参数无效！");
+        }
+        QueryWrapper<TbBkDb> qw = new QueryWrapper<>();
+        IPage<TbBkDb> _pageData = this.baseMapper.selectPage(
+                new Page<>(reqPar.getPageCurrent(), reqPar.getPageSize()),
+                qw.lambda()
+                        .like(StringUtils.isNotBlank(reqPar.getDbName()), TbBkDb::getDbName, reqPar.getDbName())
+                        .eq(StringUtils.isNotBlank(reqPar.getDbCs()), TbBkDb::getDbCs, reqPar.getDbCs())
+                        .eq(StringUtils.isNotBlank(reqPar.getDbType()), TbBkDb::getDbType, reqPar.getDbType())
+                        .eq(StringUtils.isNotBlank(reqPar.getAreaCode()), TbBkDb::getAreaCode, reqPar.getAreaCode())
+                        .eq(TbBkDb::getHidden, false)
+                        .orderByDesc(TbBkDb::getXtCjsj)
+        );
+        return _pageData;
+    }
+
+    @Override
+    public Object bKDb(TbBkDbBkDto reqPar) {
+        if (null == reqPar || null == reqPar.getId() || null == reqPar.getBkJssj() || null == reqPar.getBkJssj()) {
+            throw new BusinessException("布控数据参数异常，请核查！");
+        }
+        List<TbBkDb> _dbs = this.baseMapper.selectList(new LambdaQueryWrapper<TbBkDb>()
+                .eq(TbBkDb::getId, reqPar.getId())
+        );
+        if (CollectionUtils.isEmpty(_dbs)) {
+            return "未找到需要进行布控的数据库！";
+        }
+
+        _dbs = this.baseMapper.selectList(new LambdaQueryWrapper<TbBkDb>()
+                .eq(TbBkDb::getDbCs, _dbs.get(0).getDbCs())
+                .eq(TbBkDb::getSssgajid, _dbs.get(0).getSssgajid())
+        );
+        if (CollectionUtils.isEmpty(_dbs)) {
+            return "未找到需要进行布控的数据库！";
+        }
+
+        List<TbBkDb> _bkdbitems = new ArrayList<TbBkDb>();
+        List<TbBkDb> _bkdbs = _dbs.stream().filter(_tp -> (StringUtils.isEmpty(_tp.getDbBkzt()) || _tp.getDbBkzt().equals("0"))).collect(Collectors.toList());
+        List<TbBkDb> _expritDbs = _dbs.stream().filter(_tp -> StringUtils.isNotBlank(_tp.getDbBkzt()) && _tp.getDbBkzt().equals("1")
+                && (_tp.getBkJssj().getTime() < DateUtils.getNowDate().getTime())).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(_bkdbs)) {
+            _bkdbitems.addAll(_bkdbs);
+        }
+        if (!CollectionUtils.isEmpty(_expritDbs)) {
+            _bkdbitems.addAll(_expritDbs);
+        }
+        _bkdbitems.forEach(_tp -> {
+            _tp.setBkJssj(reqPar.getBkJssj());
+            _tp.setBkKassj(reqPar.getBkKssj());
+            _tp.setJgxxjssjhm(reqPar.getJgxxjssjhm());
+        });
+        UserInfo user = UserInfoManager.get();
+
+        Map<BKCSTypeEnum, List<TbBkDb>> _dbItems = new HashMap<>();
+        for (TbBkDb _db : _bkdbitems) {
+            BKCSTypeEnum _cs = BKCSTypeEnum.toValue(_db.getDbCs());
+            if (null == _cs) {
+                continue;
+            }
+            if (_dbItems.containsKey(_cs)) {
+                _dbItems.get(_cs).add(_db);
+            } else {
+                List<TbBkDb> _dbes = new ArrayList<>();
+                _dbes.add(_db);
+                _dbItems.put(_cs, _dbes);
+            }
+        }
+        if (CollectionUtils.isEmpty(_dbItems)) {
+            throw new BusinessException("未找到需进行布控的数据！");
+        }
+
+        List<ResponseStatusObject> _statusObjects = new ArrayList<>();
+        Iterator<Map.Entry<BKCSTypeEnum, List<TbBkDb>>> _iter = _dbItems.entrySet().iterator();
+        while (_iter.hasNext()) {
+            Map.Entry<BKCSTypeEnum, List<TbBkDb>> _node = _iter.next();
+            ThridBkService _service = (ThridBkService) SpringIocContext.getBean(_node.getKey().getBeanName());
+            if (null != _service) {
+                List<ResponseStatusObject> _tmpresult = _service.startBkDb(_node.getValue(), user);
+                if (null != _tmpresult) {
+                    _statusObjects.addAll(_tmpresult);
+                }
+            }
+        }
+        if (CollectionUtils.isEmpty(_statusObjects)) {
+
+            return MessageFormat.format("布控{0}{1}数据库成功！", _dbs.get(0).getSssgaj(), (_dbs.get(0).getDbType().equals(BKDbTypeEnum.Personnel.getCode()) ? "人像" : "车辆"));
+        }
+        List<TbBkDb> _upDbs = new ArrayList<TbBkDb>();
+        for (ResponseStatusObject _tp : _statusObjects) {
+            TbBkDb _tmpDb = _bkdbitems.stream().filter(_tmp -> StringUtils.isNotBlank(_tmp.getDispositionID()) && _tmp.getDispositionID().equals(_tp.getId())).findAny().orElse(null);
+            if (_tmpDb != null) {
+                _tmpDb.setDbBkzt("1");
+                _tmpDb.setBkKassj(_tmpDb.getBkKassj());
+                _tmpDb.setBkJssj(_tmpDb.getBkJssj());
+                _tmpDb.setJgxxjssjhm(_tmpDb.getJgxxjssjhm());
+                _upDbs.add(_tmpDb);
+            }
+        }
+        if (!CollectionUtils.isEmpty(_upDbs)) {
+            this.updateBatchById(_upDbs);
+        } else {
+            throw new BusinessException(MessageFormat.format("布控{0}{1}数据库失败！", _dbs.get(0).getSssgaj(), (_dbs.get(0).getDbType().equals(BKDbTypeEnum.Personnel.getCode()) ? "人像" : "车辆")));
+        }
+        return MessageFormat.format("布控{0}{1}数据库成功！", _dbs.get(0).getSssgaj(), (_dbs.get(0).getDbType().equals(BKDbTypeEnum.Personnel.getCode()) ? "人像" : "车辆"));
+    }
+
+    /**
+     * 撤销对已经布控的数据撤销布控
+     *
+     * @param idKeys
+     * @return
+     */
+    @Override
+    public Object unBkDb(List<Long> idKeys) {
+        if (CollectionUtils.isEmpty(idKeys)) {
+            throw new BusinessException("撤销布控数据库信息无效！");
+        }
+        List<TbBkDb> _tbBkDbItems = this.selectList(new LambdaQueryWrapper<TbBkDb>().in(TbBkDb::getId, idKeys));
+        if (CollectionUtils.isEmpty(_tbBkDbItems)) {
+            throw new BusinessException("撤销布控数据库信息无效！");
+        }
+        _tbBkDbItems = _tbBkDbItems.stream().filter(_tmp -> StringUtils.isNotBlank(_tmp.getDbBkzt()) && _tmp.getDbBkzt().equals("1")).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(_tbBkDbItems)) {
+            throw new BusinessException("当前所选择的数据均未进行下发布控，无法进行撤销布控操作！");
+        }
+        Map<BKCSTypeEnum, List<TbBkDb>> _dbItems = new HashMap<>();
+        for (TbBkDb _temp : _tbBkDbItems) {
+            BKCSTypeEnum _cs = BKCSTypeEnum.toValue(_temp.getDbCs());
+            if (null == _cs) {
+                continue;
+            }
+            if (_dbItems.containsKey(_cs)) {
+                _dbItems.get(_cs).add(_temp);
+            } else {
+                List<TbBkDb> _items = new ArrayList<>();
+                _items.add(_temp);
+                _dbItems.put(_cs, _items);
+            }
+        }
+        if (CollectionUtils.isEmpty(_dbItems)) {
+            throw new BusinessException("撤销布控数据库信息无效！");
+        }
+        List<String> _dbKeys = new ArrayList<>();
+        Iterator<Map.Entry<BKCSTypeEnum, List<TbBkDb>>> _iter = _dbItems.entrySet().iterator();
+        while (_iter.hasNext()) {
+            Map.Entry<BKCSTypeEnum, List<TbBkDb>> _node = _iter.next();
+            List<String> _tmpKeys = ((ThridBkService) SpringIocContext.getBean(_node.getKey().getBeanName())).cancleDbBuKong(_node.getValue());
+            if (!CollectionUtils.isEmpty(_tmpKeys)) {
+                _dbKeys.addAll(_tmpKeys);
+            }
+        }
+        if (CollectionUtils.isEmpty(_dbKeys)) {
+            throw new BusinessException("撤销数据布控操作失败，请重试！");
+        }
+        _tbBkDbItems = _tbBkDbItems.stream().filter(_tp -> _dbKeys.contains(_tp.getDbId())).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(_tbBkDbItems)) {
+            throw new BusinessException("撤销数据布控操作失败，请重试！");
+        }
+        _tbBkDbItems.forEach(_tp -> {
+            _tp.setDbBkzt("0");
+            _tp.setDbId(StringUtils.EMPTY);
+        });
+        this.updateBatchById(_tbBkDbItems);
+        return MessageFormat.format("成功撤销数据库布控总数：{0}，失败数：{1}", _tbBkDbItems.size(), idKeys.size() - _tbBkDbItems.size());
+    }
+
+    /**
+     * 编辑布控数据库信息
+     *
+     * @param upDto
+     * @return
+     */
+    @Override
+    public Object modify(TbBkDbUpDto upDto) {
+        TbBkDb _dbinfo = this.baseMapper.selectById(upDto.getId());
+        if (null == _dbinfo) {
+            throw new BusinessException("布控数据库未找到！");
+        }
+        List<TbBkDb> _dbitems = this.baseMapper.selectList(new LambdaQueryWrapper<TbBkDb>().eq(TbBkDb::getAreaCode, _dbinfo.getAreaCode()));
+        if (CollectionUtils.isEmpty(_dbitems)) {
+            throw new BusinessException("编辑的布控数据未找到！");
+        }
+        _dbitems.forEach(_tp -> {
+            _tp.setDbName(upDto.getDbName());
+            _tp.setDescription(upDto.getDescription());
+            _tp.setBkKassj(upDto.getBkKassj());
+            _tp.setBkJssj(upDto.getBkJssj());
+        });
+        Boolean _succes = this.updateBatchById(_dbitems);
+        if (!_succes) {
+            return "更新布控数据基础信息成功！";
+        }
+        return "更新布控数据库基础信息失败，请重试！";
+    }
+
+    @Override
+    public TbBkDb getDetail(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public List<Map> getAreList() {
+        return accountUtils.getAccountList();
+    }
+
+    /**
+     * 创建布控车库
+     *
+     * @param dto
+     * @param user
+     */
+    private void builderDb(TbBkDbInsertDto dto, UserInfo user, DeptInfoVo detpVo, List<AccountUtils.Accounts> accounts) {
+        List<TbBkDb> _dbitems = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbBkDb>()
+                        .eq(TbBkDb::getSssgajdm, dto.getAreaCode()));
+
+        if (!CollectionUtils.isEmpty(_dbitems)) {
+            long _counts = 0;
+            if (dto.getDbType() == BKDbTypeEnum.All) {
+                _counts = _dbitems.stream().filter(_temp -> {
+                    return _temp.getDbType().equals(BKDbTypeEnum.Personnel.getCode()) ||
+                            _temp.getDbType().equals(BKDbTypeEnum.Car.getCode());
+                }).count();
+            } else {
+                _counts = _dbitems.stream().filter(_temp -> {
+                    return _temp.getDbType().equals(dto.getDbType().getCode());
+                }).count();
+            }
+            if (_counts > 0) {
+                throw new BusinessException("你当前所选择市的布控数据库已经存在，请不要重复创建布控数据库！");
+            }
+        }
+        List<TbBkDb> _dbs = new ArrayList<>();
+        for (AccountUtils.Accounts _account : accounts) {
+            if (_account.isPeopleLibrary()) {
+                TbBkDb _tempA = new TbBkDb();
+                _tempA.setHidden(_account.isHidden());
+                _tempA.setDescription(dto.getDescription());
+                _tempA.setSssgajid(detpVo.getDeptcode());
+                _tempA.setDbName(dto.getDbName());
+                _tempA.setDbType(BKDbTypeEnum.Personnel.getCode());
+                _tempA.setDbCs(BKCSTypeEnum.DAHUA.getValue());
+                _tempA.setAreaCode(_account.getAreaCode());
+                _tempA.setAreaName(_account.getName());
+                _tempA.setBkKassj(dto.getBkKassj());
+                _tempA.setBkJssj(dto.getBkJssj());
+                _tempA.setAccount(_account);
+                _dbs.add(_tempA);
+            }
+
+            if (_account.isCarLibrary()) {
+                TbBkDb _tempb = new TbBkDb();
+                _tempb.setDescription(dto.getDescription());
+                _tempb.setSssgajid(detpVo.getDeptcode());
+                _tempb.setDbName(dto.getDbName());
+                _tempb.setDbType(BKDbTypeEnum.Car.getCode());
+                _tempb.setDbCs(BKCSTypeEnum.DAHUA.getValue());
+                if (!_account.isPeopleLibrary()) {
+                    _tempb.setHidden(true);
+                } else {
+                    _tempb.setHidden(BKDbTypeEnum.Car.isHidden());
+                }
+                _tempb.setAreaName(_account.getName());
+                _tempb.setBkJssj(dto.getBkJssj());
+                _tempb.setBkKassj(dto.getBkKassj());
+                _tempb.setAreaCode(_account.getAreaCode());
+                _tempb.setAccount(_account);
+                _dbs.add(_tempb);
+            }
+        }
+        for (BKCSTypeEnum _tmp : BKCSTypeEnum.values()) {
+            if (_tmp.isEnable()) {
+                ThridBkService dbService = (ThridBkService) SpringIocContext.getBean(_tmp.getBeanName());
+                if (null != dbService) {
+                    dbService.createDb(_dbs, user, detpVo);
+                }
+            }
+        }
+        this.saveOrUpdateBatch(_dbs);
+    }
+
+    private List<TbBkDb> convertDaHuaByPrimKey(List<ThridBkService.DbInfo> dbInfo, TbBkDbInsertDto dto, DeptInfoVo detpVo) {
+        List<TbBkDb> _resdata = new ArrayList<TbBkDb>();
+        if (CollectionUtils.isEmpty(dbInfo)) {
+            return null;
+        }
+        for (int _index = 0; _index < dbInfo.size(); _index++) {
+            TbBkDb _tpDb = new TbBkDb();
+            _tpDb.setDbName(dto.getDbName());
+            _tpDb.setDbId(dbInfo.get(_index).getDbKey());
+            _tpDb.setDbCs(BKCSTypeEnum.DAHUA.getValue());
+            _tpDb.setDescription(dto.getDescription());
+            _tpDb.setHidden(dbInfo.get(_index).isHidden());
+            _tpDb.setDbType(this.getBkDbType(_tpDb.getDbId()));
+            _tpDb.setSssgajid(detpVo.getDeptid());
+            _tpDb.setSssgaj(detpVo.getDeptname());
+            _tpDb.setSssgajdm(detpVo.getDeptcode());
+            BKDbTypeEnum _dbType = BKDbTypeEnum.toCode(_tpDb.getDbType());
+            if (null != _dbType) {
+                if (_dbType == BKDbTypeEnum.Car && !_tpDb.getHidden()) {
+                    _tpDb.setHidden(true);
+                }
+            }
+            if (_tpDb.getDbType().equals(BKDbTypeEnum.Personnel.getCode())) {
+                _tpDb.setBkType(BkTypeEnum.BKRL.getValue());
+            }
+            _resdata.add(_tpDb);
+        }
+        return _resdata;
+    }
+
+    /**
+     * 大华数据转换
+     *
+     * @param object
+     * @return
+     */
+    private List<TbBkDb> convertDaHua(JSONObject object, TbBkDbInsertDto dto, DeptInfoVo detpVo) {
+        List<TbBkDb> _resdata = new ArrayList<TbBkDb>();
+        if (object == null) {
+            return _resdata;
+        }
+        JSONArray _jsArray = object.getJSONObject("ResponseStatusListObject").getJSONArray("ResponseStatusObject");
+        for (int _index = 0; _index < _jsArray.size(); _index++) {
+            TbBkDb _tpDb = new TbBkDb();
+            _tpDb.setDbName(dto.getDbName());
+            _tpDb.setDbId(_jsArray.getJSONObject(_index).getString("Id"));
+            _tpDb.setDbCs(BKCSTypeEnum.DAHUA.getValue());
+            _tpDb.setDescription(dto.getDescription());
+            _tpDb.setDbType(this.getBkDbType(_tpDb.getDbId()));
+            _tpDb.setSssgajid(detpVo.getDeptid());
+            _tpDb.setSssgaj(detpVo.getDeptname());
+            _tpDb.setSssgajdm(detpVo.getDeptcode());
+            if (_tpDb.getDbType().equals(BKDbTypeEnum.Personnel.getCode())) {
+                _tpDb.setBkType(BkTypeEnum.BKRL.getValue());
+            }
+            _resdata.add(_tpDb);
+        }
+        return _resdata;
+    }
+
+    /**
+     * 获取布控库类型
+     *
+     * @param dbId
+     * @return
+     */
+    private String getBkDbType(String dbId) {
+        String _typeCode = dbId.substring(20, 22);
+        if ("05".equals(_typeCode)) {
+            return BKDbTypeEnum.Personnel.getCode();
+        } else {
+            return BKDbTypeEnum.Car.getCode();
+        }
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkRyServiceImpl.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkRyServiceImpl.java
new file mode 100644
index 0000000..bede2f1
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/TbBkRyServiceImpl.java
@@ -0,0 +1,281 @@
+package com.mosty.bkzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.model.dto.bkzx.TbBkRyInsertDto;
+import com.mosty.base.model.dto.bkzx.TbBkRyJudgeDto;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import com.mosty.base.model.query.bkzx.TbBkRySearchDto;
+import com.mosty.bkzx.mapper.TbBkRyMapper;
+import com.mosty.bkzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.bkzx.service.TbBkRyService;
+import com.mosty.bkzx.sjjs.client.HttpClient;
+import com.mosty.bkzx.sjjs.domain.ResponseStatusList;
+import com.mosty.bkzx.sjjs.dto.SubImageListDTO;
+import com.mosty.bkzx.sjjs.entity.Face;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/13
+ * 布控人员服务-实现
+ **/
+@AllArgsConstructor
+@Service
+public class TbBkRyServiceImpl extends ServiceImpl<TbBkRyMapper, TbBkRy>
+        implements TbBkRyService {
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    @Override
+    public int addEntity(TbBkRyInsertDto dto) {
+        // 查询是否有重复的数据
+        TbBkRy ryItem = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbBkRy>()
+                        .eq(TbBkRy::getXtSjzt, "1")
+                        .eq(TbBkRy::getBklx, dto.getBklx())
+                        .eq("1".equals(dto.getBklx()), TbBkRy::getSfzh, dto.getSfzh())
+                        .eq("2".equals(dto.getBklx()), TbBkRy::getSjhm, dto.getSjhm())
+                        .eq("3".equals(dto.getBklx()), TbBkRy::getHzhm, dto.getHzhm())
+                        .eq("4".equals(dto.getBklx()), TbBkRy::getImsi, dto.getImsi())
+                        .eq("5".equals(dto.getBklx()), TbBkRy::getImei, dto.getImei())
+                        .last(" limit 1")
+        );
+        if (ryItem != null) {
+            throw new BusinessException("该人员已经存在，请修改布控状态或重新录入");
+        }
+        UserInfo user = UserInfoManager.get();
+        // 计算布控天数
+        int bkts = 0;
+        try {
+            bkts = DateUtils.daysBetween(dto.getBkkssj(), dto.getBkjssj());
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("时间格式转换异常");
+        }
+        TbBkRy ry = new TbBkRy();
+        BeanUtils.copyProperties(dto, ry);
+        ry.setBkts(bkts);
+        ry.setShzt("0");
+        ry.setBkzt("0");
+        ry.setXtSjly("1");
+        ry.setSqrid(String.valueOf(user.getUserId()));
+        ry.setSqrsfzh(user.getIdEntityCard());
+        ry.setSqrxm(user.getUserName());
+        ry.setSsbm(user.getDeptName());
+        ry.setSsbmdm(user.getDeptCode());
+        ry.setSfqsbkcg("0");
+        ry.setSfqsebkcg("0");
+        return this.baseMapper.insert(ry);
+    }
+
+    @Override
+    public IPage<TbBkRy> getPageList(TbBkRySearchDto dto) {
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        QueryWrapper<TbBkRy> qw = new QueryWrapper<>();
+        IPage<TbBkRy> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.lambda()
+                        .like(StringUtils.isNotBlank(dto.getXm()), TbBkRy::getXm, dto.getXm())
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbBkRy::getSsbmdm, dto.getSsbmdm())
+                        .eq(StringUtils.isNotBlank(dto.getBkjb()), TbBkRy::getBkjb, dto.getBkjb())
+                        .eq(StringUtils.isNotBlank(dto.getShzt()), TbBkRy::getShzt, dto.getShzt())
+                        .eq(StringUtils.isNotBlank(dto.getBkzt()), TbBkRy::getBkzt, dto.getBkzt())
+                        .eq(StringUtils.isNotBlank(dto.getBklx()), TbBkRy::getBklx, dto.getBklx())
+                        .and(StringUtils.isNotBlank(dto.getKeyword()),
+                                ew -> ew.like(TbBkRy::getSfzh, dto.getKeyword())
+                                        .or().like(TbBkRy::getSjhm, dto.getKeyword())
+                                        .or().like(TbBkRy::getHzhm, dto.getKeyword())
+                                        .or().like(TbBkRy::getImsi, dto.getKeyword())
+                                        .or().like(TbBkRy::getImei, dto.getKeyword())
+                        ).orderByDesc(TbBkRy::getXtCjsj)
+        );
+        // 查询状态是否过期
+        List<TbBkRy> ryList = page.getRecords();
+        ryList.forEach(item -> {
+            if ("1".equals(item.getBkzt())) {
+                if (new Date().getTime() >= item.getBkjssj().getTime()) {
+                    item.setBkzt("2");
+                    this.baseMapper.updateById(item);
+                }
+            }
+        });
+        page.setRecords(ryList);
+        return page;
+    }
+
+    @Override
+    public TbBkRy getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int editPerson(TbBkRyInsertDto dto) {
+        // 查询是否有重复的数据
+        TbBkRy ryItem = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbBkRy>()
+                        .eq(TbBkRy::getXtSjzt, "1")
+                        .eq(TbBkRy::getBklx, dto.getBklx())
+                        .eq("1".equals(dto.getBklx()), TbBkRy::getSfzh, dto.getSfzh())
+                        .eq("2".equals(dto.getBklx()), TbBkRy::getSjhm, dto.getSjhm())
+                        .eq("3".equals(dto.getBklx()), TbBkRy::getHzhm, dto.getHzhm())
+                        .eq("4".equals(dto.getBklx()), TbBkRy::getImsi, dto.getImsi())
+                        .eq("5".equals(dto.getBklx()), TbBkRy::getImei, dto.getImei())
+                        .ne(TbBkRy::getId, dto.getId())
+                        .last(" limit 1")
+        );
+        if (ryItem != null) {
+            throw new BusinessException("该人员已经存在，请修改布控状态或重新录入");
+        }
+        UserInfo user = UserInfoManager.get();
+        // 计算布控天数
+        int bkts = 0;
+        try {
+            bkts = DateUtils.daysBetween(dto.getBkkssj(), dto.getBkjssj());
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("时间格式转换异常");
+        }
+        TbBkRy ry = this.getInfo(dto.getId());
+        BeanUtils.copyProperties(dto, ry);
+        ry.setBkts(bkts);
+        ry.setShzt("0");
+        ry.setBkzt("0");
+        ry.setSqrid(String.valueOf(user.getUserId()));
+        ry.setSqrsfzh(user.getIdEntityCard());
+        ry.setSqrxm(user.getUserName());
+        ry.setSsbm(user.getDeptName());
+        ry.setSsbmdm(user.getDeptCode());
+        return this.baseMapper.updateById(ry);
+    }
+
+    @Override
+    public int delPerson(List<String> ids) {
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public int endBk(String id) {
+        TbBkRy ry = this.baseMapper.selectById(id);
+        if (ry != null) {
+            ry.setBkzt("2");
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(ry.getBkid())) {
+                HttpClient.delFaces(ry.getBkid(), ry.getBkkid());
+            }
+            return this.baseMapper.updateById(ry);
+        }
+        return 0;
+    }
+
+    @Override
+    public int startBk(String id) {
+        TbBkRy ry = this.baseMapper.selectById(id);
+        // 查看布控时间是否过期
+        if (ry != null) {
+            if (new Date().getTime() >= ry.getBkjssj().getTime()) {
+                throw new BusinessException("布控结束时间已过，请重新修改布控时间！！");
+            }
+            ry.setBkzt("0");
+            ry.setShzt("0");
+            //删除成员
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(ry.getBkid())) {
+                HttpClient.delFaces(ry.getBkid(), ry.getBkkid());
+            }
+
+            return this.baseMapper.updateById(ry);
+        }
+        return 0;
+    }
+
+    @Override
+    public int judge(TbBkRyJudgeDto dto) {
+        TbBkRy ry = this.baseMapper.selectById(dto.getId());
+        if (ry == null) {
+            throw new BusinessException("布控人员信息不存在");
+        }
+        ry.setShzt(dto.getShzt());
+        if ("1".equals(dto.getShzt())) {
+            if (ry.getBkjssj().getTime() <= new Date().getTime() + 60 * 60 * 1000) {
+                throw new BusinessException("布控结束时间不正确，请确保结束时间在1小时之后！");
+            }
+            ry.setBkzt("1");
+        } else if ("2".equals(dto.getShzt())) {
+            ry.setBkzt("3");
+        }
+        ry.setShsm(StringUtils.isBlank(dto.getShsm()) ? "审核通过" : dto.getShsm());
+        UserInfo userInfo = UserInfoManager.get();
+        ry.setShryid(String.valueOf(userInfo.getUserId()));
+        ry.setShrybm(userInfo.getDeptName());
+        ry.setShrybmdm(String.valueOf(userInfo.getDeptId()));
+        ry.setShryxm(userInfo.getUserName());
+
+        //通过添加到大华
+        if (ry.getShzt().equals("1")) {
+            try {
+                Face face = new Face();
+                face.setIDType("111");//默认身份证
+                face.setIDNumber(ry.getSfzh());
+                face.setName(ry.getXm());
+                face.setGenderCode(ry.getXbdm());
+                List<SubImageListDTO.SubImageInfoObjectDTO> list = new ArrayList<>();
+                SubImageListDTO.SubImageInfoObjectDTO subImageInfoObjectDTO = new SubImageListDTO.SubImageInfoObjectDTO();
+                //minio获取图片
+//                String url = tbBaseAdaptRemoteService.downloadUrl(ry.getRxtpdz());
+                String base64 = tbBaseAdaptRemoteService.downloadBaes64(ry.getRxtpdz());//照片一定不为空
+                if (StringUtils.isNotEmpty(base64)) {
+                    subImageInfoObjectDTO.setStoragePath(base64);
+                    subImageInfoObjectDTO.setLeftTopX(0);
+                    subImageInfoObjectDTO.setLeftTopY(0);
+                    subImageInfoObjectDTO.setRightBtmX(0);
+                    subImageInfoObjectDTO.setRightBtmY(0);
+                    list.add(subImageInfoObjectDTO);
+                    SubImageListDTO subImageListDTO = new SubImageListDTO();
+                    subImageListDTO.setSubImageInfoObject(list);
+                    face.setSubImageList(subImageListDTO);
+                    //调用大华布控添加人员
+                    //设置布控库人员id
+                    String faceId = ry.getBkkid() + "06" + String.valueOf((int) ((Math.random() * 9 + 1) * 10000));
+                    face.setFaceID(faceId);
+                    //设置布控库
+                    face.setTabID(ry.getBkkid());
+                    String faces = HttpClient.insertFaces(face);
+                    if (org.apache.commons.lang3.StringUtils.isNotBlank(faces)) {
+                        ResponseStatusList responseStatusList = JSONObject.parseObject(faces, ResponseStatusList.class);
+                        if (null != responseStatusList && responseStatusList.getResponseStatusListObject().getResponseStatusObject().get(0).getStatusCode().equals("0")) {
+                            //保存布控库人员id
+                            ry.setBkid(faceId);
+                        }
+                    }
+                }
+
+            } catch (Exception e) {
+                System.out.println("添加大华布控成员失败------->" + e.getMessage());
+                throw new BusinessException("添加大华布控成员失败 请重试！");
+            }
+
+        } else {
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(ry.getBkid())) {
+                HttpClient.delFaces(ry.getBkid(), ry.getBkkid());
+            }
+        }
+        return this.baseMapper.updateById(ry);
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/XdxxServiceImpl.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/XdxxServiceImpl.java
new file mode 100644
index 0000000..1834cff
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/service/impl/XdxxServiceImpl.java
@@ -0,0 +1,79 @@
+package com.mosty.bkzx.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.bkzx.XdxxQuery;
+import com.mosty.bkzx.mapper.XdxxMapper;
+import com.mosty.bkzx.service.XdxxService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class XdxxServiceImpl implements XdxxService {
+
+    private final XdxxMapper xdxxMapper;
+
+    @Override
+    public IPage<Map<String, Object>> queryXdxxBYSzfh(XdxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.xdxxMapper.queryXdxxBYSzfhCount(map);
+        List<Map<String, Object>> list = this.xdxxMapper.queryXdxxBYSzfh(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> xdrylb(XdxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.xdxxMapper.xdrylbCount(map);
+        List<Map<String, Object>> list = this.xdxxMapper.xdrylb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> xdrytj(XdxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        return this.xdxxMapper.xdrytj(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> xdxxlb(XdxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.xdxxMapper.xdxxlbCount(map);
+        List<Map<String, Object>> list = this.xdxxMapper.xdxxlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> xdxxtj(XdxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        return this.xdxxMapper.xdxxtj(map);
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/AccountUtils.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/AccountUtils.java
new file mode 100644
index 0000000..3a07b2a
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/AccountUtils.java
@@ -0,0 +1,103 @@
+package com.mosty.bkzx.sjjs.client;
+
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.*;
+
+@Service
+public class AccountUtils {
+    private static final Map<String, Accounts> accounts = new HashMap<String, Accounts>();
+
+    AccountUtils() {
+        accounts.put("5106", new Accounts("德阳", "zydytest", "system123", "5107", false, "510600000000", true, true));
+    }
+
+    /**
+     * 获取建库的区域列表
+     *
+     * @return
+     */
+    public List<Map> getAccountList() {
+        List<Map> _reslist = new ArrayList<>();
+        Iterator<Map.Entry<String, Accounts>> _iter = accounts.entrySet().iterator();
+        while (_iter.hasNext()) {
+            Map.Entry<String, Accounts> _node = _iter.next();
+            if (_node.getValue().hidden) {
+                continue;
+            }
+            Map _tp = new HashMap();
+            _tp.put("arecode", _node.getKey());
+            _tp.put("name", _node.getValue().getName());
+            _reslist.add(_tp);
+        }
+        return _reslist;
+    }
+
+
+    /**
+     * 根据所选择的区域查找账户信息
+     *
+     * @return
+     */
+    public List<Accounts> findAccountsByArce(String arce) {
+        if (StringUtils.isEmpty(arce)) {
+            return null;
+        }
+        List<Accounts> _accounts = new ArrayList<>();
+        Iterator<Map.Entry<String, Accounts>> _iter = accounts.entrySet().iterator();
+        while (_iter.hasNext()) {
+            Map.Entry<String, Accounts> entry = _iter.next();
+            if (entry.getValue().getAreaCode().equals(arce)) {
+                _accounts.add(entry.getValue());
+            }
+        }
+        return _accounts;
+    }
+
+
+    public List<Accounts> findAccountsByArceAndName(String arce, String arceName) {
+        if (StringUtils.isEmpty(arce) || StringUtils.isEmpty(arceName)) {
+            return null;
+        }
+        List<Accounts> _accounts = new ArrayList<>();
+        Iterator<Map.Entry<String, Accounts>> _iter = accounts.entrySet().iterator();
+        while (_iter.hasNext()) {
+            Map.Entry<String, Accounts> entry = _iter.next();
+            if (entry.getValue().getAreaCode().equals(arce) && entry.getValue().getName().equals(arceName)) {
+                _accounts.add(entry.getValue());
+            }
+        }
+        return _accounts;
+    }
+
+
+    @Data
+    public static class Accounts implements Serializable {
+        private String name;
+        private String account;
+        private String pwd;
+        private String areaCode;
+        private boolean hidden;
+        private String sssgajdm;
+        private boolean isCarLibrary;
+        private boolean isPeopleLibrary;
+
+        public Accounts() {
+        }
+
+        public Accounts(String name, String account, String pwd, String areaCode, boolean hidden, String sssgajdm, boolean isCarLibrary, boolean isPeopleLibrary) {
+            this.name = name;
+            this.account = account;
+            this.pwd = pwd;
+            this.areaCode = areaCode;
+            this.hidden = hidden;
+            this.sssgajdm = sssgajdm;
+            this.isCarLibrary = isCarLibrary;
+            this.isPeopleLibrary = isPeopleLibrary;
+        }
+    }
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/HttpClient.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/HttpClient.java
new file mode 100644
index 0000000..6cd0fed
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/HttpClient.java
@@ -0,0 +1,271 @@
+package com.mosty.bkzx.sjjs.client;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.mosty.base.utils.Constant;
+import com.mosty.bkzx.sjjs.dto.DHUpVIASDataClassTabs;
+import com.mosty.bkzx.sjjs.dto.DispositionObjectDto;
+import com.mosty.bkzx.sjjs.dto.FaceObjectDTO;
+import com.mosty.bkzx.sjjs.dto.MotorVehicleObject;
+import com.mosty.bkzx.sjjs.entity.DataClassTabObject;
+import com.mosty.bkzx.sjjs.entity.Dispositions;
+import com.mosty.bkzx.sjjs.entity.Face;
+import com.mosty.bkzx.sjjs.entity.MotorVehic;
+import com.mosty.bkzx.sjjs.vo.*;
+import com.mosty.bkzx.utlis.MD5Util;
+import com.mosty.bkzx.utlis.OkHttpUtils;
+import com.mosty.common.base.exception.BusinessException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * HTTP请求静态类
+ */
+public class HttpClient {
+
+    /**
+     * 保活会话
+     * 用户登录成功后，都是用token进行关联会话信息，为了避免出现token变更无法查找关联信息，
+     * 可以使用会话保持接口，对该token进行续租，保持持续有效。续租成功，请求方需要在下一次超时之前再次发起会话保活请求
+     *
+     * @param token
+     * @return
+     */
+    public static String keepAlive(String token) {return null;}
+
+    /**
+     * 第一次交互
+     *
+     * @param userName
+     * @param clientType
+     * @return
+     */
+    public static AuthorizeOneVo authorizeBefore(String userName, String clientType) {return null;}
+
+
+    /**
+     * 第二次交互
+     *
+     * @param userName
+     * @param password
+     * @return
+     */
+    public static AuthorizeTwoVo authorizeAfter(AuthorizeOneVo authorizeOneVo, String userName, String password) {return null;}
+
+    /**
+     * 巡逻盘查图片获取人员信息
+     *
+     * @param base64
+     * @return
+     */
+    public static CustomInfoVo userList(String base64) {return null;}
+
+    /**
+     * 图片获取人员信息
+     *
+     * @param personIdentifyObject
+     * @return
+     */
+    public static FaceObject faceObject(PersonIdentifyObject personIdentifyObject) {return null;}
+
+
+    /**
+     * 大华人像库新增
+     *
+     * @param faceRepository
+     * @return
+     */
+    public static String insertFaceRepository(FaceRepository faceRepository) {return null;}
+
+    /**
+     * 大华人像库查询
+     *
+     * @return
+     */
+    public static List<FaceRepositoryInfo> queryFaceRepository() {return null;}
+
+    /**
+     * 大华人像库详情
+     *
+     * @return
+     */
+    public static FaceRepositoryInfo faceRepositoryDetail(String faceRepositoryId) {return null;}
+
+    /**
+     * 大华人像库修改
+     *
+     * @return
+     */
+    public static void faceRepositoryUpdate(String faceRepositoryId, String name, String memo, int type) {}
+
+    /**
+     * 大华人像库新增成员
+     *
+     * @return
+     */
+    public static String faceRepositoryUserSave(FaceRepositoryUser faceRepositoryUser) {return null;}
+
+    /**
+     * 大华人像库删除成员
+     *
+     * @return
+     */
+    public static void faceRepositoryUserDelete(String memberId) {}
+
+
+    /**
+     * 查看某个库成员的详情
+     *
+     * @param faceImgId
+     * @return
+     */
+    public static RepositoryUser authorizeBefore(String faceImgId) {return null;}
+
+    /**
+     * 人像布控
+     *
+     * @param repositoryId 人像库 id，必填。
+     * @param channelCode  Saas通道id，必填。
+     * @param threshold    布控阈值，取值范围为[0-1],必填。
+     * @param level        布控等级。选填。
+     * @return
+     */
+    public static void surveillance(String repositoryId, String channelCode, double threshold, int level) {}
+
+    /**
+     * 布控删除
+     *
+     * @param repositoryId 人像库 id，必填。
+     * @param channelCode  Saas通道id，必填。
+     */
+    public static void surveillanceDelete(String repositoryId, String channelCode) {}
+
+    /**
+     * 车辆新增布控
+     *
+     * @param vehicleCar 人像库 id，必填。
+     */
+
+    public static String carSurveillance(VehicleCar vehicleCar) {return null;}
+
+    /**
+     * 车辆新增布控审核
+     *
+     * @param recordId  过车记录索引号。
+     * @param operation pass通过，notPass不通过。
+     */
+    public static void carSurveillanceAudit(String recordId, Boolean operation) {}
+
+
+    /**
+     * 车辆撤销布控
+     *
+     * @param recordId     过车记录索引号。
+     * @param revokeReason 撤控原因"。
+     */
+    public static void carSurveillanceDelete(String recordId, String revokeReason) {}
+
+
+    /**
+     * 获取HLS播放地址
+     *
+     * @param
+     * @return
+     */
+    public static String getHLS(String channelId) {return null;}
+
+    /**
+     * 创建人脸布控库（修改put）  难得写 没必要
+     *
+     * @param
+     * @return
+     */
+    public static String insertPersonIdentify(DataClassTabObject dataClassTabObject) {return null;}
+
+    /**
+     * 删除人脸布控库
+     *
+     * @param
+     * @return
+     */
+    public static String delPersonIdentify(String id) {return null;}
+
+    /**
+     * 布控库添加人员
+     *
+     * @param face
+     * @return
+     */
+    public static String insertFaces(Face face) {return null;}
+
+    /**
+     * 向布控库中添加布控人员信息
+     * @param faceObjects
+     * @return
+     */
+    public static String insertFaces(List<FaceObjectDTO> faceObjects, String token){return null;}
+
+    /**
+     * 布控库添加车辆
+     *
+     * @param motorVehic
+     * @return
+     */
+    public static String insertMotor(MotorVehic motorVehic) {return null;}
+
+
+    /**
+     * 布控库添加车辆
+     *
+     * @param motorVehic
+     * @return
+     */
+    public static String insertMotor(List<MotorVehicleObject> motorVehic, String token) {return null;}
+    /**
+     * 申请进行布控
+     * @return
+     */
+    public  static  String cancelDbDispositions(List<DispositionObjectDto> bkDto){return null;}
+
+
+    public static String insertDispositions(DispositionObjectDto dispositions,String token) {return null;}
+
+    /**
+     * 删除布控库人员
+     *
+     * @param
+     * @return
+     */
+    public static String delFaces(String id, String tabId) {return null;}
+
+    /**
+     * 布控人员
+     *
+     * @param dispositions
+     * @return
+     */
+    public static String insertDispositions(Dispositions dispositions) {return null;}
+
+
+
+    public  static String insertPersonIdentifyByToken(DataClassTabObject dataClassTabObject,String token){return null;}
+
+    /**
+     * 更新布控库信息
+     * @param tabs
+     * @return
+     */
+    public static String updateBkDbInfor(List<DHUpVIASDataClassTabs> tabs){return null;}
+
+    /**
+     * 删除布控库车辆
+     *
+     * @param
+     * @return
+     */
+    public static String delMotor(String id, String tabId) {return null;}
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/TokenClient.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/TokenClient.java
new file mode 100644
index 0000000..abca30b
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/client/TokenClient.java
@@ -0,0 +1,44 @@
+package com.mosty.bkzx.sjjs.client;
+
+
+import com.mosty.bkzx.sjjs.vo.AuthorizeTwoVo;
+import com.mosty.common.base.exception.BusinessException;
+
+public enum TokenClient {
+
+    INSTANCE();
+
+    private static String token;
+
+    private static long createdTime;
+
+
+    public String accessToken(){
+        if(token == null){
+            AuthorizeTwoVo authorizeTwoVo = HttpClient.authorizeAfter(HttpClient.authorizeBefore("zymytest","web"),"zymytest","system123");
+            token = authorizeTwoVo.getToken();
+            createdTime = System.currentTimeMillis();
+        }
+        if((System.currentTimeMillis() - createdTime) >= 90 *1000 ){
+            HttpClient.keepAlive(token);
+        }
+        if((System.currentTimeMillis() - createdTime) >= 120 *1000){
+            AuthorizeTwoVo authorizeTwoVo = HttpClient.authorizeAfter(HttpClient.authorizeBefore("zymytest","web"),"zymytest","system123");
+            token = authorizeTwoVo.getToken();
+            createdTime = System.currentTimeMillis();
+        }
+        return token;
+    }
+
+    /**
+     * 大华根据不同的市区建库
+     * @param account
+     * @return
+     */
+    public  String accessToken(AccountUtils.Accounts account){
+        if(null == account){throw  new BusinessException("token账号信息无效！");}
+        AuthorizeTwoVo authorizeTwoVo = HttpClient.authorizeAfter(HttpClient.authorizeBefore(account.getAccount(),"web"),account.getAccount(),account.getPwd());
+        token = authorizeTwoVo.getToken();
+        return token;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/domain/ResponseStatusList.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/domain/ResponseStatusList.java
new file mode 100644
index 0000000..9994684
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/domain/ResponseStatusList.java
@@ -0,0 +1,39 @@
+package com.mosty.bkzx.sjjs.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class ResponseStatusList {
+
+
+    @JsonProperty("ResponseStatusListObject")
+    private ResponseStatusListObjectDTO responseStatusListObject;
+
+    @NoArgsConstructor
+    @Data
+    public static class ResponseStatusListObjectDTO {
+        @JsonProperty("ResponseStatusObject")
+        private List<ResponseStatusObjectDTO> responseStatusObject;
+
+        @NoArgsConstructor
+        @Data
+        public static class ResponseStatusObjectDTO {
+            @JsonProperty("Id")
+            private String id;
+            @JsonProperty("LocalTime")
+            private String localTime;
+            @JsonProperty("RequestURL")
+            private String requestURL;
+            @JsonProperty("StatusCode")
+            private String statusCode;
+            @JsonProperty("StatusString")
+            private String statusString;
+        }
+    }
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/CustomInfo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/CustomInfo.java
new file mode 100644
index 0000000..0d53705
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/CustomInfo.java
@@ -0,0 +1,52 @@
+package com.mosty.bkzx.sjjs.dto;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 图像识别返回人员列表
+ */
+@Data
+public class CustomInfo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    /**
+     * 人员身份证号
+     */
+    private String sfzh;
+
+    /**
+     * 人员出身日期
+     */
+    private String csrq;
+
+    /**
+     * 人员性别代码
+     */
+    private String xbdm;
+
+    /**
+     * 人员姓名
+     */
+    private String xm;
+
+    /**
+     * 人员照片ID
+     */
+    private String xp;
+
+    /**
+     * 相似度
+     */
+    private double xsd;
+
+    /**
+     * 人员照片URL
+     *
+     * @return
+     */
+    private String filePath;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHDateDto.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHDateDto.java
new file mode 100644
index 0000000..aac52a5
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHDateDto.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.mosty.bkzx.sjjs.enums.DHDataTypeEnum;
+import com.mosty.bkzx.sjjs.enums.DHOperateTypeENum;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DHDateDto implements Serializable {
+    private   Object   data;        //数据
+    private DHDataTypeEnum dataType;  //数据类型
+    private DHOperateTypeENum operType;    //操作类型
+    private   Object   args;                //附带参数
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHUpVIASDataClassTabs.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHUpVIASDataClassTabs.java
new file mode 100644
index 0000000..0e3617d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DHUpVIASDataClassTabs.java
@@ -0,0 +1,19 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 大华修改布控库信息请求模型
+ */
+@Data
+public class DHUpVIASDataClassTabs implements Serializable {
+    @JSONField(name = "TabID")
+    private   String  tabID;
+    @JSONField(name = "TabName")
+    private   String  tabName;
+    @JSONField(name = "Description")
+    private   String  description;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DispositionObjectDto.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DispositionObjectDto.java
new file mode 100644
index 0000000..946e603
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/DispositionObjectDto.java
@@ -0,0 +1,170 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 大华布控请求
+ */
+@Data
+public class DispositionObjectDto  implements Serializable {
+    /**
+     * 布控id，【必填】 总共33位，前12位机构编码，其中1-6位为
+     * 省市县的行政区划代码；第7-12位为前六位所标识的公安机关的下辖机构，分为三层，每层编
+     * 码2位，00代表本级机构。13-14位为子类型编码，详细定义：01-布/撤控 ；02-告警 ；03-订
+     * 阅；04-通知 ；99-其它 ；15-28位为当前时间；最后5位为随机数。
+     */
+    @JSONField(name = "DispositionID")
+    private  String     DispositionID;
+    /**
+     * 布控标题，布控时【必填】
+     */
+    @JSONField(name = "Title")
+    private  String     Title;
+    /**
+     * 布控类别，人、机动车、非机动车、关键字、人脸等布
+     * 控时【必填】 详细定义见A10 布控类别（DispositionCategoryType）
+     */
+    @JSONField(name = "DispositionCategory")
+    private  int        DispositionCategory;
+    /**
+     * 布控对象特征 ，【选填】。
+     */
+    @JSONField(name = "TargetFeature")
+    private  String     TargetFeature;
+    /**
+     *布控对象图像，图像路径，以目标图像特征进行布控时使
+     * 用。【选填】
+     */
+    @JSONField(name = "TargetImageURI")
+    private  String     TargetImageURI;
+    /**
+     * 布控优先级 ，1-3 级，1 级最高，3 级最低。预警灵敏度越高，
+     * 则触发预警的相似度阈值越低，误报率越高。各厂商分析系统可根据预警灵敏度级别，设置布
+     * 控的相似度阈值。【选填】
+     */
+    @JSONField(name = "PriorityLevel")
+    private  int     PriorityLevel;
+    /**
+     *申请人 姓名 【必填】
+     */
+    @JSONField(name = "ApplicantName")
+    private  String     ApplicantName;
+    /**
+     * 申请人联系方式 【选填】
+     */
+    @JSONField(name = "ApplicantInfo")
+    private  String     ApplicantInfo;
+    /**
+     * 申请单位 【必填】
+     */
+    @JSONField(name = "ApplicantOrg")
+    private  String     ApplicantOrg;
+    /**
+     * 布控开始时间 【必填】
+     */
+    @JSONField(name = "BeginTime")
+    private  String     BeginTime;
+    /**
+     * 布控结束时间 【必填】
+     */
+    @JSONField(name = "EndTime")
+    private  String     EndTime;
+    /**
+     * : 创建时间，系统自动生成
+     */
+    @JSONField(name = "CreatTime")
+    private  String     CreatTime;
+    /**
+     *  布控操作类型 ,【必填】 0:布控；1：撤控
+     */
+    @JSONField(name = "OperateType")
+    private  int        OperateType;
+    /**
+     * 布控执行状态，0：布控中；1：已撤控；2：布控到期；9：
+     * 未布控。【选填】
+     */
+    @JSONField(name = "DispositionStatus")
+    private  int        DispositionStatus;
+    /**
+     * 布控范围，1:卡口；2：区域布控；3：设备。【必填】
+     */
+    @JSONField(name = "DispositionRange")
+    private  int        DispositionRange;
+    /**
+     * 布控卡口 ，DispositionRange为1时使用； 可带多个卡口ID，多个
+     * 以”;”间隔(英文半角分号)； 为空表示布控到所有卡口；
+     */
+    @JSONField(name = "TollgateList")
+    private  String     TollgateList;
+    /**
+     * 布控行政区代码，DispositionRange为2时使用；实际需要执行
+     * 布控的行政区域代码，县际联动填6位行政区号码（GB/T2260规定），地市联动填4位行政区
+     * 号码，省际联动填2位行政区号码，多个区域间以”;”间隔；为空表示布控到所有区域；
+     */
+    @JSONField(name = "DispositionArea")
+    private  String     DispositionArea;
+    /**
+     * 告警信息接收地址, 【必填】
+     */
+    @JSONField(name = "ReceiveAddr")
+    private  String     ReceiveAddr;
+    /**
+     * 告警信息接收手机号
+     */
+    @JSONField(name = "ReceiveMobile")
+    private  String     ReceiveMobile;
+    /**
+     * 布控原因
+     */
+    @JSONField(name = "Reason")
+    private  String     Reason;
+    /**
+     * 撤控单位名称
+     */
+    @JSONField(name = "DispositionRemoveOrg")
+    private  String     DispositionRemoveOrg;
+    /**
+     * 撤控人
+     */
+    @JSONField(name = "DispositionRemovePerson")
+    private  String     DispositionRemovePerson;
+    /**
+     * 撤控时间
+     */
+    @JSONField(name = "DispositionRemoveTime")
+    private  String     DispositionRemoveTime;
+    /**
+     * 撤控原因
+     */
+    @JSONField(name = "DispositionRemoveReason")
+    private  String     DispositionRemoveReason;
+    /**
+     * 图像列表 ，可以包含0个或者多个子图像对象实现单图片/多图布
+     * 控；一般用于单图布控，多图布控建议使用TabIDList
+     */
+    @JSONField(name = "SubImageList")
+    private List<Object> SubImageList;
+    /**
+     * 布控库id列表，库布控时【必填】，其他情况无需填写；可多值，此
+     * 时类型为string，多个值之间使用英文半角分号隔开
+     */
+    @JSONField(name = "TabIDList")
+    private String      TabIDList;
+    /**
+     *  布控设备，设备布控时使用。可对多个设备进行布控。携带多个设备
+     * ID时使用英文半角分号分隔；为空表示布控到当前行政区域所有设备
+     */
+    @JSONField(name = "DeviceList")
+    private String      DeviceList;
+    /**
+     * 预警灵敏度 ，预警灵敏度：1-3 级，1 级最高（相似度低于
+     * 70%），3 级最低（相似度大于等于90%）。预警灵敏度越高，则触发预警的相似度阈值越
+     * 低，误报率越高。各厂商分析系统可根据预警灵敏度级别，设置布控的相似度阈值 .【选填】
+     */
+    @JSONField(name = "AlarmSensitivity")
+    private int         AlarmSensitivity = 3;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/FaceObjectDTO.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/FaceObjectDTO.java
new file mode 100644
index 0000000..c6ec674
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/FaceObjectDTO.java
@@ -0,0 +1,100 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 向布控库中添加布控人员信
+ */
+@Data
+public class FaceObjectDTO  implements Serializable {
+    /**
+     * 类型 String ，总共48位，【必填】SourceID+06（人脸）+5位随机数
+     */
+    @JSONField(name = "FaceID")
+    private  String     FaceID;
+    /**
+     * 证件类型，【选填】，111-居民身份证;112114-军官证;123-警
+     * 官证;414-普通护照。
+     */
+    @JSONField(name ="IDType")
+    private  String     IDType;
+
+    /**
+     * ：类型 String 。有效证件号码；【必填】；
+     */
+    @JSONField(name = "IDNumber")
+    private  String     IDNumber;
+    /**
+     * 姓名
+     */
+    @JSONField(name = "Name")
+    private  String     Name;
+    /**
+     * 类型 String ，性别代码，【选填】 0-未知的性别;1-男性;2-女性;9-未说
+     * 明的性别。
+     */
+    @JSONField(name = "GenderCode")
+    private  String     GenderCode;
+    /**
+     * 归属分类标签，必填 1-20设备编码 21-22子类型编码【02-图像；03-文件；04 特
+     * 征值；05 人脸库；06 人员库；07 机动车库；08 非机动车库；09 物品库；10 场景库；99-其他】
+     * 23-36时间编码37-41序号。
+     */
+    @JSONField(name = "TabID")
+    private  String     TabID;
+
+    /**
+     * 所属市公安局代码
+     */
+    private  String     sssgajdm;
+
+    /**
+     * 图片信息
+      */
+    @JSONField(name = "SubImageList")
+    private Map<String,Object> SubImageList = new HashMap<>();
+
+
+
+    /**
+     * 图片信息
+     */
+    @Data
+    public  static class   SubImageInfoObject implements  Serializable{
+        /**
+         * 照片存储地址
+         */
+        /*
+        @JSONField(name = "StoragePath")
+        private     String      StoragePath;
+        */
+
+        @JSONField(name = "Data")
+        private     String      Data;
+        /**
+         * 人脸区域,LeftTopX；
+         */
+       // @JSONField(name = "LeftTopX")
+        //private     BigDecimal  LeftTopX;
+        /**
+         * 人脸区域,LeftTopY；
+         */
+       // @JSONField(name = "LeftTopY")
+       // private     BigDecimal  LeftTopY;
+        /**
+         * 人脸区域,RightBtmX；
+         */
+       // @JSONField(name = "RightBtmX")
+       // private     BigDecimal  RightBtmX;
+        /**
+         * 人脸区域,RightBtmY；
+         */
+      //  @JSONField(name = "RightBtmY")
+       // private     BigDecimal  RightBtmY;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/MotorVehicleObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/MotorVehicleObject.java
new file mode 100644
index 0000000..48c9f6a
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/MotorVehicleObject.java
@@ -0,0 +1,42 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 车辆布控库添加数据模型
+ */
+@Data
+public class MotorVehicleObject  implements Serializable {
+    /**
+     * 类型 String ，总共48位，【必填】SourceID+07（机动车）+5位
+     * 随机数。其中SourceID为来源图像信息标识，如大图ImageID，有关联大图时必填。
+     * 41位， DeviceID+02+当前时间（14位）+5位随机数
+     */
+    @JSONField(name = "MotorVehicleID")
+    private     String      MotorVehicleID;
+    /**
+     * 号牌种类【必填】 参考附录A15
+     */
+    @JSONField(name = "PlateClass")
+    private     String      PlateClass;
+    /**
+     * 车辆号牌【必填】
+     */
+    @JSONField(name = "PlateNo")
+    private     String      PlateNo;
+    /**
+     * 归属分类标签，必填 1-20设备编码 21-22子类型编码【02-图像；03-文件；04
+     * 特征值；05 人脸库；06 人员库；07 机动车库；08 非机动车库；09 物品库；10 场景
+     * 库；99-其他】23-36时间编码37-41序号。【必填】
+     */
+    @JSONField(name = "TabID")
+    private     String      TabID;
+    /**
+     * 所属市公安局代码
+     */
+    private  String     sssgajdm;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/ResponseStatusObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/ResponseStatusObject.java
new file mode 100644
index 0000000..a65ddf4
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/ResponseStatusObject.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import lombok.Data;
+
+/**
+ * 大华布控接口返回数据
+ */
+@Data
+public class ResponseStatusObject {
+    private         String      Id;
+    private         String      LocalTime;
+    private         String      RequestURL;
+    private         String      StatusCode;
+    private         String      StatusString;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/SubImageListDTO.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/SubImageListDTO.java
new file mode 100644
index 0000000..9951c56
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/dto/SubImageListDTO.java
@@ -0,0 +1,46 @@
+package com.mosty.bkzx.sjjs.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SubImageListDTO implements Serializable, Cloneable {
+    @JSONField(name = "SubImageInfoObject")
+    private List<SubImageInfoObjectDTO> subImageInfoObject;
+
+    @NoArgsConstructor
+    @Data
+    public static class SubImageInfoObjectDTO {
+
+        @ApiModelProperty(value = "存储路径 ,图像文件的存储路径，采用URI命名规则")
+//        @JSONField(name = "StoragePath") T区无法使用url 使用base64 用Data传
+        @JSONField(name = "Data")
+        private String storagePath;
+
+        @ApiModelProperty(value = "人脸区域,LeftTopX；")
+        @JSONField(name = "LeftTopX")
+        private Integer leftTopX;
+
+        @ApiModelProperty(value = "人脸区域,LeftTopY；")
+        @JSONField(name = "LeftTopY")
+        private Integer leftTopY;
+
+        @ApiModelProperty(value = "人脸区域,RightBtmX；")
+        @JSONField(name = "RightBtmX")
+        private Integer rightBtmX;
+
+        @ApiModelProperty(value = "人脸区域,RightBtmY；")
+        @JSONField(name = "RightBtmY")
+        private Integer rightBtmY;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/DataClassTabObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/DataClassTabObject.java
new file mode 100644
index 0000000..966ce37
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/DataClassTabObject.java
@@ -0,0 +1,42 @@
+package com.mosty.bkzx.sjjs.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "创建人脸布控库对象", description = "创建人脸布控库对象")
+public class DataClassTabObject implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+
+    /**
+     * 通道国标id（20位），组成为：省级编号（2位）+市级编号（2位）
+     * +区级编号（2位）+基层接入单位编号（2位）+行业编码（2位）+设备类型编码
+     * （3位）+网络标识（1位）+设备、用户序号（6位）,
+     */
+    @ApiModelProperty(value = "标签标识，库ID，总共41位。字段规则由20位设备 国标编码+人脸库（05）+14位当前时间+5位随机数")
+    @JSONField(name = "TabID")
+    private String TabID;
+
+    @ApiModelProperty(value = "标签名称")
+    @JSONField(name = "TabName")
+    private String TabName;
+
+    @ApiModelProperty(value = "标签描述")
+    @JSONField(name = "Description")
+    private String Description;
+
+    @ApiModelProperty(value = "null则默认为人像库新增 1、四位表示，第1位同TabID的第22位，表示一级分类。第2位表示二级分类。第3-4位表示三级分类。 5100：静态人脸 5200：抓拍人脸 ，5300：布控人脸 ，7300：布控车牌 ；2、静态库人脸不支持用于布控")
+    @JSONField(name = "TabType")
+    private String TabType;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Dispositions.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Dispositions.java
new file mode 100644
index 0000000..e8fedba
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Dispositions.java
@@ -0,0 +1,148 @@
+package com.mosty.bkzx.sjjs.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.mosty.bkzx.sjjs.dto.SubImageListDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "创建布控对象", description = "创建布控对象")
+public class Dispositions implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+    @ApiModelProperty(value = "布控id，【必填】 总共33位，前12位机构编码，其中1-6位为省市县的行政区划代码；第7-12位为前六位所标识的公安机关的下辖机构，分为三层，每层编码2位，00代表本级机构。13-14位为子类型编码，详细定义：01-布/撤控 ；02-告警；03-订阅；04-通知；99-其它 ；15-28位为当前时间；最后5位为随机数。")
+    @JSONField(name = "DispositionID")
+    private String dispositionID;
+
+    @ApiModelProperty(value = "布控标题，布控时【必填】")
+    @JSONField(name = "Title")
+    private String title;
+
+    @ApiModelProperty(value = "布控类别，人、机动车、非机动车、关键字、人脸等布控时【必填】 详细定义见A10 布控类别（DispositionCategoryType）")
+    @JSONField(name = "DispositionCategory")
+    private Integer dispositionCategory;
+
+    @ApiModelProperty(value = "布控对象特征 ，【选填】。")
+    @JSONField(name = "TargetFeature")
+    private String targetFeature;
+
+    @ApiModelProperty(value = "布控对象图像，图像路径，以目标图像特征进行布控时使用。【选填】")
+    @JSONField(name = "TargetImageURI")
+    private Object targetImageURI;
+
+    @ApiModelProperty(value = "布控优先级 ，1-3 级，1 级最高，3 级最低。预警灵敏度越高，则触发预警的相似度阈值越低，误报率越高。各厂商分析系统可根据预警灵敏度级别，设置布控的相似度阈值。【选填】")
+    @JSONField(name = "PriorityLevel")
+    private Integer priorityLevel;
+
+    @ApiModelProperty(value = "：申请人 姓名 【必填】")
+    @JSONField(name = "ApplicantName")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请人联系方式 【选填】")
+    @JSONField(name = "ApplicantInfo")
+    private Object applicantInfo;
+
+    @ApiModelProperty(value = "申请单位 【必填】")
+    @JSONField(name = "ApplicantOrg")
+    private String applicantOrg;
+
+    @ApiModelProperty(value = "布控开始时间 【必填】")
+    @JSONField(name = "BeginTime")
+    private String beginTime;
+
+    @ApiModelProperty(value = "布控结束时间 【必填】")
+    @JSONField(name = "EndTime")
+    private String endTime;
+
+    @ApiModelProperty(value = "创建时间，系统自动生成")
+    @JSONField(name = "CreatTime")
+    private String creatTime;
+
+    @ApiModelProperty(value = " 布控操作类型 ,【必填】 0:布控；1：撤控")
+    @JSONField(name = "OperateType")
+    private Integer operateType;
+
+    @ApiModelProperty(value = "布控执行状态，0：布控中；1：已撤控；2：布控到期；9：未布控。【选填】")
+    @JSONField(name = "DispositionStatus")
+    private Integer dispositionStatus;
+
+    @ApiModelProperty(value = "布控范围，1:卡口；2：区域布控；3：设备。【必填】")
+    @JSONField(name = "DispositionRange")
+    private Integer dispositionRange;
+
+    @ApiModelProperty(value = "布控卡口 ，DispositionRange为1时使用； 可带多个卡口ID，多个以”;”间隔(英文半角分号)； 为空表示布控到所有卡口；")
+    @JSONField(name = "TollgateList")
+    private Object tollgateList;
+
+    @ApiModelProperty(value = "布控行政区代码，DispositionRange为2时使用；实际需要执行布控的行政区域代码，县际联动填6位行政区号码（GB/T2260规定），地市联动填4位行政区号码，省际联动填2位行政区号码，多个区域间以”;”间隔；为空表示布控到所有区域；")
+    @JSONField(name = "DispositionArea")
+    private Object dispositionArea;
+
+    @ApiModelProperty(value = " 告警信息接收地址, 【必填】")
+    @JSONField(name = "ReceiveAddr")
+    private String receiveAddr;
+
+    @ApiModelProperty(value = "告警信息接收手机号")
+    @JSONField(name = "ReceiveMobile")
+    private String receiveMobile;
+
+    @ApiModelProperty(value = "布控原因")
+    @JSONField(name = "Reason")
+    private String reason;
+
+    @ApiModelProperty(value = "撤控单位名称")
+    @JSONField(name = "DispositionRemoveOrg")
+    private String dispositionRemoveOrg;
+
+    @ApiModelProperty(value = "撤控人")
+    @JSONField(name = "DispositionRemovePerson")
+    private String dispositionRemovePerson;
+
+    @ApiModelProperty(value = "撤控时间")
+    @JSONField(name = "DispositionRemoveTime")
+    private String dispositionRemoveTime;
+
+    @ApiModelProperty(value = "撤控原因")
+    @JSONField(name = "DispositionRemoveReason")
+    private String dispositionRemoveReason;
+
+    @ApiModelProperty(value = "图像列表 ，可以包含0个或者多个子图像对象实现单图片/多图布控；一般用于单图布控，多图布控建议使用TabIDList")
+    @JSONField(name = "SubImageList")
+    private SubImageListDTO subImageList;
+
+    @ApiModelProperty(value = " 布控库id列表，库布控时【必填】，其他情况无需填写；可多值，此时类型为string，多个值之间使用英文半角分号隔开")
+    @JSONField(name = "TabIDList")
+    private String tabIDList;
+
+    @ApiModelProperty(value = " 布控设备，设备布控时使用。可对多个设备进行布控。携带多个设备ID时使用英文半角分号分隔；为空表示布控到当前行政区域所有设备")
+    @JSONField(name = "DeviceList")
+    private String deviceList;
+
+    @ApiModelProperty(value = "特征")
+    @JSONField(name = "FeatureObject")
+    private Object featureObject;
+
+    @ApiModelProperty(value = "结果图像声明")
+    @JSONField(name = "ResultImageDeclare")
+    private Object resultImageDeclare;
+
+    @ApiModelProperty(value = "结果特征声明")
+    @JSONField(name = "ResultFeatureDeclare")
+    private Object resultFeatureDeclare;
+
+    @ApiModelProperty(value = "布控库ID")
+    @JSONField(name = "TabID")
+    private String tabID;
+
+    @ApiModelProperty(value = "预警灵敏度 ，预警灵敏度：1-3 级，1 级最高（相似度低于70低，误报率越高。各厂商分析系统可根据预警灵敏度级别，设置布控的相似度阈值 .【选填】")
+    @JSONField(name = "AlarmSensitivity")
+    private Integer alarmSensitivity;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Face.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Face.java
new file mode 100644
index 0000000..73a10f1
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/Face.java
@@ -0,0 +1,48 @@
+package com.mosty.bkzx.sjjs.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mosty.bkzx.sjjs.dto.SubImageListDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "人脸布控库对象", description = "人脸布控库对象")
+public class Face {
+
+    @ApiModelProperty(value = "总共48位，【必填】SourceID+06（人脸）+5位随机数。其中SourceID为来源图像信息标识，如大图ImageID，有关联大图时必填。41位， DeviceID+02+当前时间（14位）+5位随机数，")
+    @JSONField(name = "FaceID")
+    private String faceID;
+
+    @ApiModelProperty(value = "证件类型，111-居民身份证;112114-军官证;123-警官证;414-普通护照。")
+    @JSONField(name = "IDType")
+    private String iDType;
+
+    @ApiModelProperty(value = "有效证件号码；")
+    @JSONField(name = "IDNumber")
+    private String iDNumber;
+
+    @ApiModelProperty(value = "人员的中文姓名全称")
+    @JSONField(name = "Name")
+    private String name;
+
+    @ApiModelProperty(value = "性别代码，【选填】 0-未知的性别;1-男性;2-女性;9-未说明的性别")
+    @JSONField(name = "GenderCode")
+    private String genderCode;
+
+    @ApiModelProperty(value = "存储路径 ,图像文件的存储路径，采用URI命名规则")
+    @JSONField(name = "SubImageList")
+    private SubImageListDTO subImageList;
+
+    @ApiModelProperty(value = "归属分类标签，必填 1-20设备编码 21-22子类型编码【02-图像；03-文件；04 特 征值；05 人脸库；06 人员库；07 机动车库；08 非机动车库；09 物品库；10 场景库；99-其他】23-36时间编码37-41序号")
+    @JSONField(name = "TabID")
+    private String tabID;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/FaceObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/FaceObject.java
new file mode 100644
index 0000000..61f1218
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/FaceObject.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.sjjs.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "创建人脸布控库对象", description = "创建人脸布控库对象")
+public class FaceObject {
+
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/MotorVehic.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/MotorVehic.java
new file mode 100644
index 0000000..66f4051
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/entity/MotorVehic.java
@@ -0,0 +1,36 @@
+package com.mosty.bkzx.sjjs.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "车辆布控库对象", description = "车辆布控库对象")
+public class MotorVehic implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+    @ApiModelProperty(value = "总共48位，【必填】SourceID+07（机动车）+5位随机数。其中SourceID为来源图像信息标识，如大图ImageID，有关联大图时必填。41位， DeviceID+02+当前时间（14位）+5位随机数")
+    @JSONField(name = "MotorVehicleID")
+    private String motorVehicleID;
+
+    @ApiModelProperty(value = "号牌种类【必填】")
+    @JSONField(name = "PlateClass")
+    private String plateClass;
+
+    @ApiModelProperty(value = "车辆号牌【必填】")
+    @JSONField(name = "PlateNo")
+    private String plateNo;
+
+    @ApiModelProperty(value = "归属分类标签，必填 1-20设备编码 21-22子类型编码【02-图像；03-文件；04 特 征值；05 人脸库；06 人员库；07 机动车库；08 非机动车库；09 物品库；10 场景库；99-其他】23-36时间编码37-41序号")
+    @JSONField(name = "TabID")
+    private String tabID;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHDataTypeEnum.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHDataTypeEnum.java
new file mode 100644
index 0000000..1aaafdf
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHDataTypeEnum.java
@@ -0,0 +1,17 @@
+package com.mosty.bkzx.sjjs.enums;
+
+import lombok.Getter;
+
+import java.io.Serializable;
+
+/**
+ * 大华数据类型枚举
+ */
+@Getter
+public enum DHDataTypeEnum implements Serializable {
+    DB, //数据库
+    PERSONFACE, //人脸数据
+    CAR,    //车辆数据
+    BKDB,   //数据库布控数据类型
+    ;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHOperateTypeENum.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHOperateTypeENum.java
new file mode 100644
index 0000000..6f9b351
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/enums/DHOperateTypeENum.java
@@ -0,0 +1,15 @@
+package com.mosty.bkzx.sjjs.enums;
+
+import lombok.Getter;
+
+import java.io.Serializable;
+
+/**
+ * 数据操作类型
+ */
+@Getter
+public enum DHOperateTypeENum implements Serializable {
+    Add,
+    Update,
+    Delete;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeOneVo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeOneVo.java
new file mode 100644
index 0000000..535f87d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeOneVo.java
@@ -0,0 +1,35 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 登陆第一次交互返回内容 视觉计算
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "登陆第一次交互返回内容对象", description = "登陆第一次交互返回内容对象")
+public class AuthorizeOneVo implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+
+    @ApiModelProperty(value = "域信息，加密过程使用")
+    private String realm;
+
+    @ApiModelProperty(value = "随机密钥种子")
+    private String randomKey;
+
+    @ApiModelProperty(value = "加密算法")
+    private String encryptType;
+
+    @ApiModelProperty(value = "使用哪种加密流程。没有该字段，按通用加密流程计算，\"simple\"表示按简易加密流程计算")
+    private String method;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeTwoVo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeTwoVo.java
new file mode 100644
index 0000000..086316f
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/AuthorizeTwoVo.java
@@ -0,0 +1,41 @@
+package com.mosty.bkzx.sjjs.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ *  视觉计算 登陆第一次交互返回内容对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "登陆第二次交互返回内容对象", description = "登陆第二次交互返回内容对象")
+public class AuthorizeTwoVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+    @ApiModelProperty(value = "有效时间，由服务端指定，单位秒，建议3/4 duration时就进行会话更新")
+    private int duration;
+
+    @ApiModelProperty(value = "返回登陆令牌，令牌字符串由服务端发布。之后的其它请求，在HTTP头的 X-Subject-Token: 带上这个令牌进行鉴权")
+    private String token;
+
+    @ApiModelProperty(value = "创建该会话的用户名")
+    private String userName;
+
+    @ApiModelProperty(value = "用户名对应的用户Id，如果需要对该用户信息进行修改，使用用户Id")
+    private String userId;
+
+    @ApiModelProperty(value = "上次登陆的IP")
+    private String lastLoginIp;
+
+    @ApiModelProperty(value = "视频云版本")
+    private String version;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/CustomInfoVo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/CustomInfoVo.java
new file mode 100644
index 0000000..2e670c4
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/CustomInfoVo.java
@@ -0,0 +1,38 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "图像识别返回人员列表", description = "图像识别返回人员列表")
+public class CustomInfoVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    @ApiModelProperty(value = "人员身份证号")
+    private String sfzh;
+
+    @ApiModelProperty(value = "人员出身日期")
+    private String csrq;
+
+    @ApiModelProperty(value = "人员性别代码")
+    private String xbdm;
+
+    @ApiModelProperty(value = "人员姓名")
+    private String xm;
+
+    @ApiModelProperty(value = "人员照片ID")
+    private String xp;
+
+    @ApiModelProperty(value = "相似度")
+    private double xsd;
+
+    @ApiModelProperty(value = "人员照片URL")
+    private String filePath;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObject.java
new file mode 100644
index 0000000..e68ff7f
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObject.java
@@ -0,0 +1,23 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FaceObject implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private String IDNumber;
+
+    private String Name;
+
+    private double Similarity;
+
+    private SubImageList SubImageList;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectList.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectList.java
new file mode 100644
index 0000000..eb6d5c8
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectList.java
@@ -0,0 +1,31 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "登陆第一次交互返回内容对象", description = "登陆第一次交互返回内容对象")
+public class FaceObjectList implements Serializable,Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private List<FaceObject> FaceObject;
+
+    public FaceObjectList(List<FaceObject> faceObject) {
+        FaceObject = faceObject;
+    }
+
+    public List<FaceObject> getFaceObject() {
+        return FaceObject;
+    }
+
+    public void setFaceObject(List<FaceObject> faceObject) {
+        FaceObject = faceObject;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectVo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectVo.java
new file mode 100644
index 0000000..68f0fab
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceObjectVo.java
@@ -0,0 +1,21 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FaceObjectVo implements Serializable,Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private String IDNumber;
+    private String Name;
+    private double Similarity;
+
+    private SubImageList SubImageList;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FacePicture.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FacePicture.java
new file mode 100644
index 0000000..cb9e03f
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FacePicture.java
@@ -0,0 +1,32 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FacePicture implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 图片类型（0、base64，1、url）
+     */
+    private int type;
+
+    /**
+     *人俩图片base64（type为0时必填）
+     */
+    private String data;
+
+
+    /**
+     *人俩图片url（type为1时必填）
+     */
+    private String url;
+
+};
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepository.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepository.java
new file mode 100644
index 0000000..2a20853
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepository.java
@@ -0,0 +1,34 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 图像采集列表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "图像采集列表", description = "图像采集列表")
+public class FaceRepository implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人像库名称")
+    private String name;
+
+    @ApiModelProperty(value = "人像库类型(默认黑名单0)")
+    private int type;
+
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+    @ApiModelProperty(value = "用户自定义库等级（如：1-A，2-B）")
+    private String rank;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryInfo.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryInfo.java
new file mode 100644
index 0000000..d3957e7
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryInfo.java
@@ -0,0 +1,81 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 图像采集列表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "图像采集列表", description = "图像采集列表")
+public class FaceRepositoryInfo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 库ID
+     */
+    @ApiModelProperty(value = "库ID")
+    private String id;
+
+    /**
+     * 人像库名称
+     */
+    @ApiModelProperty(value = "人像库名称")
+    private String name;
+
+    /**
+     * 人像库类型(默认黑名单0)
+     */
+    @ApiModelProperty(value = "人像库类型(默认黑名单0)")
+    private int type;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String memo;
+
+    /**
+     * 用户自定义库等级（如：1-A，2-B）
+     */
+    @ApiModelProperty(value = "用户自定义库等级（如：1-A，2-B）")
+    private String rank;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    /**
+     * 修改
+     */
+    @ApiModelProperty(value = "修改")
+    private String updateTime;
+
+    /**
+     * 库中图片数目
+     */
+    @ApiModelProperty(value = "库中图片数目")
+    private String totalPictureCount;
+
+    /**
+     * 库中人脸数目
+     */
+    @ApiModelProperty(value = "库中人脸数目")
+    private String faceImageCount;
+
+    /**
+     * 入库失败数目
+     */
+    @ApiModelProperty(value = "入库失败数目")
+    private String failedPictureCount;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryUser.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryUser.java
new file mode 100644
index 0000000..7cfb47d
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/FaceRepositoryUser.java
@@ -0,0 +1,81 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FaceRepositoryUser implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 库ID
+     */
+    @ApiModelProperty(value = "库ID")
+    private String repositoryId;
+
+    /**
+     * 证件类型（111、身份证，114、军官证，123、警察证，414、普通护照，0、其他）
+     */
+    @ApiModelProperty(value = "证件类型（111、身份证，114、军官证，123、警察证，414、普通护照，0、其他）")
+    private int type;
+
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty(value = "证件号码")
+    private String identificationId;
+
+    /**
+     * 成员姓名
+     */
+    @ApiModelProperty(value = "成员姓名")
+    private String name;
+
+    /**
+     * 区域编号
+     */
+    @ApiModelProperty(value = "区域编号")
+    private String region;
+
+    /**
+     * 民族
+     */
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    /**
+     * 成员性别（0-未知，1-男，2-女）
+     */
+    @ApiModelProperty(value = "成员性别（0-未知，1-男，2-女）")
+    private String gender;
+
+    /**
+     * 电话
+     */
+    @ApiModelProperty(value = "电话")
+    private String phone;
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址")
+    private String address;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String memo;
+    /**
+     * 人脸图片
+     */
+    @ApiModelProperty(value = "人脸图片")
+    private FacePicture facePicture;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/ImageList.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/ImageList.java
new file mode 100644
index 0000000..ee8c587
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/ImageList.java
@@ -0,0 +1,43 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 图像采集列表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ImageList implements Serializable,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 图像采集对象（数组）
+     */
+    @ApiModelProperty(value = "图像采集对象（数组）")
+    private List<SubImageInfoObject> SubImageInfoObject;
+
+    public ImageList(List<SubImageInfoObject> subImageInfoObject) {
+        SubImageInfoObject = subImageInfoObject;
+    }
+
+    public ImageList() {
+    }
+
+    @JSONField(name = "SubImageInfoObject")
+    public List<SubImageInfoObject> getSubImageInfoListObject() {
+        return SubImageInfoObject;
+    }
+
+    public void setSubImageInfoListObject(List<SubImageInfoObject> SubImageInfoObject) {
+        SubImageInfoObject = SubImageInfoObject;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentify.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentify.java
new file mode 100644
index 0000000..8d8af12
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentify.java
@@ -0,0 +1,32 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PersonIdentify implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    /**
+     * 返回结果对应请求消息的QueryID
+     */
+    @ApiModelProperty(value = "返回结果对应请求消息的QueryID")
+    private String QueryID;
+    /**
+     * 符合条件记录总数
+     */
+    @ApiModelProperty(value = "符合条件记录总数")
+    private int TotalNum;
+
+    /**
+     * 结果人脸对象列表，相似度倒序排序
+     */
+    @ApiModelProperty(value = "结果人脸对象列表，相似度倒序排序")
+    private FaceObjectList FaceObjectList;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyObject.java
new file mode 100644
index 0000000..d9c4844
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyObject.java
@@ -0,0 +1,213 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PersonIdentifyObject implements Serializable,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  图像检索目标ID
+     */
+    private String QueryID;
+
+    /**
+     * 最大返回数量
+     */
+    private int MaxNumRecordReturn;
+
+    /**
+     * 图像列表
+     */
+    private ImageList ImageList;
+
+    /**
+     * 归属分类标签
+     */
+    private String TabIDList;
+
+    /**
+     * 算法标识
+     */
+    private String AlgorithmID;
+
+    /**
+     * 相似度
+     */
+    private double Threshold;
+
+    /**
+     * 设备Mac地址
+     */
+    private String ReqDeviceID;
+
+    /**
+     * 请求业务类型（01、轨迹查询，02、分析服务，03、身份核验，04、其他）
+     */
+    private String BusinessType;
+
+    /**
+     * 业务ID
+     */
+    private String BusinessID;
+
+    /**
+     * 警种(01、科信，02、邢侦，03、治安，04、情报，05、反恐，06、国保，07、禁毒，
+     * 08、特勤，09、经侦，10、铁路公安，11、网安，12、监所，13、警务保障，14、交通管理，15、海关，16、民航，99、其他)
+     */
+    private String Category;
+
+    /**
+     * 业务使用场景(01、总重大活动，02、反恐维稳，03、刑侦破案，04、社会民生，05、疫情防控，99、其他)
+     */
+    private String BusinessScene;
+
+    /**
+     * 业务请求人姓名
+     */
+    private String ReqUserName;
+
+    /**
+     * 业务请求人身份证号码
+     */
+    private String ReqUserIDNo;
+
+    /**
+     * 业务请求人编号，民警数字证书编号或者警员编号
+     */
+    private String ReqUserID;
+
+    @JSONField(name = "QueryID")
+    public String getQueryID() {
+        return QueryID;
+    }
+
+    public void setQueryID(String queryID) {
+        QueryID = queryID;
+    }
+
+    @JSONField(name = "MaxNumRecordReturn")
+    public int getMaxNumRecordReturn() {
+        return MaxNumRecordReturn;
+    }
+
+    public void setMaxNumRecordReturn(int maxNumRecordReturn) {
+        MaxNumRecordReturn = maxNumRecordReturn;
+    }
+
+    @JSONField(name = "ImageList")
+    public ImageList getImageList() {
+        return ImageList;
+    }
+
+    public void setImageList(ImageList imageList) {
+        ImageList = imageList;
+    }
+
+    @JSONField(name = "TabIDList")
+    public String getTabIDList() {
+        return TabIDList;
+    }
+
+    public void setTabIDList(String tabIDList) {
+        TabIDList = tabIDList;
+    }
+
+    @JSONField(name = "Threshold")
+    public double getThreshold() {
+        return Threshold;
+    }
+
+    public void setThreshold(double threshold) {
+        Threshold = threshold;
+    }
+
+    @JSONField(name = "ReqDeviceID")
+    public String getReqDeviceID() {
+        return ReqDeviceID;
+    }
+
+    public void setReqDeviceID(String reqDeviceID) {
+        ReqDeviceID = reqDeviceID;
+    }
+
+    @JSONField(name = "BusinessType")
+    public String getBusinessType() {
+        return BusinessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        BusinessType = businessType;
+    }
+
+    @JSONField(name = "BusinessID")
+    public String getBusinessID() {
+        return BusinessID;
+    }
+
+    public void setBusinessID(String businessID) {
+        BusinessID = businessID;
+    }
+
+    @JSONField(name = "Category")
+    public String getCategory() {
+        return Category;
+    }
+
+    public void setCategory(String category) {
+        Category = category;
+    }
+
+    @JSONField(name = "BusinessScene")
+    public String getBusinessScene() {
+        return BusinessScene;
+    }
+
+    public void setBusinessScene(String businessScene) {
+        BusinessScene = businessScene;
+    }
+
+    @JSONField(name = "ReqUserName")
+    public String getReqUserName() {
+        return ReqUserName;
+    }
+
+    public void setReqUserName(String reqUserName) {
+        ReqUserName = reqUserName;
+    }
+
+    @JSONField(name = "ReqUserIDNo")
+    public String getReqUserIDNo() {
+        return ReqUserIDNo;
+    }
+
+    public void setReqUserIDNo(String reqUserIDNo) {
+        ReqUserIDNo = reqUserIDNo;
+    }
+
+    @JSONField(name = "ReqUserID")
+    public String getReqUserID() {
+        return ReqUserID;
+    }
+
+    public void setReqUserID(String reqUserID) {
+        ReqUserID = reqUserID;
+    }
+
+    @JSONField(name = "AlgorithmID")
+    public String getAlgorithmID() {
+        return AlgorithmID;
+    }
+
+    public void setAlgorithmID(String algorithmID) {
+        AlgorithmID = algorithmID;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyResultObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyResultObject.java
new file mode 100644
index 0000000..97b9adf
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/PersonIdentifyResultObject.java
@@ -0,0 +1,24 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PersonIdentifyResultObject implements Serializable,Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private PersonIdentify PersonIdentifyResultObject;
+
+    public PersonIdentify getPersonIdentifyResultObject() {
+        return PersonIdentifyResultObject;
+    }
+
+    public void setPersonIdentifyResultObject(PersonIdentify personIdentifyResultObject) {
+        PersonIdentifyResultObject = personIdentifyResultObject;
+    }
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/RepositoryUser.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/RepositoryUser.java
new file mode 100644
index 0000000..d0c5b8e
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/RepositoryUser.java
@@ -0,0 +1,97 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 登陆第一次交互返回内容
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RepositoryUser implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+    /**
+     * 库成员ID
+     */
+    private String faceImgId;
+    /**
+     * 人脸图片URL
+     */
+    private String faceImgUrl;
+    /**
+     * 库ID
+     */
+    private String repositoryId;
+    /**
+     * 库名字
+     */
+    private String repositoryName;
+    /**
+     * 证件类型
+     */
+    private int type;
+    /**
+     * 证件号码
+     */
+    private String identificationId;
+    /**
+     * 成员姓名
+     */
+    private String name;
+    /**
+     * 区域编号
+     */
+    private int region;
+    /**
+     * 民族
+     */
+    private int nation;
+    /**
+     * 出生日期，格式为YYYY-mm-dd
+     */
+    private String birthday;
+    /**
+     * 成员性别，0-未知，1-男，2-女
+     */
+    private int gender;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 备注
+     */
+    private String memo;
+    /**
+     * 人脸大图URL
+     */
+    private String imgUrl;
+    /**
+     * 相似度，取值范围[0-1]
+     */
+    private double similarity;
+    /**
+     * 该人员的创建时间，毫秒时间戳。
+     */
+    private long createTime;
+    /**
+     * 该人员的更新时间，毫秒时间戳。
+     */
+    private long updateTime;
+    /**
+     * 1-当天新增，2-当天更新，0-其他
+     */
+    private int isNew;
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageInfoObject.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageInfoObject.java
new file mode 100644
index 0000000..bc3d6d3
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageInfoObject.java
@@ -0,0 +1,18 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SubImageInfoObject implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private String StoragePath;
+    private String Type;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageList.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageList.java
new file mode 100644
index 0000000..f5a47fd
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/SubImageList.java
@@ -0,0 +1,23 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SubImageList implements Serializable,Cloneable {
+    private static final long serialVersionUID = 1l;
+
+    private List<SubImageInfoObject> SubImageInfoObject;
+
+    public SubImageList(List<SubImageInfoObject> subImageInfoObject) {
+        SubImageInfoObject = subImageInfoObject;
+    }
+
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/VehicleCar.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/VehicleCar.java
new file mode 100644
index 0000000..ced6d9e
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/sjjs/vo/VehicleCar.java
@@ -0,0 +1,106 @@
+package com.mosty.bkzx.sjjs.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+/**
+ * 图像列表
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class VehicleCar implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1l;
+
+    /**
+     * 布控类型，如果不填，审核布控操作会失败(必填)
+     * 100801 假/套牌车  100802 涉案车辆  100803 其他车辆
+     */
+    private short surveyType;
+    /**
+     * 车牌号码，暂不支持模糊匹配（勾选无牌车时，plateNum传值八个0 "00000000"）
+     */
+    private String plateNum;
+    /**
+     * 号牌种类
+     */
+    private String plateType;
+    /**
+     * 布控开始时间
+     */
+    private String startTimeStr;
+    /**
+     * 布控结束时间
+     */
+    private String endTimeStr;
+    /**
+     * 过车开始时间(UTC时间),若startTimeStrUtc有值，则startTimeStr无效
+     */
+    private String startTimeStrUtc;
+    /**
+     * 过车结束时间(UTC时间),若有endTimeStrUtc有值，则endTimeStr无效。
+     */
+    private String endTimeStrUtc;
+    /**
+     * 布控原因,最大128字节
+     */
+    private String reason;
+    /**
+     * 类型array[string]，选填。报警号码，数组。
+     */
+    private ArrayList<String> tels;
+    /**
+     * 布控类型,选填
+     */
+    private String surveyCategory;
+    /**
+     * 布控名称
+     */
+    private String surveyTaskName;
+    /**
+     * 库管理的唯一编码。
+     */
+    private ArrayList<String>  libRecordIds;
+    /**
+     * 通道数组
+     */
+    private ArrayList<String>  channelCodes;
+    /**
+     * greater表示大于，less表示小于，equal表示等于
+     */
+    private String paperSign;
+    /**
+     * 摆件个数，与paperSign同有同无
+     */
+    private int paperCnt;
+    /**
+     * 挂件符号：greater表示大于，less表示小于，equal表示等于
+     */
+    private String dropSign;
+    /**
+     * 挂件个数，与dropSign同有同无
+     */
+    private int dropCnt;
+    /**
+     * 年检标符号：greater表示大于，less表示小于，equal表示等于。
+     */
+    private String tagSign;
+    /**
+     * 年检标个数，与tagSign同有同无
+     */
+    private int tagCnt;
+    /**
+     * 遮阳板符号：greater表示大于，less表示小于，equal表示等于
+     */
+    private String sunSign;
+    /**
+     * 遮阳板个数，与sunSign同有同无。
+     */
+    private int sunCnt;
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/MD5Util.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/MD5Util.java
new file mode 100644
index 0000000..ebc6e72
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/MD5Util.java
@@ -0,0 +1,162 @@
+package com.mosty.bkzx.utlis;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * @ClassName MD5Util
+ * @Description MD5工具类
+ */
+public class MD5Util {
+
+
+    static final char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+    static final char hexDigitsLower[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * @param plainText 传入要加密的字符串
+     * @return java.lang.String MD5加密后生成32位(小写字母+数字)字符串
+     * @Description //对字符串 MD5 无盐值加密
+     */
+    public static String MD5Lower(String plainText) {
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            // 使用指定的字节更新摘要
+            md.update(plainText.getBytes());
+
+            // digest()最后确定返回md5 hash值，返回值为8位字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符
+            // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值。1 固定值
+            return new BigInteger(1, md.digest()).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    /**
+     * @param plainText 传入要加密的字符串
+     * @return java.lang.String MD5加密后生成32位(大写字母+数字)字符串
+     * @Description // 对字符串 MD5 加密
+     */
+    public static String MD5Upper(String plainText) {
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            // 使用指定的字节更新摘要
+            md.update(plainText.getBytes());
+
+            // 获得密文
+            byte[] mdResult = md.digest();
+            // 把密文转换成十六进制的字符串形式
+            int j = mdResult.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = mdResult[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];// 取字节中高 4 位的数字转换, >>> 为逻辑右移，将符号位一起右移
+                str[k++] = hexDigits[byte0 & 0xf]; // 取字节中低 4 位的数字转换
+            }
+            return new String(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * @param plainText 传入要加密的字符串
+     * @param saltValue 传入要加的盐值
+     * @return java.lang.String MD5加密后生成32位(小写字母+数字)字符串
+     * @Description //对字符串 MD5 加盐值加密
+     */
+    public static String MD5Lower(String plainText, String saltValue) {
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            // 使用指定的字节更新摘要
+            md.update(plainText.getBytes());
+            md.update(saltValue.getBytes());
+
+            // digest()最后确定返回md5 hash值，返回值为8位字符串。因为md5 hash值是16位的hex值，实际上就是8位的字符
+            // BigInteger函数则将8位的字符串转换成16位hex值，用字符串来表示；得到字符串形式的hash值。1 固定值
+            return new BigInteger(1, md.digest()).toString(16);
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * @param plainText 传入要加密的字符串
+     * @param saltValue 传入要加的盐值
+     * @return java.lang.String MD5加密后生成32位(大写字母+数字)字符串
+     * @Description //对字符串 MD5 加盐值加密
+     */
+    public static String MD5Upper(String plainText, String saltValue) {
+        try {
+            // 获得MD5摘要算法的 MessageDigest 对象
+            MessageDigest md = MessageDigest.getInstance("MD5");
+
+            // 使用指定的字节更新摘要
+            md.update(plainText.getBytes());
+            md.update(saltValue.getBytes());
+
+            // 获得密文
+            byte[] mdResult = md.digest();
+            // 把密文转换成十六进制的字符串形式
+            int j = mdResult.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = mdResult[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * @param plainText
+     * @return java.lang.String
+     * @Description //MD5加密后生成32位(小写字母+数字)字符串，同 MD5Lower() 一样
+     */
+    public final static String MD5(String plainText) {
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(plainText.getBytes("UTF-8"));
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = hexDigitsLower[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigitsLower[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * @param text 要校验的字符串
+     * @param md5  md5值
+     * @return boolean 校验结果
+     * @Description //校验MD5码
+     */
+    public static boolean valid(String text, String md5) {
+        return md5.equals(MD5(text)) || md5.equals(MD5(text).toUpperCase());
+    }
+
+}
diff --git a/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/OkHttpUtils.java b/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/OkHttpUtils.java
new file mode 100644
index 0000000..f122ca1
--- /dev/null
+++ b/mosty-bkzx/src/main/java/com/mosty/bkzx/utlis/OkHttpUtils.java
@@ -0,0 +1,389 @@
+package com.mosty.bkzx.utlis;
+
+import com.alibaba.fastjson.JSON;
+import okhttp3.*;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+public class OkHttpUtils {
+    private static volatile OkHttpClient okHttpClient = null;
+    private static volatile Semaphore semaphore = null;
+    private Map<String, String> headerMap;
+    private Map<String, Object> paramMap;
+    private String url;
+    private Request.Builder request;
+
+    /**
+     * 初始化okHttpClient，并且允许https访问
+     */
+    private OkHttpUtils() {
+        if (okHttpClient == null) {
+            synchronized (OkHttpUtils.class) {
+                if (okHttpClient == null) {
+                    TrustManager[] trustManagers = buildTrustManagers();
+                    okHttpClient = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS).readTimeout(20, TimeUnit.SECONDS).sslSocketFactory(createSSLSocketFactory(trustManagers), (X509TrustManager) trustManagers[0]).hostnameVerifier((hostName, session) -> true).retryOnConnectionFailure(true).build();
+                    addHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+                }
+            }
+        }
+    }
+
+    /**
+     * 用于异步请求时，控制访问线程数，返回结果
+     *
+     * @return
+     */
+    private static Semaphore getSemaphoreInstance() {
+        //只能1个线程同时访问
+        synchronized (OkHttpUtils.class) {
+            if (semaphore == null) {
+                semaphore = new Semaphore(0);
+            }
+        }
+        return semaphore;
+    }
+
+    /**
+     * 创建OkHttpUtils
+     *
+     * @return
+     */
+    public static OkHttpUtils builder() {
+        return new OkHttpUtils();
+    }
+
+    /**
+     * 添加url
+     *
+     * @param url
+     * @return
+     */
+    public OkHttpUtils url(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * 添加参数
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addParam(String key, Object value) {
+        if (paramMap == null) {
+            paramMap = new LinkedHashMap<>(16);
+        }
+        paramMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 添加请求头
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addHeader(String key, String value) {
+        if (headerMap == null) {
+            headerMap = new LinkedHashMap<>(16);
+        }
+        headerMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 初始化get方法
+     *
+     * @return
+     */
+    public OkHttpUtils get() {
+        request = new Request.Builder().get();
+        StringBuilder urlBuilder = new StringBuilder(url);
+        if (paramMap != null) {
+            urlBuilder.append("?");
+            try {
+                for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
+                    urlBuilder.append(URLEncoder.encode(entry.getKey(), "utf-8")).append("=").append(URLEncoder.encode(entry.getValue().toString(), "utf-8")).append("&");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        }
+        request.url(urlBuilder.toString());
+        return this;
+    }
+
+    /**
+     * 初始化delet方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils delete(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().delete(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils post(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    public OkHttpUtils post(Map<String,Object> data,boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(Map<String,Object> data,boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key,String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 同步请求
+     *
+     * @return
+     */
+    public String sync() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            assert response.body() != null;
+            return response.body().string();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "请求失败：" + e.getMessage();
+        }
+    }
+
+    /**
+     * 异步请求，有返回值
+     */
+    public String async() {
+        StringBuilder buffer = new StringBuilder("");
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                buffer.append("请求出错：").append(e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                buffer.append(response.body().string());
+                getSemaphoreInstance().release();
+            }
+        });
+        try {
+            getSemaphoreInstance().acquire();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * 异步请求，带有接口回调
+     *
+     * @param callBack
+     */
+    public void async(ICallBack callBack) {
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callBack.onFailure(call, e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                callBack.onSuccessful(call, response.body().string());
+            }
+        });
+    }
+
+    /**
+     * 为request添加请求头
+     *
+     * @param request
+     */
+    private void setHeader(Request.Builder request) {
+        if (headerMap != null) {
+            try {
+                for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+                    request.addHeader(entry.getKey(), entry.getValue());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 生成安全套接字工厂，用于https请求的证书跳过
+     *
+     * @return
+     */
+    private static SSLSocketFactory createSSLSocketFactory(TrustManager[] trustAllCerts) {
+        SSLSocketFactory ssfFactory = null;
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new SecureRandom());
+            ssfFactory = sc.getSocketFactory();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ssfFactory;
+    }
+
+    private static TrustManager[] buildTrustManagers() {
+        return new TrustManager[]{new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[]{};
+            }
+        }};
+    }
+    /**
+     * 自定义一个接口回调
+     */
+    public interface ICallBack {
+
+        void onSuccessful(Call call, String data);
+
+        void onFailure(Call call, String errorMsg);
+
+    }
+}
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/resources/application.yml b/mosty-bkzx/src/main/resources/application.yml
new file mode 100644
index 0000000..39dff48
--- /dev/null
+++ b/mosty-bkzx/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_bkzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/resources/bootstrap.yml b/mosty-bkzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..dbd6046
--- /dev/null
+++ b/mosty-bkzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8013
+  servlet:
+    context-path: /mosty-bkzx/
+spring:
+  application:
+    name: mosty-bkzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-bkzx/src/main/resources/logback-spring.xml b/mosty-bkzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-bkzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/resources/mapper/XdxxMapper.xml b/mosty-bkzx/src/main/resources/mapper/XdxxMapper.xml
new file mode 100644
index 0000000..9a54099
--- /dev/null
+++ b/mosty-bkzx/src/main/resources/mapper/XdxxMapper.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.bkzx.mapper.XdxxMapper">
+    <select id="queryXdxxBYSzfhCount" resultType="int">
+        select count(1) from tb_xdxx where xt_scbz = '0'
+        and id in (
+        select xd_id from tb_xdxx_ry where xt_scbz = '0'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xjcjsj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xjcjsj &lt;= #{dto.jssj}
+        </if>
+        )
+    </select>
+
+    <select id="queryXdxxBYSzfh" resultType="java.util.Map">
+        select * from tb_xdxx where xt_scbz = '0'
+        and id in (
+        select xd_id from tb_xdxx_ry where xt_scbz = '0'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xjcjsj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xjcjsj &lt;= #{dto.jssj}
+        </if>
+        )
+        order by xdlysj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="xdrylbCount" resultType="int">
+        select count(1) from tb_xdxx_ry where xt_scbz = '0'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.xdbm != null and dto.xdbm != ''">
+            and xdbm = #{dto.xdbm}
+        </if>
+        <if test="dto.xdId != null and dto.xdId != ''">
+            and xd_id = #{dto.xdId}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xjcjsj >= #{dto.kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and xjcjsj &lt;= #{jssj}
+        </if>
+    </select>
+
+    <select id="xdrylb" resultType="java.util.Map">
+        select * from tb_xdxx_ry where xt_scbz = '0'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.xdbm != null and dto.xdbm != ''">
+            and xdbm = #{dto.xdbm}
+        </if>
+        <if test="dto.xdId != null and dto.xdId != ''">
+            and xd_id = #{dto.xdId}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xjcjsj >= #{dto.kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and xjcjsj &lt;= #{jssj}
+        </if>
+        order by xjcjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="xdrytj" resultType="java.util.Map">
+        select count(1) as sl from tb_xdxx_ry where xt_scbz = '0'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.xdbm != null and dto.xdbm != ''">
+            and xdbm = #{dto.xdbm}
+        </if>
+        <if test="dto.xdId != null and dto.xdId != ''">
+            and xd_id = #{dto.xdId}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xjcjsj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xjcjsj &lt;= #{dto.jssj}
+        </if>
+        order by xjcjsj desc
+    </select>
+
+    <select id="xdxxlbCount" resultType="int">
+        select count(1) from tb_xdxx where xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xdlysj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xdlysj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.xdid != null and dto.xdid != ''">
+            and id in ( #{dto.xdid} )
+        </if>
+        order by xdlysj desc
+    </select>
+
+    <select id="xdxxlb" resultType="java.util.Map">
+        select * from tb_xdxx where xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xdlysj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xdlysj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.xdid != null and dto.xdid != ''">
+            and id in ( #{dto.xdid} )
+        </if>
+        order by xdlysj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="xdxxtj" resultType="java.util.Map">
+        select count(1) as sl from tb_xdxx where xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and xdlysj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and xdlysj &lt;= #{dto.jssj}
+        </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-bkzx/src/main/resources/rebel.xml b/mosty-bkzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..77e9eaa
--- /dev/null
+++ b/mosty-bkzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-bkzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-bkzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-dyga-cloud.iml b/mosty-dyga-cloud.iml
new file mode 100644
index 0000000..f409c0e
--- /dev/null
+++ b/mosty-dyga-cloud.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-gateway/mosty-gateway.iml b/mosty-gateway/mosty-gateway.iml
new file mode 100644
index 0000000..3c23234
--- /dev/null
+++ b/mosty-gateway/mosty-gateway.iml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353925" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-gateway:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-gateway-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:0.9.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.synchronoss.cloud:nio-multipart-parser:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.synchronoss.cloud:nio-stream-storage:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.5.3" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jolokia:jolokia-core:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-gateway/pom.xml b/mosty-gateway/pom.xml
new file mode 100644
index 0000000..803833e
--- /dev/null
+++ b/mosty-gateway/pom.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-gateway</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+<!--                <exclusion>-->
+<!--                    <artifactId>spring-web</artifactId>-->
+<!--                    <groupId>org.springframework</groupId>-->
+<!--                </exclusion>-->
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <artifactId>spring-web</artifactId>-->
+<!--                    <groupId>org.springframework</groupId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>common-base-starter</artifactId>
+                    <groupId>com.mosty</groupId>
+                </exclusion>
+                <!--                <exclusion>-->
+<!--                    <artifactId>springfox-spring-web</artifactId>-->
+<!--                    <groupId>io.springfox</groupId>-->
+<!--                </exclusion>-->
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>-->
+<!--            <version>2.3.2.RELEASE</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>-->
+<!--        </dependency>-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-gateway/src/main/java/com/mosty/base/gateway/MostyGatewayApplication.java b/mosty-gateway/src/main/java/com/mosty/base/gateway/MostyGatewayApplication.java
new file mode 100644
index 0000000..14f0f9c
--- /dev/null
+++ b/mosty-gateway/src/main/java/com/mosty/base/gateway/MostyGatewayApplication.java
@@ -0,0 +1,26 @@
+package com.mosty.base.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 网关启动服务
+ *
+ * @author kevin
+ * @date 2022/1/21 9:40 AM
+ * @since 1.0.0
+ */
+@Configuration
+@EnableDiscoveryClient
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, DataSourceAutoConfiguration.class})
+public class MostyGatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MostyGatewayApplication.class, args);
+    }
+
+}
diff --git a/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/FilterOrderConstant.java b/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/FilterOrderConstant.java
new file mode 100644
index 0000000..92ad57c
--- /dev/null
+++ b/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/FilterOrderConstant.java
@@ -0,0 +1,14 @@
+package com.mosty.base.gateway.filter;
+
+/**
+ *  gateway filter 常量
+ * @author kevin
+ * @date 2022/2/24 12:15 AM
+ * @since 1.0.0
+ */
+public class FilterOrderConstant {
+
+    /** 最高优先级拦截器，token */
+    public static final int TOKEN_FILTER_ORDER = 1;
+
+}
diff --git a/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/JwtFilter.java b/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/JwtFilter.java
new file mode 100644
index 0000000..8d69064
--- /dev/null
+++ b/mosty-gateway/src/main/java/com/mosty/base/gateway/filter/JwtFilter.java
@@ -0,0 +1,84 @@
+package com.mosty.base.gateway.filter;
+
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JWTUtil;
+import com.mosty.common.token.UserInfo;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.data.redis.core.GeoOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.Date;
+
+import static com.mosty.base.gateway.filter.FilterOrderConstant.TOKEN_FILTER_ORDER;
+
+@Slf4j
+@AllArgsConstructor
+public class JwtFilter implements GlobalFilter, Ordered {
+
+    private final RedisService redisService;
+    private final RedisTemplate redisTemplate;
+    private static final String TOKEN_PREFIX = "token:";
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        String token = exchange.getRequest().getHeaders().getFirst("Authorization");
+        if (token == null || token.isEmpty()) {
+            log.info("token is empty...");
+            exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+            return exchange.getResponse().setComplete();
+        }
+        UserInfo userInfo = JWTUtil.getUserInfo(token);
+        if (userInfo == null) {
+            log.error("get token exception");
+            exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+            return exchange.getResponse().setComplete();
+        }
+        String tokenKey = TOKEN_PREFIX + userInfo.getDeptId() + ":" + userInfo.getUserId();
+        Long time = (Long) redisTemplate.opsForValue().get(tokenKey);
+        if (time == null) {
+            redisTemplate.delete(tokenKey);
+            exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+            return exchange.getResponse().setComplete();
+        }
+        Date date = new Date(time);
+        int second = getMinutes(new Date(), date);
+        if (second > 30) {
+            log.error("token 过期");
+            redisTemplate.delete(tokenKey);
+            exchange.getResponse().setStatusCode(HttpStatus.UNAUTHORIZED);
+            return exchange.getResponse().setComplete();
+        }
+        if (second > 5) {
+            redisTemplate.opsForValue().set(tokenKey, System.currentTimeMillis());
+        }
+        return chain.filter(exchange);
+    }
+
+    /**
+     * 获取两个时间相差的分钟数
+     *
+     * @param date1 后面时间
+     * @param date2 前面时间
+     * @return 相差分支树
+     */
+    public static int getMinutes(Date date1, Date date2) {
+        int minutes = 0;
+        if (null != date1 && null != date2) {
+            minutes = (int) ((date1.getTime() - date2.getTime()) / (60 * 1000));
+        }
+        return minutes;
+    }
+
+    @Override
+    public int getOrder() {
+        return TOKEN_FILTER_ORDER;
+    }
+}
diff --git a/mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000..3460f1a
--- /dev/null
+++ b/mosty-gateway/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,13 @@
+{
+  "properties": [
+    {
+      "name": "hystrix.command.fallbackcmd.execution.isolation.thread.timeoutInMilliseconds",
+      "type": "java.lang.String",
+      "description": "Description for hystrix.command.fallbackcmd.execution.isolation.thread.timeoutInMilliseconds."
+    },
+    {
+      "name": "hystrix.command.fallbackcmd.execution.isolation.thread.timeoutInMilliseconds",
+      "type": "java.lang.String",
+      "description": "Description for hystrix.command.fallbackcmd.execution.isolation.thread.timeoutInMilliseconds."
+    }
+  ] }
\ No newline at end of file
diff --git a/mosty-gateway/src/main/resources/application.yml b/mosty-gateway/src/main/resources/application.yml
new file mode 100644
index 0000000..069f87b
--- /dev/null
+++ b/mosty-gateway/src/main/resources/application.yml
@@ -0,0 +1,5 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+servlet:
+  context-path: mosty-api
\ No newline at end of file
diff --git a/mosty-gateway/src/main/resources/bootstrap.yml b/mosty-gateway/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..c515a0f
--- /dev/null
+++ b/mosty-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,141 @@
+server:
+  port: 8006
+
+spring:
+  application:
+    name: mosty-gateway
+  redis:
+    host: 192.168.200.131
+    port: 6379
+    password: mosty888
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+    gateway:
+      globalcors:
+        cors-configurations:
+          '[/**]':
+            allowCredentials: true
+            allowedOrigins: "*"
+            allowedMethods: "*"
+            allowedHeaders: "*"
+        add-to-simple-url-handler-mapping: true
+      routes:
+        - id: mosty-search
+          uri: lb://MOSTY-SEARCH
+          predicates:
+            - Path=/mosty-search/**
+          filters:
+            - StripPrefix=2
+        - id: mosty-base
+          uri: lb://mosty-base
+          predicates:
+            - Path=/mosty-api/mosty-base/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-bkzx
+          uri: lb://mosty-bkzx
+          predicates:
+            - Path=/mosty-api/mosty-bkzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-hczx
+          uri: lb://mosty-hczx
+          predicates:
+            - Path=/mosty-api/mosty-hczx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-jcgl
+          uri: lb://mosty-jcgl
+          predicates:
+            - Path=/mosty-api/mosty-jcgl/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-qwzx
+          uri: lb://mosty-qwzx
+          predicates:
+            - Path=/mosty-api/mosty-qwzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-rzzx
+          uri: lb://mosty-rzzx
+          predicates:
+            - Path=/mosty-api/mosty-rzzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-sjzx
+          uri: lb://mosty-sjzx
+          predicates:
+            - Path=/mosty-api/mosty-sjzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-spxl
+          uri: lb://mosty-spxl
+          predicates:
+            - Path=/mosty-api/mosty-spxl/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-wzzx
+          uri: lb://mosty-wzzx
+          predicates:
+            - Path=/mosty-api/mosty-wzzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-yjzl
+          uri: lb://mosty-yjzl
+          predicates:
+            - Path=/mosty-api/mosty-yjzl/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-yszx
+          uri: lb://mosty-yszx
+          predicates:
+            - Path=/mosty-api/mosty-yszx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-rwzx
+          uri: lb://mosty-rwzx
+          predicates:
+            - Path=/mosty-api/mosty-rwzx/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-other
+          uri: lb://mosty-other
+          predicates:
+            - Path=/mosty-api/mosty-other/**
+          filters:
+            - StripPrefix=1
+        - id: mosty-websocket
+          uri: lb://mosty-websocket
+          predicates:
+            - Path=/mosty-api/mosty-websocket/**
+          filters:
+            - StripPrefix=1
+  main:
+    allow-bean-definition-overriding: true
+
+hystrix:
+  command:
+    fallbackcmd:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 3000
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-gateway/src/main/resources/rebel.xml b/mosty-gateway/src/main/resources/rebel.xml
new file mode 100644
index 0000000..6459946
--- /dev/null
+++ b/mosty-gateway/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-gateway</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-gateway/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-hczx/mosty-hczx.iml b/mosty-hczx/mosty-hczx.iml
new file mode 100644
index 0000000..e7bc0c2
--- /dev/null
+++ b/mosty-hczx/mosty-hczx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353911" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-hczx/pom.xml b/mosty-hczx/pom.xml
new file mode 100644
index 0000000..6ef2138
--- /dev/null
+++ b/mosty-hczx/pom.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-hczx</artifactId>
+    <description>核查中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/MostyHczxApplication.java b/mosty-hczx/src/main/java/com/mosty/hczx/MostyHczxApplication.java
new file mode 100644
index 0000000..8dde001
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/MostyHczxApplication.java
@@ -0,0 +1,31 @@
+package com.mosty.hczx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	核查中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.hczx.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+//@EnableScheduling
+public class MostyHczxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyHczxApplication.class, args);
+	}
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/config/FeignConfig.java b/mosty-hczx/src/main/java/com/mosty/hczx/config/FeignConfig.java
new file mode 100644
index 0000000..c204125
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.hczx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/config/GlobalYmlConfig.java b/mosty-hczx/src/main/java/com/mosty/hczx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..30d3890
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.hczx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/config/WebMvcConfig.java b/mosty-hczx/src/main/java/com/mosty/hczx/config/WebMvcConfig.java
new file mode 100644
index 0000000..37cd4d1
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.hczx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/SseHcController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/SseHcController.java
new file mode 100644
index 0000000..7babb06
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/SseHcController.java
@@ -0,0 +1,64 @@
+package com.mosty.hczx.controller;
+
+import cn.hutool.core.date.DateUtil;
+import com.mosty.base.utils.Constant;
+import com.mosty.common.token.JwtSysUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.Date;
+
+
+@Controller
+@RequestMapping(path = "/hcSse")
+public class SseHcController {
+
+
+    @RequestMapping(value = "test", method = RequestMethod.GET)
+    public Object test() {
+        return DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+    }
+
+
+    @GetMapping(path = "subscribe")
+    @JwtSysUser
+    public SseEmitter push(String id) throws IOException {
+        System.out.println(id);
+        // 超时时间设置为1小时
+        SseEmitter sseEmitter = new SseEmitter(3600_000L);
+        // 设置前端的重试时间为1s
+        sseEmitter.send(SseEmitter.event().reconnectTime(1000).data("连接成功"));
+        Constant.HcSse.put(id, sseEmitter);
+        sseEmitter.onTimeout(() -> Constant.HcSse.remove(id));
+        sseEmitter.onCompletion(() -> System.out.println("完成！！！"));
+        return sseEmitter;
+    }
+
+    @PostMapping(path = "push")
+    @ResponseBody
+    @JwtSysUser
+    public String push(String id, String content) throws IOException {
+        SseEmitter sseEmitter = Constant.HcSse.get(id);
+        if (sseEmitter != null) {
+            sseEmitter.send(content);
+        }
+        return "push over";
+    }
+
+    @GetMapping(path = "close")
+    @ResponseBody
+    public String over(String id) throws IOException {
+        SseEmitter sseEmitter = Constant.HcSse.get(id);
+        if (sseEmitter != null) {
+            sseEmitter.send("close");
+            sseEmitter.send(SseEmitter.event().name("close").id(id).data(""));
+            sseEmitter.complete();
+            Constant.HcSse.remove(id);
+        }
+        return "close over";
+    }
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcclController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcclController.java
new file mode 100644
index 0000000..9062ce8
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcclController.java
@@ -0,0 +1,123 @@
+package com.mosty.hczx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.hczx.TbHcBpcclInsertDto;
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcclQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcryQuery;
+import com.mosty.base.model.vo.hczx.TbHcBpcclVo;
+import com.mosty.base.model.vo.hczx.TbHcBpcryVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.hczx.TbHcBpccl;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcclQuery;
+import com.mosty.hczx.service.TbHcBpcclService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/2
+ **/
+@Api(tags = "核查中心-被盘查车辆接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbHcBpccl")
+public class TbHcBpcclController {
+
+    private final TbHcBpcclService tbHcBpcclService;
+
+    @ApiOperation("大屏-数据统计区（左上侧)查询盘查车辆数量")
+    @GetMapping("/selectCarCount")
+    @JwtSysUser
+    public ResponseResult<Integer> selectCarCount() {
+        return ResponseResult.success(tbHcBpcclService.selectCarCount());
+    }
+
+    @ApiOperation("大屏-数据统计区（左上侧）-查询盘查车辆列表分页")
+    @GetMapping("/selectCarList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbHcBpcclVo>> selectCarList(TbHcTodayBpcclQuery dto) {
+        return ResponseResult.success(tbHcBpcclService.selectCarList(dto));
+    }
+
+    @ApiOperation("APP_查询车辆信息")
+    @PostMapping("/selectCl")
+    @Log(title = "APP_查询车辆信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<TbHcBpcclVo> selectCl(@RequestBody TbHcBpcclQuery dto) {
+        return ResponseResult.success(this.tbHcBpcclService.selectCl(dto));
+    }
+
+    @ApiOperation("保存被盘查车辆信息")
+    @PostMapping("/saveBpccl")
+    @Log(title = "保存被盘查车辆信息", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Void> saveBpccl(@RequestBody TbHcBpcclInsertDto dto) {
+        this.tbHcBpcclService.saveBpccl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询两个小时内没有被人员绑定的车辆")
+    @PostMapping("/getClOf2h")
+    @JwtSysUser
+    public ResponseResult<List<TbHcBpcclVo>> getClOf2h() {
+        return ResponseResult.success(this.tbHcBpcclService.getClOf2h());
+    }
+
+    @ApiOperation("条件查询车辆盘查信息")
+    @PostMapping("getClpcList")
+    @Log(title = "条件查询人员盘查信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<IPage<TbHcBpcclVo>> getClpcList(@RequestBody TbHcBpcclQuery dto) {
+        return ResponseResult.success(this.tbHcBpcclService.getClpcList(dto));
+    }
+
+    @ApiOperation("条件查询车辆盘查信息")
+    @PostMapping("getClpcCount")
+    @Log(title = "条件查询人员盘查信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<Map<String, Integer>> getClpcCount(@RequestBody TbHcBpcclQuery dto) {
+        return ResponseResult.success(this.tbHcBpcclService.getClpcCount(dto));
+    }
+
+    @ApiOperation("大屏被盘查车辆统计")
+    @JwtSysUser
+    @PostMapping(value = "/bpcclTj")
+    public ResponseResult<Map<String, Integer>> bpcclTj() {
+        return ResponseResult.success(this.tbHcBpcclService.bpcclTj());
+    }
+
+    @ApiOperation("实际盘查车数")
+    @JwtSysUser
+    @PostMapping(value = "/getSjpcc")
+    public ResponseResult<Integer> getSjpcc(@RequestParam("ssbmdm") String ssbmdm,
+                                            @RequestParam("time") String time) {
+        return ResponseResult.success(this.tbHcBpcclService.getSjpcc(ssbmdm, time));
+    }
+
+
+    @ApiOperation("盘查物品统计")
+    @JwtSysUser
+    @PostMapping(value = "/getPcWptj")
+    public ResponseResult<Integer> getPcWptj(@RequestParam("ssbmdm") String ssbmdm,
+                                           @RequestParam("time") String time) {
+        return ResponseResult.success(this.tbHcBpcclService.getPcWptj(ssbmdm, time));
+    }
+
+    @ApiOperation("盘查统计")
+    @JwtSysUser
+    @PostMapping(value = "/getPctj")
+    public ResponseResult<Object> getPctj(@RequestBody HcTjQuery query) {
+        return ResponseResult.success(this.tbHcBpcclService.getPctj(query));
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcryController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcryController.java
new file mode 100644
index 0000000..ef4c1de
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcBpcryController.java
@@ -0,0 +1,194 @@
+package com.mosty.hczx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.RyClTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcryQuery;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcryQuery;
+import com.mosty.base.model.vo.hczx.RyZpSearchVo;
+import com.mosty.base.model.vo.hczx.TbHcBpcryVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.hczx.service.TbHcBpcryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/2
+ * 核查中心-被盘查人员接口
+ **/
+@Api(tags = "核查中心-被盘查人员接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbHcBpcry")
+public class TbHcBpcryController {
+
+    private final TbHcBpcryService tbHcBpcryService;
+
+    @ApiOperation("大屏-数据统计区（左上侧）-查询盘查人员数量")
+    @GetMapping("/selectCrewCount")
+    @JwtSysUser
+    public ResponseResult<Integer> selectCrewCount() {
+        return ResponseResult.success(tbHcBpcryService.selectCrewCount());
+    }
+
+    @ApiOperation("大屏-数据统计区（左上侧）-查询盘查人员列表分页")
+    @GetMapping("/selectCrewList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbHcBpcryVo>> selectCrewList(TbHcTodayBpcryQuery dto) {
+        return ResponseResult.success(tbHcBpcryService.selectCrewList(dto));
+    }
+
+    @ApiOperation("APP_查询人员信息")
+    @PostMapping("/selectRy")
+    @Log(title = "APP_查询人员信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<TbHcBpcryVo> selectRy(@RequestBody TbHcBpcryQuery dto) {
+        return ResponseResult.success(tbHcBpcryService.selectRy(dto));
+    }
+
+    @ApiOperation("查询人员标签代码")
+    @GetMapping("/getRyBq")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getRyBq(String id) {
+        return ResponseResult.success(tbHcBpcryService.getRyBq(id));
+    }
+
+    @ApiOperation("查询人员标签代码根据身份证查询")
+    @GetMapping("/getRyBqBySfzh")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getRyBqBySfzh(String sfzh) {
+        return ResponseResult.success(tbHcBpcryService.getRyBqBySfzh(sfzh));
+    }
+
+    @ApiOperation("保存被盘查人员信息Nfc")
+    @PostMapping("/saveBpcryNfc")
+    @Log(title = "保存被盘查人员信息Nfc", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<TbHcBpcryVo> saveBpcryNfc(@RequestBody TbHcBpcry bpcry) {
+        return ResponseResult.success(this.tbHcBpcryService.saveBpcryNfc(bpcry));
+    }
+
+    @ApiOperation("保存被盘查人员信息")
+    @PostMapping("/saveBpcry")
+    @Log(title = "保存被盘查人员信息", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Void> saveBpcry(@RequestBody TbHcBpcryInsertDto dto) {
+        this.tbHcBpcryService.saveBpcry(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据人像查询人员列表信息")
+    @PostMapping("/getRyListByZp")
+    @Log(title = "根据人像查询人员列表信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<RyZpSearchVo>> getRyListByZp(@RequestParam(name = "file") MultipartFile file) {
+        return ResponseResult.success(this.tbHcBpcryService.getRyListByZp(file));
+    }
+
+    @ApiOperation("根据人像查询人员列表信息-base64")
+    @PostMapping("/getRyListByBase64")
+    @Log(title = "根据人像查询人员列表信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<RyZpSearchVo>> getRyListByBase64(@RequestParam(name = "base64Str") String base64Str) {
+        return ResponseResult.success(this.tbHcBpcryService.getRyListByBase64(base64Str));
+    }
+
+    @ApiOperation("根据手机号查询人员信息")
+    @PostMapping("/getRyListBySjhm/{mobile}")
+    @Log(title = "根据手机号查询人员信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<Map>> getRyListBySjhm(@PathVariable("mobile") String mobile) {
+        return ResponseResult.success(this.tbHcBpcryService.getRyListBySjhm(mobile));
+    }
+
+    @ApiOperation("条件查询人员盘查信息")
+    @PostMapping("getRypcList")
+    @Log(title = "条件查询人员盘查信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<IPage<TbHcBpcryVo>> getRypcList(@RequestBody TbHcBpcryQuery dto) {
+        return ResponseResult.success(this.tbHcBpcryService.getRypcList(dto));
+    }
+
+    @ApiOperation("条件查询人员盘查信息统计")
+    @PostMapping("getRypcCount")
+    @Log(title = "条件查询人员盘查信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<Map<String, Integer>> getRypcCount(@RequestBody TbHcBpcryQuery dto) {
+        return ResponseResult.success(this.tbHcBpcryService.getRypcCount(dto));
+    }
+
+    @ApiOperation("查询两个小时内没有被车辆绑定的人员")
+    @PostMapping("getRyOf2h")
+    @JwtSysUser
+    public ResponseResult<List<TbHcBpcryVo>> getRyOf2h() {
+        return ResponseResult.success(this.tbHcBpcryService.getRyOf2h());
+    }
+
+    @ApiOperation("查询人员盘查列表--计算")
+    @PostMapping("getRyList")
+    @JwtSysUser
+    public ResponseResult<List<TbHcBpcryVo>> getRyList() {
+        return ResponseResult.success(this.tbHcBpcryService.getRyOf2h());
+    }
+
+    @ApiOperation("泸州态势统计-各区县盘查工作")
+    @PostMapping("/getGqxpc")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getXfscAndLcTj(RyClTjQuery dto) {
+        return ResponseResult.success(this.tbHcBpcryService.getGqxpc(dto));
+    }
+    @ApiOperation("大屏被盘查人员统计")
+    @JwtSysUser
+    @PostMapping(value = "/bpcryTj")
+    public ResponseResult<Map<String, Integer>> bpcryTj() {
+        return ResponseResult.success(this.tbHcBpcryService.bpcryTj());
+    }
+
+    @ApiOperation("巡防战果统计")
+    @JwtSysUser
+    @PostMapping(value = "/xfzgtj")
+    @Log(title = "巡防战果统计", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<Map<String, Object>>> xfzgtj(@RequestBody HcTjQuery query) {
+        return ResponseResult.success(this.tbHcBpcryService.xfzgtj(query));
+    }
+
+    @ApiOperation("巡防战果统计All")
+    @JwtSysUser
+    @PostMapping(value = "/xfzgtjAll")
+    @Log(title = "巡防战果统计All", businessType = BusinessType.OTHER)
+    public ResponseResult<Map<String, Object>> xfzgtjAll(@RequestBody HcTjQuery query) {
+        return ResponseResult.success(this.tbHcBpcryService.xfzgtjAll(query));
+    }
+
+    @ApiOperation("实际盘查人数")
+    @JwtSysUser
+    @PostMapping(value = "/getSjpcr")
+    public ResponseResult<Integer> getSjpcr(@RequestParam("ssbmdm") String ssbmdm,
+                                            @RequestParam("time") String time) {
+        return ResponseResult.success(this.tbHcBpcryService.getSjpcr(ssbmdm, time));
+    }
+
+
+    @ApiOperation("方正获取战果统计")
+//    @JwtSysUser
+    @PostMapping(value = "/getZgtj")
+//    @Log(title = "方正获取战果统计", businessType = BusinessType.OTHER)
+    public ResponseResult<Map<String, List<Map<String, Object>>>> getZgtj(@Validated @RequestBody HcTjQuery query) {
+        return ResponseResult.success(this.tbHcBpcryService.getZgtj(query));
+    }
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcDtgzController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcDtgzController.java
new file mode 100644
index 0000000..4880b40
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcDtgzController.java
@@ -0,0 +1,39 @@
+package com.mosty.hczx.controller;
+
+import com.mosty.base.model.dto.hczx.TbHcDtgzDto;
+import com.mosty.base.model.entity.hczx.TbHcDtgz;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.hczx.service.TbHcDtgzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "动态核查数据接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbHcDtgz")
+public class TbHcDtgzController {
+
+    private final TbHcDtgzService tbHcDtgzService;
+
+
+    @ApiOperation("条件查询动态核查数据信息")
+    @PostMapping("/getList")
+    @Log(title = "条件查询动态核查数据信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<TbHcDtgz>> getList(@RequestBody TbHcDtgzDto dto) {
+        return ResponseResult.success(this.tbHcDtgzService.getList(dto));
+    }
+
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcRytzbqController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcRytzbqController.java
new file mode 100644
index 0000000..ccaf212
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcRytzbqController.java
@@ -0,0 +1,41 @@
+package com.mosty.hczx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.hczx.TbHcRytzbq;
+import com.mosty.base.model.query.hczx.TbHcRytzbqQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.hczx.service.TbHcRytzbqService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Api(tags = "核查中心-人员特征标签接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbHcRytzbq")
+public class TbHcRytzbqController {
+
+    private final TbHcRytzbqService tbHcRytzbqService;
+
+    @ApiOperation("获取人员特征标签列表--分页")
+    @PostMapping("/selectPage")
+    @JwtSysUser
+    public ResponseResult<IPage<TbHcRytzbq>> selectList(@RequestBody TbHcRytzbqQuery dto) {
+        return ResponseResult.success(this.tbHcRytzbqService.selectPage(dto));
+    }
+
+    @ApiOperation("获取人员特征标签列表--不分页")
+    @PostMapping("/selectList")
+    @JwtSysUser
+    public ResponseResult<List<TbHcRytzbq>> selectList(@RequestBody TbHcRytzbq dto) {
+        return ResponseResult.success(this.tbHcRytzbqService.selectList(dto));
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcSydjController.java b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcSydjController.java
new file mode 100644
index 0000000..4907e5c
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/controller/TbHcSydjController.java
@@ -0,0 +1,63 @@
+package com.mosty.hczx.controller;
+
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.dto.hczx.TbHcSydjQueryDto;
+import com.mosty.base.model.dto.hczx.TbHcSydjSaveDto;
+import com.mosty.base.model.entity.hczx.TbHcSydj;
+import com.mosty.base.model.vo.hczx.TbHcSydjVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.hczx.service.TbHcBpcryService;
+import com.mosty.hczx.service.TbHcSydjServer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "核查中心-涉疫登记接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbHcRytzbq")
+public class TbHcSydjController {
+
+    private final TbHcSydjServer tbHcSydjServer;
+
+    @ApiOperation("保存或者修改涉疫登记信息")
+    @PostMapping("/sydjSaveOrEdit")
+    @Log(title = "保存或者修改涉疫登记信息", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Void> sydjSaveOrEdit(@RequestBody TbHcSydjSaveDto dto) {
+        this.tbHcSydjServer.sydjSaveOrEdit(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改涉疫登记信息")
+    @PostMapping("/editSydj")
+    @Log(title = "修改涉疫登记信息", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Void> editSydj(@RequestBody TbHcSydjSaveDto dto) {
+        this.tbHcSydjServer.editSydj(dto);
+        return ResponseResult.success();
+    }
+
+
+    @ApiOperation("根据身份证号码和盘查Id查询人员涉疫登记信息")
+    @PostMapping("/getRySydjInfo")
+    @Log(title = "根据身份证号码和盘查Id查询人员涉疫登记信息", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<TbHcSydjVo> getRySydjInfo(@RequestBody TbHcSydjQueryDto dto) {
+        return ResponseResult.success(this.tbHcSydjServer.getRySydjInfo(dto));
+    }
+
+
+
+
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclBqMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclBqMapper.java
new file mode 100644
index 0000000..6668b23
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclBqMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcclBq;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbHcBpcclBqMapper extends BaseMapper<TbHcBpcclBq> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclMapper.java
new file mode 100644
index 0000000..1c3a65c
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclMapper.java
@@ -0,0 +1,58 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.hczx.TbHcBpccl;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface TbHcBpcclMapper extends BaseMapper<TbHcBpccl> {
+
+    Integer selectCarCount(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("查询今日盘查车辆列表")
+    List<TbHcBpccl> getList(Map<String, Object> map);
+
+    @ApiOperation("查询今日盘查车辆数量")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("插入数据")
+    void insertEntity(TbHcBpccl item);
+
+    @ApiOperation("修改盘查车辆对象")
+    void updateEntity(TbHcBpccl cl);
+
+    @ApiOperation("查询两个小时内没有被人员绑定的车辆")
+    List<TbHcBpccl> getClOf2h(@Param("sfzh") String sfzh, @Param("time") String time);
+
+    @ApiOperation("添加查询车辆盘查信息")
+    int getCountCl(Map<String, Object> map);
+
+    @ApiOperation("条件查询车辆盘车信息列表")
+    List<TbHcBpccl> getListCl(Map<String, Object> map);
+
+    @ApiOperation("统计被盘查车辆")
+    List<Map<String, Object>> selectPcclTj(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询重点车辆统计")
+    List<Map<String, Object>> selectZdclTj(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("盘查统计")
+    IPage<Map<String, Object>> getPctj(@Param("page") IPage<HcTjQuery> page, @Param("query") HcTjQuery query);
+
+    int getPctjRy(@Param("query") HcTjQuery query);
+
+    int getPctjCl(@Param("query") HcTjQuery query);
+
+    @ApiOperation("盘查物品统计")
+    int getPcWptj(@Param("ssbmdm") String ssbmdm, @Param("time") String time);
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclWpMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclWpMapper.java
new file mode 100644
index 0000000..aba3ae1
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcclWpMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcclWp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ **/
+@Mapper
+public interface TbHcBpcclWpMapper extends BaseMapper<TbHcBpcclWp> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryBqMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryBqMapper.java
new file mode 100644
index 0000000..c129bfb
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryBqMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.entity.hczx.TbHcBpcryBq;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ **/
+@Mapper
+public interface TbHcBpcryBqMapper extends BaseMapper<TbHcBpcryBq> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryMapper.java
new file mode 100644
index 0000000..9b7b3ff
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryMapper.java
@@ -0,0 +1,56 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface TbHcBpcryMapper extends BaseMapper<TbHcBpcry> {
+
+    @ApiOperation("查询今日盘查数量")
+    Integer selectCrewCount(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("查询今日盘查人员列表")
+    List<TbHcBpcry> getList(Map<String, Object> map);
+
+    @ApiOperation("查询今日盘查数量")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询今日盘查人员列表")
+    List<TbHcBpcry> getListRy(Map<String, Object> map);
+
+    @ApiOperation("查询今日盘查数量")
+    int getCountRy(Map<String, Object> map);
+
+    @ApiOperation("添加人员信息")
+    void insertEntity(TbHcBpcry ry);
+
+    @ApiOperation("修改被盘查人员信息")
+    void updateEntity(TbHcBpcry ry);
+
+    @ApiOperation("查询两个小时内没有被车辆绑定的人员")
+    List<TbHcBpcry> getRyOf2h(String sfzh, String time);
+
+    @ApiOperation("统计被盘查人员")
+    List<Map<String, Object>> selectPcryTj(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询重点人员")
+    List<Map<String, Object>> selectZdryTj(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    IPage<String> getSsbm(@Param("page") IPage<HcTjQuery> page, @Param("query") HcTjQuery query);
+
+    @ApiOperation("人员标签统计")
+    List<Map<String, Object>> getRyBqtj(HcTjQuery query);
+
+    @ApiOperation("车辆标签统计")
+    List<Map<String, Object>> getClBqtj(HcTjQuery query);
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryTzbqMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryTzbqMapper.java
new file mode 100644
index 0000000..9c5ff2e
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryTzbqMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcryTzbq;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ **/
+@Mapper
+public interface TbHcBpcryTzbqMapper extends BaseMapper<TbHcBpcryTzbq> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryWpMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryWpMapper.java
new file mode 100644
index 0000000..9e17a8e
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcBpcryWpMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcryWp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ **/
+@Mapper
+public interface TbHcBpcryWpMapper extends BaseMapper<TbHcBpcryWp> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcDtgzMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcDtgzMapper.java
new file mode 100644
index 0000000..b30b8ce
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcDtgzMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcDtgz;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbHcDtgzMapper extends BaseMapper<TbHcDtgz> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcRytzbqMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcRytzbqMapper.java
new file mode 100644
index 0000000..bc4f19f
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcRytzbqMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcRytzbq;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Mapper
+public interface TbHcRytzbqMapper extends BaseMapper<TbHcRytzbq> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcSydjMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcSydjMapper.java
new file mode 100644
index 0000000..282da76
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcSydjMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.hczx.TbHcSydjSaveDto;
+import com.mosty.base.model.entity.hczx.TbHcSydj;
+
+public interface TbHcSydjMapper  extends BaseMapper<TbHcSydj> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcTpMapper.java b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcTpMapper.java
new file mode 100644
index 0000000..62802d4
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mapper/TbHcTpMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcTp;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/16
+ **/
+@Mapper
+public interface TbHcTpMapper extends BaseMapper<TbHcTp> {
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..296c163
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.hczx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/MybatisPlusConfig.java b/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..5d888e9
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.hczx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbBaseAdaptRemoteService.java b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..b8ca2a8
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,74 @@
+package com.mosty.hczx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ *  调用部门信息远程适配层
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    /** 部门信息 */
+    @Resource
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    /**
+     * 根据部门编码查询部门信息
+     * @param orgCode 部门编码
+     * @return 部门信息
+     */
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbJcglAdaptRemoteService.java b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbJcglAdaptRemoteService.java
new file mode 100644
index 0000000..cb6042c
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbJcglAdaptRemoteService.java
@@ -0,0 +1,46 @@
+package com.mosty.hczx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 基础管理远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbJcglAdaptRemoteService {
+
+    private final MostyJcglFeignService mostyJcglFeignService;
+
+    // 获取部门下的巡防力量信息
+    public List<TbJcglXfllVo> getXfll(TbJcglXfllQueryAllDto dto) {
+        ResponseResult<List<TbJcglXfllVo>> responseResult = mostyJcglFeignService.getXfll(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的巡防力量信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的巡防力量信息失败");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询感知接入列表
+    public List<TbSbGzjr> getGzjrList(TbSbGzjr dto) {
+        ResponseResult<List<TbSbGzjr>> responseResult = mostyJcglFeignService.getGzjrList(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的巡防力量信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的巡防力量信息失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbLzotherAdapRemoteService.java b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbLzotherAdapRemoteService.java
new file mode 100644
index 0000000..b47af0d
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbLzotherAdapRemoteService.java
@@ -0,0 +1,61 @@
+package com.mosty.hczx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyLzotherFeignService;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.entity.lzother.TAlarmBkxxRy;
+import com.mosty.base.model.entity.lzother.TAlarmCkxx;
+import com.mosty.base.model.entity.lzother.TAlarmZtry;
+import com.mosty.base.model.entity.lzother.VJcxx;
+import com.mosty.base.model.vo.yszx.TbYsRyBqUpdateDto;
+import com.mosty.base.model.vo.yszx.TbYsRyDhUpdateDto;
+import com.mosty.base.model.vo.yszx.TbYsRyVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbLzotherAdapRemoteService {
+
+    private final MostyLzotherFeignService mostyLzotherFeignService;
+
+
+    // 查询在逃人员信息
+    public TAlarmZtry selectBySfzh(String sfzh) {
+        ResponseResult<TAlarmZtry> responseResult = this.mostyLzotherFeignService.selectBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情类别类型细类中文异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情类别类型细类中文异常");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询常控人员信息
+    public TAlarmCkxx selectCkBySfzh(String sfzh) {
+        ResponseResult<TAlarmCkxx> responseResult = this.mostyLzotherFeignService.selectCkBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情类别类型细类中文异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情类别类型细类中文异常");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询布控人员信息
+    public TAlarmBkxxRy selectBkBySfzh(String sfzh) {
+        ResponseResult<TAlarmBkxxRy> responseResult = this.mostyLzotherFeignService.selectBkBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情类别类型细类中文异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情类别类型细类中文异常");
+        }
+        return responseResult.getData();
+    }
+
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbYszxAdapRemoteService.java b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbYszxAdapRemoteService.java
new file mode 100644
index 0000000..2ea9e25
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/remote/TbYszxAdapRemoteService.java
@@ -0,0 +1,66 @@
+package com.mosty.hczx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.entity.yszx.TbYsRy;
+import com.mosty.base.model.vo.yszx.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYszxAdapRemoteService {
+
+    private final MostyYszxFeignService mostyYszxFeignService;
+
+    // 查询人员要素
+    public TbYsRyVo getRyInfo(String sfzh) {
+        ResponseResult<TbYsRyVo> responseResult = this.mostyYszxFeignService.getRyInfo(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询人员要素异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询人员要素异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加人员要素
+    public void addRyYs(TbYsRyDto dto) {
+        ResponseResult<Void> responseResult = this.mostyYszxFeignService.addRyYs(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加人员要素异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加人员要素异常");
+        }
+    }
+
+    // 修改人员要素
+    public void updateRyYs(TbYsRyDto dto) {
+        ResponseResult<Void> responseResult = this.mostyYszxFeignService.updateRyYs(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改人员要素异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改人员要素异常");
+        }
+    }
+
+    // 修改人员标签要素
+    public void updateRyBqYs(TbYsRyBqUpdateDto dto) {
+        ResponseResult<Void> responseResult = this.mostyYszxFeignService.updateRyBqYs(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改人员标签要素异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改人员标签要素异常");
+        }
+    }
+
+    // 修改人员电话要素
+    public void updateRyDhys(TbYsRyDhUpdateDto dto) {
+        ResponseResult<Void> responseResult = this.mostyYszxFeignService.updateRyDhys(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改人员电话要素异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改人员电话要素异常");
+        }
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcclServiceImpl.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcclServiceImpl.java
new file mode 100644
index 0000000..f8efd84
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcclServiceImpl.java
@@ -0,0 +1,607 @@
+package com.mosty.hczx.service.Impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.hczx.BpcclSaveDto;
+import com.mosty.base.model.dto.hczx.TbHcBpcclInsertDto;
+import com.mosty.base.model.entity.hczx.*;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcclQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcryQuery;
+import com.mosty.base.model.vo.hczx.*;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcclQuery;
+import com.mosty.hczx.mapper.*;
+import com.mosty.hczx.remote.TbBaseAdaptRemoteService;
+import com.mosty.hczx.service.TbHcBpcclService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class TbHcBpcclServiceImpl extends ServiceImpl<TbHcBpcclMapper, TbHcBpccl>
+        implements TbHcBpcclService {
+
+    private final TbHcTpMapper tbHcTpMapper;
+    private final TbHcBpcclWpMapper tbHcBpcclWpMapper;
+    private final TbHcBpcclBqMapper tbHcBpcclBqMapper;
+    private final TbHcBpcryMapper tbHcBpcryMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+
+    @Override
+    public Integer selectCarCount() {
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.baseMapper.selectCarCount(ssbm);
+    }
+
+    @Override
+    public IPage<TbHcBpcclVo> selectCarList(TbHcTodayBpcclQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        IPage<TbHcBpcclVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+//        UserInfo userInfo = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", userInfo));
+        int count = this.baseMapper.getCount(map);
+        List<TbHcBpccl> list = this.baseMapper.getList(map);
+        page.setTotal(count);
+        List<TbHcBpcclVo> voList = new ArrayList<>();
+        list.forEach(item -> {
+            // 查询车辆图片
+            TbHcBpcclVo vo = new TbHcBpcclVo();
+            BeanUtils.copyProperties(item, vo);
+            List<TbHcTp> tpList = this.tbHcTpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcTp>()
+                            .eq(TbHcTp::getLyid, item.getId())
+                            .eq(TbHcTp::getLybm, "tb_hc_bpccl")
+            );
+
+            if (!CollectionUtils.isEmpty(tpList)) {
+                List<TbHcTpVo> collect = tpList.stream().map(v -> {
+                    TbHcTpVo tbHcTpVo = new TbHcTpVo();
+                    BeanUtils.copyProperties(v, tbHcTpVo);
+                    return tbHcTpVo;
+                }).collect(Collectors.toList());
+                vo.setTpList(collect);
+            }
+
+
+            // 查询车辆物品
+            List<TbHcBpcclWp> wpList = this.tbHcBpcclWpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcBpcclWp>()
+                            .eq(TbHcBpcclWp::getPcywid, item.getId())
+            );
+            List<TbHcBpcclWpVo> wpVoList = new ArrayList<>();
+            wpList.forEach(wp -> {
+                TbHcBpcclWpVo wpVo = new TbHcBpcclWpVo();
+                BeanUtils.copyProperties(wp, wpVo);
+                // 查询物品图片
+                List<TbHcTp> wpTpList = this.tbHcTpMapper.selectList(
+                        new LambdaQueryWrapper<TbHcTp>()
+                                .eq(TbHcTp::getLyid, wp.getId())
+                                .eq(TbHcTp::getLybm, "tb_hc_bpccl_wp")
+                );
+                wpVo.setWpTpIdList(wpTpList.stream().map(TbHcTp::getFjid).collect(Collectors.toList()));
+                wpVoList.add(wpVo);
+            });
+            vo.setWpVoList(wpVoList);
+            voList.add(vo);
+        });
+        page.setRecords(voList);
+        return page;
+    }
+
+    @Override
+    public TbHcBpcclVo selectCl(TbHcBpcclQuery dto) {
+        UserInfo user = UserInfoManager.get();
+
+        TbHcBpccl item = new TbHcBpccl();
+        BeanUtils.copyProperties(dto, item);
+        if (StringUtils.isNotBlank(dto.getHpzl()) && StringUtils.isNotBlank(dto.getHphm())) {
+            if (dto.getJd() == null || dto.getWd() == null) {
+                // 默认为县公安局经纬度
+                dto.setJd(Constant.JD).setWd(Constant.WD);
+                item.setJd(Constant.JD).setWd(Constant.WD);
+            }
+            ClpcVo vo = this.getClByHp(dto.getHpzl(), dto.getHphm(), user, item);
+            if (vo != null && StringUtils.isNotBlank(vo.getHphm())) {
+                item.setId(UUIDGenerator.getUUID()).setClsbdh(vo.getClsbdh())
+                        .setJdcsyr(vo.getJdcsyr()).setJdcsyrsfzh(vo.getSfzh())
+                        .setPcrq(new Date()).setPcsj(new Date())
+                        .setPcmjId(String.valueOf(user.getUserId())).setPcmjJh(user.getInDustRialId())
+                        .setPcmjSfzh(user.getIdEntityCard()).setPcmjXm(user.getUserName())
+                        .setSsbmdm(user.getDeptCode())
+                        .setSsbm(user.getDeptName())
+                        .setSsbmid(String.valueOf(user.getDeptId()))
+                        .setSsxgaj(user.getFxjDeptName())
+                        .setSsxgajid(String.valueOf(user.getFxjDeptId()))
+                        .setSsxgajdm(user.getFxjDeptCode())
+                        .setSssgaj(user.getDszDeptName())
+                        .setSssgajid(String.valueOf(user.getDszDeptId()))
+                        .setSssgajdm(user.getDszDeptCode()).setXtSjly("2");
+                item.setZdch(dto.getZdch());
+                item.setZdxh(dto.getZdxh());
+                item.setZdsim(dto.getZdsim());
+                item.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()))
+                        .setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+                StringBuilder rybqdm = new StringBuilder();
+                StringBuilder rybq = new StringBuilder();
+                // 查询是否盗抢车辆
+                DqclVo dqclVo = this.getDqcl(dto.getHpzl(), dto.getHphm(), user);
+                if (dqclVo != null) {
+                    rybqdm.append("盗抢车辆").append(",");
+                    rybq.append("DQCL").append(",");
+                    // 保存车辆标签信息
+                    TbHcBpcclBq bq = new TbHcBpcclBq();
+                    bq.setPcywid(item.getId());
+                    bq.setBqmc("盗抢车辆");
+                    bq.setBqbh("DQCL");
+                    bq.setXtSjly("1");
+                    bq.setSsbmdm(String.valueOf(user.getDeptId()));
+                    bq.setSsbm(user.getDeptName());
+                    bq.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                    bq.setSsxgaj(user.getFxjDeptName());
+                    bq.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                    bq.setSssgaj(user.getDszDeptName());
+                    this.tbHcBpcclBqMapper.insert(bq);
+                }
+                // 查询是否临控车辆
+                BkclVo bkclVo = this.getBkcl(dto.getHpzl(), dto.getHphm(), user, item);
+                if (bkclVo != null) {
+                    rybqdm.append("临控车辆").append(",");
+                    rybq.append("LKCL").append(",");
+                    // 保存车辆标签信息
+                    TbHcBpcclBq bq = new TbHcBpcclBq();
+                    bq.setPcywid(item.getId());
+                    bq.setBqmc("临控车辆");
+                    bq.setBqbh("LKCL");
+                    bq.setXtSjly("1");
+                    bq.setSsbmdm(String.valueOf(user.getDeptId()));
+                    bq.setSsbm(user.getDeptName());
+                    bq.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                    bq.setSsxgaj(user.getFxjDeptName());
+                    bq.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                    bq.setSssgaj(user.getDszDeptName());
+                    this.tbHcBpcclBqMapper.insert(bq);
+                }
+                item.setBqmc(rybq.toString().length() > 0 ? rybq.toString().substring(0, rybq.toString().length() - 1) : "");
+                item.setBqxxsj(rybqdm.toString().length() > 0 ? rybqdm.toString().substring(0, rybqdm.toString().length() - 1) : "");
+                item.setPcclJg("9");
+                item.setPcclJgmc("盘查");
+                this.baseMapper.insertEntity(item);
+                // 保存信息到巡逻盘查库中
+                this.saveClToXlpc(item, user);
+
+                TbHcBpcclVo clvo = new TbHcBpcclVo();
+                BeanUtils.copyProperties(item, clvo);
+                return clvo;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void saveBpccl(TbHcBpcclInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        if (StringUtils.isBlank(dto.getId())) {
+            throw new BusinessException("盘查Id不存在");
+        }
+        TbHcBpccl cl = this.baseMapper.selectById(dto.getId());
+        if (cl == null) {
+            throw new BusinessException("盘查对象不存在");
+        }
+        cl.setPcclJg(dto.getPcclJg());
+        cl.setPcclJgmc(dto.getPcclJgmc());
+        cl.setPcclYjdwdm(dto.getPcclYjdwdm());
+        cl.setPcclYjdw(dto.getPcclYjdw());
+        cl.setPcclYjyy(dto.getPcclYjyy());
+        // 查询当月数量
+        cl.setSsdwdycs(0);
+        this.baseMapper.updateEntity(cl);
+        // 保存图片信息
+        List<String> tpIdList = dto.getTpIdList();
+        this.saveTp(tpIdList, "tb_hc_bpccl", cl.getId());
+        // 保存物品信息
+        List<TbHcBpcclWpVo> clWpList = dto.getClWpList();
+        this.saveClTp(clWpList, cl);
+        // 保存同乘人员信息
+        List<String> rypcidList = dto.getRypcidList();
+        this.saveTcry(rypcidList, cl);
+        // 保存信息到巡逻盘查库中
+        this.saveClToXlpc(cl, user);
+    }
+
+    // 保存同乘人员信息
+    private void saveTcry(List<String> rypcidList, TbHcBpccl cl) {
+        if (!CollectionUtils.isEmpty(rypcidList)) {
+            rypcidList.forEach(item -> {
+                TbHcBpcry ry = this.tbHcBpcryMapper.selectById(item);
+                if (ry != null) {
+                    ry.setPcclId(cl.getId());
+                    this.tbHcBpcryMapper.updateById(ry);
+                }
+            });
+        }
+    }
+
+    @Override
+    public List<TbHcBpcclVo> getClOf2h() {
+        UserInfo user = UserInfoManager.get();
+        if (user != null) {
+            String sfzh = user.getIdEntityCard();
+            // 两小时之前
+            String time = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "H", -1), "02");
+            List<TbHcBpccl> list = this.baseMapper.getClOf2h(sfzh, time);
+            List<TbHcBpcclVo> voList = new ArrayList<>();
+            list.forEach(item -> {
+                TbHcBpcclVo vo = new TbHcBpcclVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+            return voList;
+        }
+        return new ArrayList<>();
+    }
+
+
+    @Override
+    public Map<String, Integer> getClpcCount(TbHcBpcclQuery dto) {
+        if (StringUtils.isBlank(dto.getJssj()) && StringUtils.isBlank(dto.getKssj())) {
+            String systemDateString = DateUtils.getSystemDateString();
+            dto.setKssj(systemDateString);
+            dto.setJssj(systemDateString);
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Integer> clMap = new HashMap<>();
+        dto.setPcclJg("");
+        map.put("dto", dto);
+        int All = this.baseMapper.getCountCl(map);
+        clMap.put("All", All);
+        dto.setPcclJg("1");
+        map.put("dto", dto);
+        int fx = this.baseMapper.getCountCl(map);
+        clMap.put("fx", fx);
+        dto.setPcclJg("2");
+        map.put("dto", dto);
+        int yj = this.baseMapper.getCountCl(map);
+        clMap.put("yj", yj);
+        dto.setPcclJg("9");
+        map.put("dto", dto);
+        int pc = this.baseMapper.getCountCl(map);
+        clMap.put("pc", pc);
+        return clMap;
+    }
+
+
+    @Override
+    public IPage<TbHcBpcclVo> getClpcList(TbHcBpcclQuery dto) {
+        if (StringUtils.isBlank(dto.getJssj()) && StringUtils.isBlank(dto.getKssj())) {
+            String systemDateString = DateUtils.getSystemDateString();
+            dto.setKssj(systemDateString);
+            dto.setJssj(systemDateString);
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbHcBpcclVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+//        UserInfo userInfo = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", userInfo));
+        int count = this.baseMapper.getCountCl(map);
+        List<TbHcBpccl> list = this.baseMapper.getListCl(map);
+        List<TbHcBpcclVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            // 查询盘查车辆图片
+            TbHcBpcclVo vo = new TbHcBpcclVo();
+            BeanUtils.copyProperties(item, vo);
+            // 查询人员照片信息
+            List<TbHcTp> tpList = this.tbHcTpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcTp>()
+                            .eq(TbHcTp::getLybm, "tb_hc_bpccl")
+                            .eq(TbHcTp::getLyid, item.getId())
+            );
+
+            if (!CollectionUtils.isEmpty(tpList)) {
+                List<TbHcTpVo> collect = tpList.stream().map(v -> {
+                    TbHcTpVo tbHcTpVo = new TbHcTpVo();
+                    BeanUtils.copyProperties(v, tbHcTpVo);
+                    return tbHcTpVo;
+                }).collect(Collectors.toList());
+                vo.setTpList(collect);
+            }
+
+            // 查询物品信息
+            List<TbHcBpcclWp> wpList = this.tbHcBpcclWpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcBpcclWp>()
+                            .eq(TbHcBpcclWp::getPcywid, item.getId())
+            );
+            // 车辆物品
+            List<TbHcBpcclWpVo> wpVoList = new ArrayList<>();
+            wpList.forEach(wp -> {
+                TbHcBpcclWpVo wpVo = new TbHcBpcclWpVo();
+                BeanUtils.copyProperties(wp, wpVo);
+                // 获取物品图片
+                List<TbHcTp> wpTpList = this.tbHcTpMapper.selectList(
+                        new LambdaQueryWrapper<TbHcTp>()
+                                .eq(TbHcTp::getLybm, "tb_hc_bpccl_wp")
+                                .eq(TbHcTp::getLyid, wp.getId())
+                );
+                List<String> wpTpIdList = wpTpList.stream().map(TbHcTp::getId).collect(Collectors.toList());
+                wpVo.setWpTpIdList(wpTpIdList);
+                wpVoList.add(wpVo);
+            });
+            vo.setWpVoList(wpVoList);
+            // 同乘人员
+            List<TbHcBpcry> ryList = this.tbHcBpcryMapper.selectList(
+                    new LambdaQueryWrapper<TbHcBpcry>()
+                            .eq(TbHcBpcry::getPcclId, item.getId())
+                            .eq(TbHcBpcry::getXtSjzt, "1")
+            );
+            List<TbHcBpcryVo> ryVoList = new ArrayList<>();
+            ryList.forEach(ry -> {
+                TbHcBpcryVo ryVo = new TbHcBpcryVo();
+                BeanUtils.copyProperties(ry, ryVo);
+                ryVoList.add(ryVo);
+            });
+            vo.setRyList(ryVoList);
+            rList.add(vo);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    // 保存人员物品列表信息
+    private void saveClTp(List<TbHcBpcclWpVo> ryWpList, TbHcBpccl cl) {
+        if (!CollectionUtils.isEmpty(ryWpList)) {
+            ryWpList.forEach(wpVo -> {
+                TbHcBpcclWp wp = new TbHcBpcclWp();
+                BeanUtils.copyProperties(wpVo, wp);
+                wp.setId(com.mosty.common.util.UUIDGenerator.getUUID());
+                wp.setPcywid(cl.getId());
+                wp.setXtSjly("2");
+                wp.setSsbmdm(cl.getSsbmdm());
+                wp.setSsbm(cl.getSsbm());
+                wp.setSsbmid(cl.getSsbmid());
+                wp.setSsxgajdm(cl.getSsxgajdm());
+                wp.setSsxgaj(cl.getSsxgaj());
+                wp.setSsxgajid(cl.getSsxgajid());
+                wp.setSssgajdm(cl.getSssgajdm());
+                wp.setSssgaj(cl.getSssgaj());
+                wp.setSssgajid(cl.getSssgajid());
+                this.tbHcBpcclWpMapper.insert(wp);
+                // 保存物品图片
+                List<String> wpTpIdList = wpVo.getWpTpIdList();
+                this.saveTp(wpTpIdList, "tb_hc_bpccl_wp", wp.getId());
+            });
+        }
+    }
+
+    // 保存图片信息
+    private void saveTp(List<String> tpIdList, String lybm, String lyid) {
+        if (!CollectionUtils.isEmpty(tpIdList)) {
+            tpIdList.forEach(item -> {
+                TbHcTp tp = new TbHcTp();
+                tp.setId(com.mosty.common.util.UUIDGenerator.getUUID());
+                tp.setLybm(lybm);
+                tp.setLyid(lyid);
+                tp.setXtSjly("2");
+                tp.setFjid(item);
+                this.tbHcTpMapper.insert(tp);
+            });
+        }
+    }
+
+    // 保存车辆信息到巡逻盘查中
+    private void saveClToXlpc(TbHcBpccl item, UserInfo user) {
+        BpcclSaveDto dto = new BpcclSaveDto();
+        BeanUtils.copyProperties(item, dto);
+        dto.setPcsj(DateUtils.getQueryDateString(item.getPcsj(), "02"));
+        dto.setPcdjd(item.getJd().doubleValue());
+        dto.setPcdwd(item.getWd().doubleValue());
+        dto.setIndustrialid(item.getPcmjJh());
+        dto.setUserid(item.getPcmjSfzh());
+        dto.setUsername(item.getPcmjXm());
+        dto.setSsdwdm(user.getDeptCode());
+        dto.setSsdwmc(user.getDeptName());
+        dto.setSsfsxdm(user.getFxjDeptCode());
+        dto.setSsfsxmc(user.getFxjDeptName());
+        dto.setSsdszdm(user.getDszDeptCode());
+        dto.setSsdszmc(user.getDszDeptName());
+        dto.setPccljg(item.getPcclJg());
+        dto.setPccljgmc(item.getPcclJgmc());
+        dto.setGlxtdm("73"); //德阳巡防
+        try {
+            Map map = Kit.beanToMap(dto);
+            HttpUtils.executePost(Constant.XLPC_URL + "kkpcPczqBpcclxxb/save", map);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 获取盗抢车辆信息
+    private DqclVo getDqcl(String hpzl, String hphm, UserInfo user) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("hpzl", hpzl);
+            params.put("hphm", hphm);
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "requestservice/zhk_Bdqjdcxx/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                if ("0".equals(code)) {
+                    String dataStr = json.getString("data");
+                    return JSONObject.parseObject(dataStr, DqclVo.class);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    // 获取布控车辆信息
+    private BkclVo getBkcl(String hpzl, String hphm, UserInfo user, TbHcBpccl item) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("hpzl", hpzl);
+            params.put("hphm", hphm);
+            params.put("kkid", "");
+            params.put("kkmc", "");
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            params.put("zdxh", item.getZdxh());
+            params.put("zdch", item.getZdch());
+            params.put("zdsim", item.getZdsim());
+            params.put("pcdjd", item.getJd().stripTrailingZeros().toPlainString());
+            params.put("pcdwd", item.getWd().stripTrailingZeros().toPlainString());
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "lkClxx/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                if ("0".equals(code)) {
+                    String dataStr = json.getString("data");
+                    return JSONObject.parseObject(dataStr, BkclVo.class);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    //查询车辆详情信息
+    private ClpcVo getClByHp(String hpzl, String hphm, UserInfo user, TbHcBpccl item) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("hpzl", hpzl);
+            params.put("hphm", hphm);
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            params.put("zdxh", item.getZdxh());
+            params.put("zdch", item.getZdch());
+            params.put("zdsim", item.getZdsim());
+            params.put("pcdjd", item.getJd().stripTrailingZeros().toPlainString());
+            params.put("pcdwd", item.getWd().stripTrailingZeros().toPlainString());
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "requestservice/jdc/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                String dataStr = json.getString("data");
+                if ("0".equals(code)) {
+                    JSONObject resJson = JSONObject.parseObject(dataStr);
+                    return JSON.toJavaObject(resJson, ClpcVo.class);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public Map<String, Integer> bpcclTj() {
+        Map<String, Integer> ryMap = new HashMap();
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        Integer integer = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpccl>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpccl::getSsbmdm, ssbm)
+                .ge(TbHcBpccl::getPcsj, DateUtils.getSystemDateString())
+        );
+        ryMap.put("all", integer);
+        Integer dq = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpccl>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpccl::getSsbmdm, ssbm)
+                .ge(TbHcBpccl::getPcsj, DateUtils.getSystemDateString())
+                .and(v -> v.like(TbHcBpccl::getBqmc, "DQ").or().like(TbHcBpccl::getBqmc, "盗抢"))
+        );
+        ryMap.put("dq", dq);
+        Integer lk = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpccl>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpccl::getSsbmdm, ssbm)
+                .ge(TbHcBpccl::getPcsj, DateUtils.getSystemDateString())
+                .and(v -> v.like(TbHcBpccl::getBqmc, "LK").or().like(TbHcBpccl::getBqmc, "临控"))
+        );
+        ryMap.put("lk", lk);
+        return ryMap;
+    }
+
+    @Override
+    public int getSjpcc(String ssbmdm, String time) {
+        return this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbHcBpccl>()
+                        .likeRight(!StringUtils.isEmpty(ssbmdm), TbHcBpccl::getSsbmdm, ssbmdm)
+                        .eq(TbHcBpccl::getPcrq, time)
+        );
+
+    }
+
+    @Override
+    public Object getPctj(HcTjQuery query) {
+        Map map = new HashMap();
+        IPage<HcTjQuery> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        IPage<Map<String, Object>> bmdmList = this.baseMapper.getPctj(page, query);
+        map.put("pageList", bmdmList);
+        //统计人员数
+        map.put("clsl", this.baseMapper.getPctjCl(query));
+        map.put("rysl", this.baseMapper.getPctjRy(query));
+        return map;
+    }
+
+    @Override
+    public int getPcWptj(String ssbmdm, String time) {
+        return this.baseMapper.getPcWptj(ssbmdm, time);
+    }
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcryServiceImpl.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcryServiceImpl.java
new file mode 100644
index 0000000..9b7f30b
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcBpcryServiceImpl.java
@@ -0,0 +1,1137 @@
+package com.mosty.hczx.service.Impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.hczx.BpcrySaveDto;
+import com.mosty.base.model.dto.hczx.Face;
+import com.mosty.base.model.dto.hczx.Repository;
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.entity.hczx.*;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import com.mosty.base.model.entity.lzother.TAlarmBkxxRy;
+import com.mosty.base.model.entity.lzother.TAlarmCkxx;
+import com.mosty.base.model.entity.lzother.TAlarmZtry;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.RyClTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcryQuery;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcryQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.hczx.*;
+import com.mosty.base.model.vo.yszx.TbYsRyBqUpdateDto;
+import com.mosty.base.model.vo.yszx.TbYsRyVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.mapper.SysDictItemMapper;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.UUIDGenerator;
+import com.mosty.hczx.mapper.*;
+import com.mosty.hczx.remote.TbBaseAdaptRemoteService;
+import com.mosty.hczx.remote.TbJcglAdaptRemoteService;
+import com.mosty.hczx.remote.TbLzotherAdapRemoteService;
+import com.mosty.hczx.remote.TbYszxAdapRemoteService;
+import com.mosty.hczx.service.TbHcBpcryService;
+import com.mosty.hczx.utils.*;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+
+@Service
+@AllArgsConstructor
+public class TbHcBpcryServiceImpl extends ServiceImpl<TbHcBpcryMapper, TbHcBpcry>
+        implements TbHcBpcryService {
+
+    private final TbHcTpMapper tbHcTpMapper;
+    private final TbHcBpcryWpMapper tbHcBpcryWpMapper;
+    private final TbHcBpcryBqMapper tbHcBpcryBqMapper;
+    private final TbHcBpcclBqMapper tbHcBpcclBqMapper;
+    private final TbHcBpcryTzbqMapper tbHcBpcryTzbqMapper;
+    private final TbHcBpcclMapper tbHcBpcclMapper;
+    private final TbYszxAdapRemoteService tbYszxAdapRemoteService;
+    private final RedisService redisService;
+    private final SysDictItemMapper sysDictItemMapper;
+    private final TbLzotherAdapRemoteService tbLzotherAdapRemoteService;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbHcDtgzMapper tbHcDtgzMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+
+    @Override
+    public Integer selectCrewCount() {
+
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.baseMapper.selectCrewCount(ssbm);
+    }
+
+    @Override
+    public IPage<TbHcBpcryVo> selectCrewList(TbHcTodayBpcryQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbHcBpcryVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+//        UserInfo userInfo = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", userInfo));
+        int count = this.baseMapper.getCount(map);
+        List<TbHcBpcry> list = this.baseMapper.getList(map);
+        List<TbHcBpcryVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbHcBpcryVo vo = new TbHcBpcryVo();
+            BeanUtils.copyProperties(item, vo);
+            rList.add(vo);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public TbHcBpcryVo selectRy(TbHcBpcryQuery dto) {
+        UserInfo user = UserInfoManager.get();
+
+        TbHcBpcry item = new TbHcBpcry();
+        BeanUtils.copyProperties(dto, item);
+        if (StringUtils.isNotBlank(dto.getSfzh())) {
+            // 根据身份证号查询
+            return this.selectRyBySfz(dto, user, item);
+        }
+        return null;
+    }
+
+    // 根据身份证号查询
+    private TbHcBpcryVo selectRyBySfz(TbHcBpcryQuery dto, UserInfo user, TbHcBpcry item) {
+        //先查询两个小时前自己是否查询过此人
+        TbHcBpcry tbHcBpcry = this.baseMapper.selectOne(new LambdaQueryWrapper<TbHcBpcry>()
+                .eq(TbHcBpcry::getSfzh, dto.getSfzh())
+                .ge(TbHcBpcry::getPcsj, DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "H", -2), "02"))
+                .eq(TbHcBpcry::getPcmjSfzh, user.getIdEntityCard()).last(" limit 1")
+        );
+        TbHcBpcryVo vo = new TbHcBpcryVo();
+        if (ObjectUtils.isNotEmpty(tbHcBpcry)) {
+            BeanUtils.copyProperties(tbHcBpcry, vo);
+            return vo;
+        } else {
+            RypcVo ry = this.getRyBySfz(dto.getSfzh(), user);
+            if (ry != null && StringUtils.isNotBlank(ry.getSfzh())) {
+                item.setId(UUIDGenerator.getUUID())
+                        .setSfzh(ry.getSfzh())
+                        .setXm(ry.getXm())
+                        .setXbdm(ry.getXb())
+                        .setCsrq(
+                                ry.getSfzh().substring(6, 10) + "-" +
+                                        ry.getSfzh().substring(10, 12) + "-" +
+                                        ry.getSfzh().substring(12, 14)
+                        ).setMzdm(ry.getMz())
+                        .setWhcddm(ry.getWhcd())
+                        .setJgdm(ry.getJgssx())
+                        .setZzxz(ry.getZzxz())
+                        .setPcrq(new Date())
+                        .setPcsj(new Date())
+                        .setXtSjly("2");
+                item.setXjzdz(ry.getZzxz());
+                item.setPcmjId(String.valueOf(user.getUserId())).setPcmjJh(user.getInDustRialId())
+                        .setPcmjSfzh(user.getIdEntityCard()).setPcmjXm(user.getUserName());
+                item.setSsbm(user.getDeptName());
+                item.setSsbmid(String.valueOf(user.getDeptId()));
+                item.setSsbmdm(user.getDeptCode());
+                item.setSsxgaj(user.getFxjDeptName());
+                item.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+                item.setSsxgajdm(user.getFxjDeptCode());
+                item.setSssgaj(user.getDszDeptName());
+                item.setSssgajid(String.valueOf(user.getDszDeptId()));
+                item.setSssgajdm(user.getDszDeptCode());
+
+                item.setZdch(dto.getZdch());
+                item.setZdxh(dto.getZdxh());
+                item.setZdsim(dto.getZdsim());
+
+
+                if (dto.getJd() == null || dto.getWd() == null) {
+                    // 默认为县公安局经纬度
+                    dto.setJd(Constant.JD).setWd(Constant.WD);
+                    item.setJd(Constant.JD).setWd(Constant.WD);
+                }
+                item.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()))
+                        .setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+                item.setPcclJg("9");
+                item.setPcclJgmc("盘查");
+                // 保存盘查数据
+                this.baseMapper.insertEntity(item);
+
+                // 保存信息到人员要素中
+                this.saveRyYs(item);
+                BeanUtils.copyProperties(item, vo);
+            }
+            if (ObjectUtils.isNotEmpty(vo)) {
+                // 查询该人物的特征标签
+                List<TbHcBpcryTzbq> tzList = this.tbHcBpcryTzbqMapper.selectList(
+                        new LambdaQueryWrapper<TbHcBpcryTzbq>()
+                                .eq(TbHcBpcryTzbq::getRysfzh, vo.getSfzh())
+                );
+                tzList = tzList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                        new TreeSet<>(Comparator.comparing(TbHcBpcryTzbq::getTzbqdm))), ArrayList::new));
+                vo.setTzList(tzList);
+                return vo;
+
+            }
+
+        }
+        return null;
+    }
+
+    // 保存信息到人员盘查库中
+    private void saveRyYs(TbHcBpcry ry) {
+        TbYsRyVo vo = this.tbYszxAdapRemoteService.getRyInfo(ry.getSfzh());
+        TbYsRyDto dto = new TbYsRyDto();
+        dto.setZjzl("1");
+        dto.setZjhm(ry.getSfzh());
+        dto.setXm(ry.getXm());
+        dto.setCsrq(
+                DateUtils.strToDate((ry.getSfzh().substring(6, 10) + "-" +
+                        ry.getSfzh().substring(10, 12) + "-" +
+                        ry.getSfzh().substring(12, 14)), "01")
+        );
+        dto.setMz(ry.getMzdm());
+        dto.setJg(ry.getJgdm());
+        dto.setHjdXzqh(ry.getSfzh().substring(0, 6));
+        dto.setHjdXz(ry.getZzxz());
+        dto.setJzdXzqh(ry.getSfzh().substring(0, 6));
+        dto.setJzdXz(ry.getZzxz());
+        dto.setLybm("tb_hc_bpcry");
+        dto.setLyid(ry.getId());
+        if (vo == null) {
+            dto.setId(UUIDGenerator.getUUID());
+            this.tbYszxAdapRemoteService.addRyYs(dto);
+        } else {
+            BeanUtils.copyProperties(vo, dto);
+            this.tbYszxAdapRemoteService.updateRyYs(dto);
+        }
+    }
+
+    // 保存信息到巡逻盘查库中
+    private void saveRyToXlpc(TbHcBpcry item, UserInfo user) {
+        BpcrySaveDto dto = new BpcrySaveDto();
+        BeanUtils.copyProperties(item, dto);
+        dto.setPcsj(DateUtils.getQueryDateString(item.getPcsj(), "02"));
+        dto.setPcdjd(item.getJd().doubleValue());
+        dto.setPcdwd(item.getWd().doubleValue());
+        dto.setIndustrialid(item.getPcmjJh());
+        dto.setUserid(item.getPcmjSfzh());
+        dto.setUsername(item.getPcmjXm());
+        dto.setSsdwdm(user.getDeptCode());
+        dto.setSsdwmc(user.getDeptName());
+        dto.setSsfsxdm(user.getFxjDeptCode());
+        dto.setSsfsxmc(user.getFxjDeptName());
+        dto.setSsdszdm(user.getDszDeptCode());
+        dto.setSsdszmc(user.getDszDeptName());
+        dto.setPccljg(item.getPcclJg());
+        dto.setPccljgmc(item.getPcclJgmc());
+        dto.setGlxtdm("73"); //德阳巡防
+        try {
+            Map map = Kit.beanToMap(dto);
+            HttpUtils.executePost(Constant.XLPC_URL + "kkpcPczqBpcryxxb/save", map);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 查询布控人员信息
+    private BkryVo getBkry(String sfzh, UserInfo user) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("sfzh", sfzh);
+            params.put("kkid", "");
+            params.put("kkmc", "");
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "lkRyxx/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                if ("0".equals(code)) {
+                    String dataStr = json.getString("data");
+                    return JSONObject.parseObject(dataStr, BkryVo.class);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    // 查询是否情报重点人员
+    private List<Map> getQbzdry(String sfzh, UserInfo user) {
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("sfzh", sfzh);
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "requestservice/qbZdry/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                if ("0".equals(code)) {
+                    String dataStr = json.getString("data");
+                    return JSONObject.parseArray(dataStr, Map.class);
+                }
+            }
+            return new ArrayList<>();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ArrayList<>();
+        }
+    }
+
+    // 根据身份证号查询人员信息
+    private RypcVo getRyBySfz(String sfzh, UserInfo user) {
+        try {
+            TbYsRyVo vo = null;
+            // 先查询人员要素表中的数据，如果存在，直接返回
+//            if ("520109".equals(user.getDeptCode().substring(0, 6))) {
+//                vo = this.tbYszxAdapRemoteService.getRyInfo(sfzh);
+//            }
+            if (vo != null) {
+                RypcVo pc = new RypcVo();
+                pc.setCsrq(
+                        sfzh.substring(6, 10) + "-" +
+                                sfzh.substring(10, 12) + "-" +
+                                sfzh.substring(12, 14)
+                );
+                int a = Integer.parseInt(sfzh.substring(16, 17)) % 2;
+                pc.setXb(a % 2 == 0 ? "2" : "1");
+                pc.setMz(vo.getMz());
+                pc.setSfzh(vo.getZjhm());
+                pc.setXm(vo.getXm());
+                pc.setZzxz(vo.getJzdXz());
+                pc.setJgssx(vo.getHjdXzqh());
+                return pc;
+            }
+            Map<String, Object> params = new HashMap<>();
+            params.put("sfzh", sfzh);
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            params.put("mobile", "");
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "requestservice/czrk/queryDetail", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                String dataStr = json.getString("data");
+                if ("0".equals(code)) {
+                    JSONObject resJson = JSONObject.parseObject(dataStr);
+                    return JSON.toJavaObject(resJson, RypcVo.class);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    @Transactional
+    public TbHcBpcryVo saveBpcryNfc(TbHcBpcry bpcry) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        bpcry.setId(UUIDGenerator.getUUID());
+        bpcry.setPcmjId(String.valueOf(user.getUserId())).setPcmjJh(user.getInDustRialId())
+                .setPcmjSfzh(user.getIdEntityCard()).setPcmjXm(user.getUserName());
+        bpcry.setSsbm(user.getDeptName());
+        bpcry.setSsbmid(String.valueOf(user.getDeptId()));
+        bpcry.setSsbmdm(user.getDeptCode());
+        bpcry.setSsxgaj(user.getFxjDeptName());
+        bpcry.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        bpcry.setSsxgajdm(user.getFxjDeptCode());
+        bpcry.setSssgaj(user.getDszDeptName());
+        bpcry.setSssgajid(String.valueOf(user.getDszDeptId()));
+        bpcry.setSssgajdm(user.getDszDeptCode());
+        bpcry.setXtSjly("2");
+        bpcry.setPcrq(new Date());
+        bpcry.setPcsj(new Date());
+        bpcry.setCsrq(
+                bpcry.getSfzh().substring(6, 10) + "-" +
+                        bpcry.getSfzh().substring(10, 12) + "-" +
+                        bpcry.getSfzh().substring(12, 14)
+        );
+
+        if (bpcry.getJd() == null || bpcry.getWd() == null) {
+            // 默认为县公安局经纬度
+            bpcry.setJd(Constant.JD).setWd(Constant.WD);
+
+            bpcry.setZb(JtsUtils.getPoint(bpcry.getJd(), bpcry.getWd()));
+            bpcry.setZbhash(GeoHashKit.encode(bpcry.getJd(), bpcry.getWd()));
+        }
+
+        bpcry.setPcclJg("9");
+        bpcry.setPcclJgmc("盘查");
+        // 查询当月数量
+        this.baseMapper.insertEntity(bpcry);
+        // 保存信息到巡逻盘查库中
+        this.saveRyToXlpc(bpcry, user);
+        // 保存信息到人员要素中
+        this.saveRyYs(bpcry);
+        TbHcBpcryVo vo = new TbHcBpcryVo();
+        BeanUtils.copyProperties(bpcry, vo);
+        // 查询该人物的特征标签
+        List<TbHcBpcryTzbq> tzList = this.tbHcBpcryTzbqMapper.selectList(
+                new LambdaQueryWrapper<TbHcBpcryTzbq>()
+                        .eq(TbHcBpcryTzbq::getRysfzh, vo.getSfzh())
+        );
+        tzList = tzList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                new TreeSet<>(Comparator.comparing(TbHcBpcryTzbq::getTzbqdm))), ArrayList::new));
+        vo.setTzList(tzList);
+        return vo;
+    }
+
+
+    @Override
+    @Transactional
+    public void saveBpcry(TbHcBpcryInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        if (StringUtils.isBlank(dto.getId())) {
+            throw new BusinessException("盘查Id不存在");
+        }
+        TbHcBpcry ry = this.baseMapper.selectById(dto.getId());
+        if (ry == null) {
+            throw new BusinessException("盘查对象不存在");
+        }
+        ry.setPcclJg(dto.getPcclJg());
+        ry.setPcclJgmc(dto.getPcclJgmc());
+        ry.setPcclYjdwdm(dto.getPcclYjdwdm());
+        ry.setPcclYjdw(dto.getPcclYjdw());
+        ry.setPcclYjyy(dto.getPcclYjyy());
+        ry.setPcclId(dto.getPcclId());
+        // 查询当月数量
+        ry.setSsdwdycs(0);
+        this.baseMapper.updateEntity(ry);
+        // 保存图片信息
+        List<String> tpIdList = dto.getTpIdList();
+        this.saveTp(tpIdList, "tb_hc_bpcry", ry.getId());
+        // 保存物品信息
+        List<TbHcBpcryWpVo> ryWpList = dto.getRyWpList();
+        this.saveRyTp(ryWpList, ry);
+        // 保存人员特征标签信息
+        List<TbHcBpcryTzbq> tzbqList = dto.getTzbqList();
+        this.saveTzbq(tzbqList, ry);
+        // 保存信息到巡逻盘查库中
+        this.saveRyToXlpc(ry, user);
+    }
+
+
+    @Override
+    public Map<String, Object> getRyBqBySfzh(String sfzh) {
+        UserInfo user = UserInfoManager.get();
+        // 查询是否重点人员
+        List<Map> zdryList = this.getQbzdry(sfzh, user);
+        StringBuilder rybqdm = new StringBuilder();
+        StringBuilder rybq = new StringBuilder();
+        if (zdryList != null && zdryList.size() > 0) {
+            zdryList.forEach(it -> {
+                rybqdm.append(it.get("matchname")).append(",");
+                rybq.append(it.get("matchtype")).append(",");
+            });
+        }
+        // 查询是否布控人员
+        BkryVo bkryVo = this.getBkry(sfzh, user);
+        if (bkryVo != null) {
+            rybqdm.append("临控人员").append(",");
+            rybq.append("LKRY").append(",");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("bqmc", rybq.toString().length() > 0 ? rybq.substring(0, rybq.toString().length() - 1) : "");
+        map.put("bqxxsj", rybqdm.toString().length() > 0 ? rybqdm.substring(0, rybqdm.toString().length() - 1) : "");
+        return map;
+    }
+
+
+    @Override
+    public Map<String, Object> getRyBq(String id) {
+        UserInfo user = UserInfoManager.get();
+        TbHcBpcry item = this.baseMapper.selectById(id);
+        // 查询是否重点人员
+        List<Map> zdryList = this.getQbzdry(item.getSfzh(), user);
+        StringBuilder rybqdm = new StringBuilder();
+        StringBuilder rybq = new StringBuilder();
+        if (zdryList != null && zdryList.size() > 0) {
+            zdryList.forEach(it -> {
+                rybqdm.append(it.get("matchname")).append(",");
+                rybq.append(it.get("matchtype")).append(",");
+                // 保存人员标签信息
+                TbHcBpcryBq bq = new TbHcBpcryBq();
+                bq.setPcywid(item.getId());
+                bq.setBqmc(it.get("matchtype").toString());
+                bq.setBqbh(it.get("matchname").toString());
+                bq.setXtSjly("1");
+                bq.setSsbmdm(String.valueOf(user.getDeptId()));
+                bq.setSsbm(user.getDeptName());
+                bq.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                bq.setSsxgaj(user.getFxjDeptName());
+                bq.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                bq.setSssgaj(user.getDszDeptName());
+
+
+                this.tbHcBpcryBqMapper.insert(bq);
+                // 修改人员标签要素表中的数据
+                TbYsRyBqUpdateDto dto = new TbYsRyBqUpdateDto();
+                dto.setSfzh(item.getSfzh());
+                dto.setBqdm(it.get("matchname").toString());
+                dto.setBqmc(it.get("matchtype").toString());
+                this.tbYszxAdapRemoteService.updateRyBqYs(dto);
+            });
+        }
+        // 查询是否布控人员
+        BkryVo bkryVo = this.getBkry(item.getSfzh(), user);
+        if (bkryVo != null) {
+            rybqdm.append("临控人员").append(",");
+            rybq.append("LKRY").append(",");
+            // 保存人员标签信息
+            TbHcBpcryBq bq = new TbHcBpcryBq();
+            bq.setPcywid(item.getId());
+            bq.setBqmc("临控人员");
+            bq.setBqbh("LKRY");
+            bq.setXtSjly("1");
+
+            bq.setSsbmdm(String.valueOf(user.getDeptId()));
+            bq.setSsbm(user.getDeptName());
+            bq.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+            bq.setSsxgaj(user.getFxjDeptName());
+            bq.setSssgajdm(String.valueOf(user.getDszDeptId()));
+            bq.setSssgaj(user.getDszDeptName());
+
+
+            this.tbHcBpcryBqMapper.insert(bq);
+            // 修改人员标签要素表中的数据
+            TbYsRyBqUpdateDto dto = new TbYsRyBqUpdateDto();
+            dto.setSfzh(item.getSfzh());
+            dto.setBqdm("LKRY");
+            dto.setBqmc("临控人员");
+            this.tbYszxAdapRemoteService.updateRyBqYs(dto);
+        }
+        item.setBqmc(rybq.toString().length() > 0 ? rybq.substring(0, rybq.toString().length() - 1) : "");
+        item.setBqxxsj(rybqdm.toString().length() > 0 ? rybqdm.substring(0, rybqdm.toString().length() - 1) : "");
+        this.baseMapper.updateEntity(item);
+        //在这里推送数据到巡逻盘查 带上标签的推送 不能再核查哪里直接推送要出问题呢
+        this.saveRyToXlpc(item, user);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("bqmc", item.getBqmc());
+        map.put("bqxxsj", item.getBqxxsj());
+        return map;
+    }
+
+//    private final String[] jmxzjqList = new String[]{"02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+//            "02050400", "02121700", "02130000"};
+
+    /**
+     * 泸州态势统计-各区县盘查工作
+     *
+     * @param dto
+     * @return 10111    泸州机场分局
+     * 10929	江阳区分局
+     * 11336	龙马潭区分局
+     * 11379	纳溪区
+     * 11382	泸县
+     * 11436	合江县
+     * 11503	叙永县
+     * 11531	古蔺县
+     */
+    @Override
+    public Map<String, Object> getGqxpc(RyClTjQuery dto) {
+        HashMap<Object, Object> ssxgajxx = new HashMap<>();
+        ssxgajxx.put("10111", "泸州机场");
+        ssxgajxx.put("10929", "江阳区");
+        ssxgajxx.put("11336", "龙马潭区");
+        ssxgajxx.put("11379", "纳溪区");
+        ssxgajxx.put("11382", "泸县");
+        ssxgajxx.put("11436", "合江县");
+        ssxgajxx.put("11503", "叙永县");
+        ssxgajxx.put("11531", "古蔺县");
+
+
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) { // 为空的提示
+            throw new BusinessException("请选择您要查询时间！");
+        }
+        Map<String, Object> map = new HashMap<>();
+        // 盘查人员
+        List<Map<String, Object>> ryList = this.baseMapper.selectPcryTj(dto.getKssj(), dto.getJssj());
+        // 盘查车辆
+        List<Map<String, Object>> clList = this.tbHcBpcclMapper.selectPcclTj(dto.getKssj(), dto.getJssj());
+        // 重点人员
+        List<Map<String, Object>> zdryList = this.baseMapper.selectZdryTj(dto.getKssj(), dto.getJssj());
+        // 重点车辆
+        List<Map<String, Object>> zdclList = this.tbHcBpcclMapper.selectZdclTj(dto.getKssj(), dto.getJssj());
+
+        List<Map<String, Object>> ryResList = new ArrayList<>();
+        List<Map<String, Object>> clResList = new ArrayList<>();
+        List<Map<String, Object>> zdryResList = new ArrayList<>();
+        List<Map<String, Object>> zdclResList = new ArrayList<>();
+        ssxgajxx.keySet().forEach(item -> {
+            // 人员
+            Map<String, Object> resMap = new HashMap<>();
+            List<Map<String, Object>> list = ryList.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (list.size() == 1) {
+                resMap.put("count", list.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            ryResList.add(resMap);
+
+            // 车
+            resMap = new HashMap<>();
+            List<Map<String, Object>> cllist1 = clList.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (cllist1.size() == 1) {
+                resMap.put("count", cllist1.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            clResList.add(resMap);
+
+            // 重点人员
+            resMap = new HashMap<>();
+            List<Map<String, Object>> zdrylist1 = zdryList.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (zdrylist1.size() == 1) {
+                resMap.put("count", zdrylist1.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            zdryResList.add(resMap);
+            // 重点车辆
+            resMap = new HashMap<>();
+            List<Map<String, Object>> zdcllist1 = zdclList.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (zdcllist1.size() == 1) {
+                resMap.put("count", zdcllist1.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            zdclResList.add(resMap);
+        });
+        map.put("ryResList", ryResList);
+        map.put("clResList", clResList);
+        map.put("zdryResList", zdryResList);
+        map.put("zdclResList", zdclResList);
+        return map;
+    }
+
+    @Override
+    public List<RyZpSearchVo> getRyListByZp(MultipartFile file) {
+        if (file == null) {
+            return new ArrayList<>();
+        }
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        String base64 = Kit.fileToBase64(file);
+        Map<String, Object> params = new HashMap<>();
+        params.put("xp", base64);
+        params.put("userid", user.getIdEntityCard());
+        params.put("username", user.getUserName());
+        params.put("ssdwdm", user.getDeptCode());
+        params.put("ssdwmc", user.getDeptName());
+        params.put("ssfsxdm", user.getFxjDeptCode());
+        params.put("ssfsxmc", user.getFxjDeptName());
+        params.put("ssdszdm", user.getDszDeptCode());
+        params.put("ssdszmc", user.getDszDeptName());
+        params.put("industrialid", user.getInDustRialId());
+        params.put("mobile", "");
+        String result = HttpUtils.executePost(Constant.XLPC_URL + "kkpcPczqZp/queryYtRxbd", params);
+        if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+            JSONObject json = JSONObject.parseObject(result);
+            String code = json.getString("code");
+            if ("0".equals(code)) {
+                String dataStr = json.getString("data");
+                List<RyZpSearchVo> list = JSONObject.parseArray(dataStr, RyZpSearchVo.class);
+                if (!CollectionUtils.isEmpty(list)) {
+                    list.forEach(item -> {
+                        // 查询人像图片
+                        item.setUrl(Constant.XLPC_URL + "kkpcPczqZp/getYtImg.jpg?uri_base64=" + item.getXp());
+                    });
+                }
+                return list;
+            }
+        }
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<Map> getRyListBySjhm(String mobile) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("mobile", mobile);
+            params.put("userid", user.getIdEntityCard());
+            params.put("username", user.getUserName());
+            params.put("ssdwdm", user.getDeptCode());
+            params.put("ssdwmc", user.getDeptName());
+            params.put("ssfsxdm", user.getFxjDeptCode());
+            params.put("ssfsxmc", user.getFxjDeptName());
+            params.put("ssdszdm", user.getDszDeptCode());
+            params.put("ssdszmc", user.getDszDeptName());
+            params.put("industrialid", user.getInDustRialId());
+            String result = HttpUtils.executePost(Constant.XLPC_URL + "requestservice/czrk/queryListByMobile", params);
+            if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+                JSONObject json = JSONObject.parseObject(result);
+                String code = json.getString("code");
+                if ("0".equals(code)) {
+                    String dataStr = json.getString("data");
+                    return JSONObject.parseArray(dataStr, Map.class);
+                }
+            }
+            return new ArrayList<>();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public Map<String, Integer> getRypcCount(TbHcBpcryQuery dto) {
+        if (StringUtils.isBlank(dto.getJssj()) && StringUtils.isBlank(dto.getKssj())) {
+            String systemDateString = DateUtils.getSystemDateString();
+            dto.setKssj(systemDateString);
+            dto.setJssj(systemDateString);
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Integer> ryMap = new HashMap<>();
+        dto.setPcclJg("");
+        map.put("dto", dto);
+        int All = this.baseMapper.getCountRy(map);
+        ryMap.put("All", All);
+        dto.setPcclJg("1");
+        map.put("dto", dto);
+        int fx = this.baseMapper.getCountRy(map);
+        ryMap.put("fx", fx);
+        dto.setPcclJg("2");
+        map.put("dto", dto);
+        int yj = this.baseMapper.getCountRy(map);
+        ryMap.put("yj", yj);
+        dto.setPcclJg("9");
+        map.put("dto", dto);
+        int pc = this.baseMapper.getCountRy(map);
+        ryMap.put("pc", pc);
+        return ryMap;
+    }
+
+    @Override
+    public IPage<TbHcBpcryVo> getRypcList(TbHcBpcryQuery dto) {
+        if (StringUtils.isBlank(dto.getJssj()) && StringUtils.isBlank(dto.getKssj())) {
+            String systemDateString = DateUtils.getSystemDateString();
+            dto.setKssj(systemDateString);
+            dto.setJssj(systemDateString);
+        }
+        IPage<TbHcBpcryVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        int count = this.baseMapper.getCountRy(map);
+        List<TbHcBpcry> list = this.baseMapper.getListRy(map);
+        List<TbHcBpcryVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbHcBpcryVo vo = new TbHcBpcryVo();
+            BeanUtils.copyProperties(item, vo);
+            // 查询人员照片信息
+            List<TbHcTp> tpList = this.tbHcTpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcTp>()
+                            .eq(TbHcTp::getLybm, "tb_hc_bpcry")
+                            .eq(TbHcTp::getLyid, item.getId())
+                            .orderByAsc(TbHcTp::getOrderno)
+            );
+            if(!CollectionUtils.isEmpty(tpList)){
+                List<TbHcTpVo> collect = tpList.stream().map(v -> {
+                    TbHcTpVo tbHcTpVo = new TbHcTpVo();
+                    BeanUtils.copyProperties(v, tbHcTpVo);
+                    return tbHcTpVo;
+                }).collect(Collectors.toList());
+                vo.setTpList(collect);
+            }
+            // 查询物品信息
+            List<TbHcBpcryWp> wpList = this.tbHcBpcryWpMapper.selectList(
+                    new LambdaQueryWrapper<TbHcBpcryWp>()
+                            .eq(TbHcBpcryWp::getPcywid, item.getId())
+            );
+            List<TbHcBpcryWpVo> wpVoList = new ArrayList<>();
+            wpList.forEach(wp -> {
+                TbHcBpcryWpVo wpVo = new TbHcBpcryWpVo();
+                BeanUtils.copyProperties(wp, wpVo);
+                // 获取物品图片
+                List<TbHcTp> wpTpList = this.tbHcTpMapper.selectList(
+                        new LambdaQueryWrapper<TbHcTp>()
+                                .eq(TbHcTp::getLybm, "tb_hc_bpcry_wp")
+                                .eq(TbHcTp::getLyid, wp.getId())
+                                .orderByAsc(TbHcTp::getOrderno)
+                );
+                List<String> wpTpIdList = wpTpList.stream().map(TbHcTp::getFjid).collect(Collectors.toList());
+                wpVo.setWpTpIdList(wpTpIdList);
+                wpVoList.add(wpVo);
+            });
+            vo.setWpVoList(wpVoList);
+            rList.add(vo);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    public List<TbHcBpcryVo> getRyOf2h() {
+        UserInfo user = UserInfoManager.get();
+        if (user != null) {
+            String sfzh = user.getIdEntityCard();
+            // 两小时之前
+            String time = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "H", -1), "02");
+            List<TbHcBpcry> list = this.baseMapper.getRyOf2h(sfzh, time);
+            List<TbHcBpcryVo> voList = new ArrayList<>();
+            list.forEach(item -> {
+                TbHcBpcryVo vo = new TbHcBpcryVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+            return voList;
+        }
+        return new ArrayList<>();
+    }
+
+    // 保存人员特征标签信息
+    private void saveTzbq(List<TbHcBpcryTzbq> tzbqList, TbHcBpcry ry) {
+        this.tbHcBpcryTzbqMapper.delete(
+                new LambdaQueryWrapper<TbHcBpcryTzbq>()
+                        .eq(TbHcBpcryTzbq::getRysfzh, ry.getSfzh())
+        );
+        if (!CollectionUtils.isEmpty(tzbqList)) {
+            tzbqList.forEach(bq -> {
+                bq.setId(UUIDGenerator.getUUID());
+                bq.setPcywid(ry.getId());
+                bq.setXtSjly("1");
+                this.tbHcBpcryTzbqMapper.insert(bq);
+            });
+        }
+    }
+
+    // 保存人员物品列表信息
+    private void saveRyTp(List<TbHcBpcryWpVo> ryWpList, TbHcBpcry ry) {
+        if (!CollectionUtils.isEmpty(ryWpList)) {
+            ryWpList.forEach(wpVo -> {
+                TbHcBpcryWp wp = new TbHcBpcryWp();
+                BeanUtils.copyProperties(wpVo, wp);
+                wp.setId(UUIDGenerator.getUUID());
+                wp.setPcywid(ry.getId());
+                wp.setXtSjly("2");
+                wp.setSsbmdm(ry.getSsbmdm());
+                wp.setSsbm(ry.getSsbm());
+                wp.setSsbmid(ry.getSsbmid());
+                wp.setSsxgajdm(ry.getSsxgajdm());
+                wp.setSsxgaj(ry.getSsxgaj());
+                wp.setSsxgajid(ry.getSsxgajid());
+                wp.setSssgajdm(ry.getSssgajdm());
+                wp.setSssgaj(ry.getSssgaj());
+                wp.setSssgajid(ry.getSssgajid());
+
+                this.tbHcBpcryWpMapper.insert(wp);
+                // 保存物品图片
+                List<String> wpTpIdList = wpVo.getWpTpIdList();
+                this.saveTp(wpTpIdList, "tb_hc_bpcry_wp", wp.getId());
+            });
+        }
+    }
+
+    // 保存图片信息
+    private void saveTp(List<String> tpIdList, String lybm, String lyid) {
+        if (!CollectionUtils.isEmpty(tpIdList)) {
+            tpIdList.forEach(item -> {
+                TbHcTp tp = new TbHcTp();
+                tp.setId(UUIDGenerator.getUUID());
+                tp.setLybm(lybm);
+                tp.setLyid(lyid);
+                tp.setXtSjly("2");
+                tp.setFjid(item);
+                this.tbHcTpMapper.insert(tp);
+            });
+        }
+    }
+
+    @Override
+    public List<RyZpSearchVo> getRyListByBase64(String base64Str) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        Map<String, Object> params = new HashMap<>();
+        params.put("xp", base64Str);
+        params.put("userid", user.getIdEntityCard());
+        params.put("username", user.getUserName());
+        params.put("ssdwdm", user.getDeptCode());
+        params.put("ssdwmc", user.getDeptName());
+        params.put("ssfsxdm", user.getFxjDeptCode());
+        params.put("ssfsxmc", user.getFxjDeptName());
+        params.put("ssdszdm", user.getDszDeptCode());
+        params.put("ssdszmc", user.getDszDeptName());
+        params.put("industrialid", user.getInDustRialId());
+        params.put("mobile", "");
+        String result = HttpUtils.executePost(Constant.XLPC_URL + "kkpcPczqZp/queryYtRxbd", params);
+        if (com.mosty.common.base.util.StringUtils.isNotBlank(result)) {
+            JSONObject json = JSONObject.parseObject(result);
+            String code = json.getString("code");
+            if ("0".equals(code)) {
+                String dataStr = json.getString("data");
+                List<RyZpSearchVo> list = JSONObject.parseArray(dataStr, RyZpSearchVo.class);
+                if (!CollectionUtils.isEmpty(list)) {
+                    list.forEach(item -> {
+                        // 查询人像图片
+                        item.setUrl(Constant.XLPC_URL + "kkpcPczqZp/getYtImg.jpg?uri_base64=" + item.getXp());
+                    });
+                }
+                return list;
+            }
+        }
+        return new ArrayList<>();
+    }
+
+
+    private void pushSse(TbHcDtgz dtgz) {
+        TbHcDtgz sseMs = dtgz;
+        Map<String, SseEmitter> sseCache = Constant.HcSse;
+        for (String key : sseCache.keySet()) {
+            String glid = StringUtils.split("_", key)[0];
+            if (glid.equals(dtgz.getGlid())) {
+                SseEmitter sseEmitter = Constant.HcSse.get(key);
+                if (sseEmitter != null) {
+                    System.out.println("SSE发送数据---》" + JSONObject.toJSONString(sseMs));
+                    try {
+                        sseEmitter.send(JSONObject.toJSONString(sseMs));
+                    } catch (Exception e) {
+                        sseCache.remove(key);
+                        System.out.println("SSE发送失败-------->" + e.getMessage());
+                    }
+                }
+            }
+        }
+
+    }
+
+    public static String sfzhToCsrq(String sfzh) {
+        try {
+            return sfzh.substring(6, 10) + "-" + sfzh.substring(10, 12) + "-"
+                    + sfzh.substring(12, 14);
+        } catch (Exception ex) {
+            return "";
+        }
+    }
+
+    @Override
+    public Map<String, Object> xfzgtjAll(HcTjQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        //总数
+        int zs = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                .likeRight(TbHcBpcryBq::getSsbmdm, query.getSsbmdm())
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+        map.put("zs", zs);
+        //查询在逃
+        int zt = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                .likeRight(TbHcBpcryBq::getSsbmdm, query.getSsbmdm())
+                .like(TbHcBpcryBq::getBqmc, "ZT")
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+        map.put("zt", zt);
+        //查询临控
+        int lk = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                .likeRight(TbHcBpcryBq::getSsbmdm, query.getSsbmdm())
+                .like(TbHcBpcryBq::getBqmc, "LK")
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+        map.put("lk", lk);
+        //查询涉毒
+        int sd = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                .likeRight(TbHcBpcryBq::getSsbmdm, query.getSsbmdm())
+                .like(TbHcBpcryBq::getBqmc, "XFD")
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+        map.put("sd", sd);
+        //查询前科
+        int qk = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                .likeRight(TbHcBpcryBq::getSsbmdm, query.getSsbmdm())
+                .like(TbHcBpcryBq::getBqmc, "QK")
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+        map.put("qk", qk);
+        map.put("qt", (zs - zt - lk - sd - qk) < 0 ? 0 : (zs - zt - lk - sd - qk));
+        return map;
+    }
+
+
+    @Override
+    public Map<String, List<Map<String, Object>>> getZgtj(HcTjQuery query) {
+        Map<String, List<Map<String, Object>>> map = new HashMap<>();
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        if (StringUtils.isBlank(query.getKssj())) {
+            query.setKssj(DateUtils.getNowDate() + " 00:00:00");
+        }
+        map.put("ryzg", this.baseMapper.getRyBqtj(query));
+        map.put("clzg", this.baseMapper.getClBqtj(query));
+        return map;
+    }
+
+
+    @Override
+    public IPage<Map<String, Object>> xfzgtj(HcTjQuery query) {
+        //首先查询部门分页 分页以后查询数据
+        IPage<HcTjQuery> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        IPage<String> bmdmList = this.baseMapper.getSsbm(page, query);
+        if (ObjectUtils.isNotEmpty(bmdmList) && !CollectionUtils.isEmpty(bmdmList.getRecords())) {
+            List<String> records = bmdmList.getRecords();
+            List<Map<String, Object>> list = new ArrayList<>();
+            for (String s : records) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("ssbmdm", s);
+                DeptInfoVo deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(s);
+                map.put("ssbm", deptInfoVo.getDeptname());
+                //总数
+                int zs = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                        .eq(TbHcBpcryBq::getSsbmdm, s)
+                        .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                        .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+                map.put("zs", zs);
+                //查询在逃
+                int zt = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                        .eq(TbHcBpcryBq::getSsbmdm, s)
+                        .like(TbHcBpcryBq::getBqmc, "ZT")
+                        .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                        .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+                map.put("zt", zt);
+                //查询临控
+                int lk = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                        .eq(TbHcBpcryBq::getSsbmdm, s)
+                        .like(TbHcBpcryBq::getBqmc, "LK")
+                        .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                        .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+                map.put("lk", lk);
+                //查询涉毒
+                int sd = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                        .eq(TbHcBpcryBq::getSsbmdm, s)
+                        .like(TbHcBpcryBq::getBqmc, "XFD")
+                        .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                        .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+                map.put("sd", sd);
+                //查询前科
+                int qk = this.tbHcBpcryBqMapper.selectCount(new LambdaQueryWrapper<TbHcBpcryBq>()
+                        .eq(TbHcBpcryBq::getSsbmdm, s)
+                        .like(TbHcBpcryBq::getBqmc, "QK")
+                        .ge(StringUtils.isNotBlank(query.getKssj()), TbHcBpcryBq::getXtCjsj, query.getKssj())
+                        .le(StringUtils.isNotBlank(query.getJssj()), TbHcBpcryBq::getXtCjsj, query.getJssj()));
+                map.put("qk", qk);
+                map.put("qt", (zs - zt - lk - sd - qk) < 0 ? 0 : (zs - zt - lk - sd - qk));
+                list.add(map);
+            }
+            IPage<Map<String, Object>> iPage = new Page<>();
+            BeanUtils.copyProperties(bmdmList, iPage);
+            iPage.setRecords(list);
+            return iPage;
+        }
+        return new Page<>();
+    }
+
+    @Override
+    public Map<String, Integer> bpcryTj() {
+        Map<String, Integer> ryMap = new HashMap();
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        Integer integer = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpcry>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpcry::getSsbmdm, ssbm)
+                .ge(TbHcBpcry::getPcsj, DateUtils.getSystemDateString())
+        );
+        ryMap.put("all", integer);
+        Integer zt = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpcry>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpcry::getSsbmdm, ssbm)
+                .ge(TbHcBpcry::getPcsj, DateUtils.getSystemDateString())
+                .and(v -> v.like(TbHcBpcry::getBqmc, "ZT").or().like(TbHcBpcry::getBqmc, "在逃"))
+        );
+        ryMap.put("zt", zt);
+        Integer sd = this.baseMapper.selectCount(new LambdaQueryWrapper<TbHcBpcry>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbHcBpcry::getSsbmdm, ssbm)
+                .ge(TbHcBpcry::getPcsj, DateUtils.getSystemDateString())
+                .and(v -> v.like(TbHcBpcry::getBqmc, "D").or().like(TbHcBpcry::getBqmc, "毒"))
+        );
+        ryMap.put("sd", sd);
+        return ryMap;
+    }
+
+    @Override
+    public int getSjpcr(String ssbmdm, String time) {
+        return this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbHcBpcry>()
+                        .likeRight(!StringUtils.isEmpty(ssbmdm), TbHcBpcry::getSsbmdm, ssbmdm)
+                        .eq(TbHcBpcry::getPcrq, time)
+        );
+
+    }
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcDtgzServiceImpl.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcDtgzServiceImpl.java
new file mode 100644
index 0000000..fcca1b7
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcDtgzServiceImpl.java
@@ -0,0 +1,51 @@
+package com.mosty.hczx.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.hczx.TbHcDtgzDto;
+import com.mosty.base.model.entity.hczx.TbHcDtgz;
+import com.mosty.hczx.mapper.TbHcDtgzMapper;
+import com.mosty.hczx.service.TbHcDtgzService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class TbHcDtgzServiceImpl extends ServiceImpl<TbHcDtgzMapper, TbHcDtgz> implements TbHcDtgzService {
+
+
+    @Override
+    public List<TbHcDtgz> getList(TbHcDtgzDto dtgz) {
+
+        LambdaQueryWrapper<TbHcDtgz> eq = new LambdaQueryWrapper<TbHcDtgz>();
+        eq.eq(StringUtils.isNotBlank(dtgz.getGlid()), TbHcDtgz::getGlid, dtgz.getGlid())
+                .eq(StringUtils.isNotBlank(dtgz.getJrlx()), TbHcDtgz::getJrlx, dtgz.getJrlx())
+                .eq(StringUtils.isNotBlank(dtgz.getSbly()), TbHcDtgz::getSbly, dtgz.getSbly())
+                .ge(StringUtils.isNotBlank(dtgz.getXsd()), TbHcDtgz::getXsd, dtgz.getXsd())
+                .like(StringUtils.isNotBlank(dtgz.getBqmc()), TbHcDtgz::getBqmc, dtgz.getBqmc())
+                .eq(StringUtils.isNotBlank(dtgz.getSbbm()), TbHcDtgz::getSbbm, dtgz.getSbbm())
+                .eq(StringUtils.isNotBlank(dtgz.getSbmc()), TbHcDtgz::getSbmc, dtgz.getSbmc())
+                .orderByDesc(TbHcDtgz::getXtCjsj)
+
+        ;
+        if (!CollectionUtils.isEmpty(dtgz.getBqList())) {
+            for (String bq : dtgz.getBqList()) {
+                eq.like(TbHcDtgz::getBqmc, bq);
+            }
+        }
+
+        List<TbHcDtgz> tbHcDtgzs = this.baseMapper.selectList(eq);
+        if (!CollectionUtils.isEmpty(tbHcDtgzs)) {
+            tbHcDtgzs = tbHcDtgzs.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TbHcDtgz::getSfzh))), ArrayList::new));
+        }
+        return tbHcDtgzs;
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcRytzbqServiceImpl.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcRytzbqServiceImpl.java
new file mode 100644
index 0000000..150962c
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcRytzbqServiceImpl.java
@@ -0,0 +1,48 @@
+package com.mosty.hczx.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.hczx.TbHcRytzbq;
+import com.mosty.base.model.query.hczx.TbHcRytzbqQuery;
+import com.mosty.hczx.mapper.TbHcRytzbqMapper;
+import com.mosty.hczx.service.TbHcRytzbqService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Service
+public class TbHcRytzbqServiceImpl extends ServiceImpl<TbHcRytzbqMapper, TbHcRytzbq>
+        implements TbHcRytzbqService {
+
+    @Override
+    public IPage<TbHcRytzbq> selectPage(TbHcRytzbqQuery dto) {
+        dto.setPageCurrent(dto.getPageCurrent() == null ? 1 : dto.getPageCurrent());
+        dto.setPageSize(dto.getPageSize() == null ? 10 : dto.getPageSize());
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbHcRytzbq>()
+                        .eq(StringUtils.isNotBlank(dto.getTzbqdm()), TbHcRytzbq::getTzbqdm, dto.getTzbqdm())
+                        .eq(StringUtils.isNotBlank(dto.getTzbqlb()), TbHcRytzbq::getTzbqlb, dto.getTzbqlb())
+                        .like(StringUtils.isNotBlank(dto.getTzbqmc()), TbHcRytzbq::getTzbqmc, dto.getTzbqmc())
+                        .eq(StringUtils.isNotBlank(dto.getTzsx()), TbHcRytzbq::getTzsx, dto.getTzsx())
+        );
+    }
+
+    @Override
+    public List<TbHcRytzbq> selectList(TbHcRytzbq dto) {
+        return this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbHcRytzbq>()
+                        .eq(StringUtils.isNotBlank(dto.getTzbqdm()), TbHcRytzbq::getTzbqdm, dto.getTzbqdm())
+                        .eq(StringUtils.isNotBlank(dto.getTzbqlb()), TbHcRytzbq::getTzbqlb, dto.getTzbqlb())
+                        .like(StringUtils.isNotBlank(dto.getTzbqmc()), TbHcRytzbq::getTzbqmc, dto.getTzbqmc())
+                        .eq(StringUtils.isNotBlank(dto.getTzsx()), TbHcRytzbq::getTzsx, dto.getTzsx())
+        );
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcSydjServiceImpl.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcSydjServiceImpl.java
new file mode 100644
index 0000000..ff5ffb8
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/Impl/TbHcSydjServiceImpl.java
@@ -0,0 +1,122 @@
+package com.mosty.hczx.service.Impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.hczx.TbHcSydjQueryDto;
+import com.mosty.base.model.dto.hczx.TbHcSydjSaveDto;
+import com.mosty.base.model.entity.bkzx.TbBkCl;
+import com.mosty.base.model.entity.hczx.TbHcSydj;
+import com.mosty.base.model.vo.hczx.TbHcSydjVo;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.hczx.mapper.TbHcSydjMapper;
+import com.mosty.hczx.service.TbHcSydjServer;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.reflection.wrapper.BaseWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+@AllArgsConstructor
+public class TbHcSydjServiceImpl  extends ServiceImpl<TbHcSydjMapper, TbHcSydj> implements TbHcSydjServer {
+
+    @Override
+    public void sydjSaveOrEdit(TbHcSydjSaveDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        if (StringUtils.isBlank(dto.getPcid())) {
+            throw new BusinessException("盘查Id不存在");
+        }
+        TbHcSydj sydj = this.baseMapper.selectOne(new LambdaQueryWrapper<TbHcSydj>()
+                .eq(TbHcSydj::getSfzh, dto.getSfzh())
+                .eq(TbHcSydj::getPcid,dto.getPcid())
+                .last(" limit 1"));
+        if (null==sydj){
+            TbHcSydj saveSydj = new TbHcSydj();
+            BeanUtil.copyProperties(dto,saveSydj);
+            saveSydj.setTjsj(new Date());
+            saveSydj.setXtSjly("2");
+            this.baseMapper.insert(saveSydj);
+        }else {
+            //人员姓名
+            sydj.setRyxm(dto.getRyxm());
+            //身份证号
+            sydj.setSfzh(dto.getSfzh());
+            //健康码状态
+            sydj.setJkmzt(dto.getJkmzt());
+            //疫苗接种情况
+            sydj.setYmjzqk(dto.getYmjzqk());
+            //通讯行程卡是否带*
+            sydj.setTxxck(dto.getTxxck());
+            //14天内到达或途径城市
+            sydj.setDdhtjcs(dto.getDdhtjcs());
+            //来自哪里
+            sydj.setLz(dto.getLz());
+            //去往哪里
+            sydj.setQw(dto.getQw());
+            //图片Id
+            sydj.setTpid(dto.getTpid());
+            sydj.setXtSjly("2");
+            this.baseMapper.updateById(sydj);
+        }
+    }
+
+    @Override
+    public void editSydj(TbHcSydjSaveDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录");
+        }
+        if (StringUtils.isBlank(dto.getId())){
+            throw new BusinessException("需要修改的数据不存在");
+        }
+        if (StringUtils.isBlank(dto.getPcid())) {
+            throw new BusinessException("盘查Id不存在");
+        }
+
+        TbHcSydj sydj =  this.baseMapper.selectById((dto.getId()));
+        if (null==sydj){
+            throw new BusinessException("需要修改的数据不存在");
+        }
+        //盘查id
+        sydj.setPcid(dto.getPcid());
+        //人员姓名
+        sydj.setRyxm(dto.getRyxm());
+        //身份证号
+        sydj.setSfzh(dto.getSfzh());
+        //健康码状态
+        sydj.setJkmzt(dto.getJkmzt());
+        //疫苗接种情况
+        sydj.setYmjzqk(dto.getYmjzqk());
+        //通讯行程卡是否带*
+        sydj.setTxxck(dto.getTxxck());
+        //14天内到达或途径城市
+        sydj.setDdhtjcs(dto.getDdhtjcs());
+        //来自哪里
+        sydj.setLz(dto.getLz());
+        //去往哪里
+        sydj.setQw(dto.getQw());
+        //图片Id
+        sydj.setTpid(dto.getTpid());
+        sydj.setTjsj(new Date());
+        sydj.setXtSjly("2");
+        this.baseMapper.updateById(sydj);
+    }
+
+    @Override
+    public TbHcSydjVo getRySydjInfo(TbHcSydjQueryDto dto) {
+        TbHcSydj sydj = this.baseMapper.selectOne(new LambdaQueryWrapper<TbHcSydj>()
+                .eq(TbHcSydj::getSfzh, dto.getSfzh())
+                .eq(TbHcSydj::getPcid,dto.getPcid())
+                .last(" limit 1"));
+        TbHcSydjVo sydjVo = new TbHcSydjVo();
+        BeanUtil.copyProperties(sydj,sydjVo);
+        return sydjVo;
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcclService.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcclService.java
new file mode 100644
index 0000000..ad47510
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcclService.java
@@ -0,0 +1,50 @@
+package com.mosty.hczx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.hczx.TbHcBpcclInsertDto;
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.entity.hczx.TbHcBpccl;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcclQuery;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcclQuery;
+import com.mosty.base.model.vo.hczx.TbHcBpcclVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbHcBpcclService {
+
+    @ApiOperation("查询被盘查车辆")
+    Integer selectCarCount();
+
+    @ApiOperation("查询盘查车辆列表分页")
+    IPage<TbHcBpcclVo> selectCarList(TbHcTodayBpcclQuery dto);
+
+    @ApiOperation("APP_查询车辆信息")
+    TbHcBpcclVo selectCl(TbHcBpcclQuery dto);
+
+    @ApiOperation("保存被盘查车辆信息")
+    void saveBpccl(TbHcBpcclInsertDto dto);
+
+    @ApiOperation("查询两个小时内没有被人员绑定的车辆")
+    List<TbHcBpcclVo> getClOf2h();
+
+    @ApiOperation("条件查询车辆盘查信息")
+    IPage<TbHcBpcclVo> getClpcList(TbHcBpcclQuery dto);
+
+    @ApiOperation("条件查询车辆盘查数据统计")
+    Map<String, Integer> getClpcCount(TbHcBpcclQuery dto);
+
+    @ApiOperation("大屏被盘查车辆统计")
+    Map<String, Integer> bpcclTj();
+
+    @ApiOperation("实际盘查车数")
+    int getSjpcc(String ssbmdm, String time);
+
+    @ApiOperation("盘查统计")
+    Object getPctj(HcTjQuery query);
+
+    @ApiOperation("盘查物品统计")
+    int getPcWptj(String ssbmdm, String time);
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcryService.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcryService.java
new file mode 100644
index 0000000..5c67d7e
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcBpcryService.java
@@ -0,0 +1,84 @@
+package com.mosty.hczx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.hczx.TbHcBpcryInsertDto;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.query.hczx.HcTjQuery;
+import com.mosty.base.model.query.hczx.RyClTjQuery;
+import com.mosty.base.model.query.hczx.TbHcBpcryQuery;
+import com.mosty.base.model.query.hczx.TbHcTodayBpcryQuery;
+import com.mosty.base.model.vo.hczx.RxSearchVo;
+import com.mosty.base.model.vo.hczx.RyZpSearchVo;
+import com.mosty.base.model.vo.hczx.TbHcBpcryVo;
+import com.mosty.common.core.business.entity.vo.Base64Str;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TbHcBpcryService {
+
+    @ApiOperation("查询被盘查人员")
+    Integer selectCrewCount();
+
+    @ApiOperation("大屏-数据统计区（左上侧）-查询盘查人员列表分页")
+    IPage<TbHcBpcryVo> selectCrewList(TbHcTodayBpcryQuery dto);
+
+    @ApiOperation("APP_查询人员信息")
+    TbHcBpcryVo selectRy(TbHcBpcryQuery dto);
+
+    @ApiOperation("根据人像查询人员列表信息")
+    List<RyZpSearchVo> getRyListByZp(MultipartFile file);
+
+    @ApiOperation("根据手机号查询人员信息")
+    List<Map> getRyListBySjhm(String mobile);
+
+    @ApiOperation("条件查询人员盘查信息")
+    IPage<TbHcBpcryVo> getRypcList(TbHcBpcryQuery dto);
+
+
+    @ApiOperation("条件查询人员盘查信息")
+    Map<String, Integer> getRypcCount(TbHcBpcryQuery dto);
+
+
+    @ApiOperation("查询两个小时内没有被车辆绑定的人员")
+    List<TbHcBpcryVo> getRyOf2h();
+
+    @ApiOperation("保存被盘查人员信息")
+    void saveBpcry(TbHcBpcryInsertDto dto);
+
+    @ApiOperation("保存被盘查人员信息Nfc")
+    TbHcBpcryVo saveBpcryNfc(TbHcBpcry bpcry);
+
+    @ApiOperation("查询人员标签详情")
+    Map<String, Object> getRyBq(String id);
+
+    @ApiOperation("查询人员标签代码根据身份证查询")
+    Map<String, Object> getRyBqBySfzh(String sfzh);
+
+
+    @ApiOperation("查询各区县盘查工作")
+    Map<String, Object> getGqxpc(RyClTjQuery dto);
+
+    @ApiOperation("根据人像查询人员列表信息")
+    List<RyZpSearchVo> getRyListByBase64(String base64Str);
+
+
+    @ApiOperation("大屏被盘查人员统计")
+    Map<String, Integer> bpcryTj();
+
+    @ApiOperation("巡防战果统计")
+    IPage<Map<String, Object>> xfzgtj(HcTjQuery query);
+
+    @ApiOperation("巡防战果统计")
+    Map<String, Object> xfzgtjAll(HcTjQuery query);
+
+    @ApiOperation("实际盘查人数")
+    int getSjpcr(String ssbmdm, String time);
+
+    @ApiOperation("方正战果统计")
+    Map<String, List<Map<String, Object>>> getZgtj(HcTjQuery query);
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcDtgzService.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcDtgzService.java
new file mode 100644
index 0000000..96e0950
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcDtgzService.java
@@ -0,0 +1,14 @@
+package com.mosty.hczx.service;
+
+import com.mosty.base.model.dto.hczx.TbHcDtgzDto;
+import com.mosty.base.model.entity.hczx.TbHcDtgz;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbHcDtgzService {
+
+    @ApiOperation("列表查询接口")
+    List<TbHcDtgz> getList(TbHcDtgzDto dtgz);
+
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcRytzbqService.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcRytzbqService.java
new file mode 100644
index 0000000..36d2704
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcRytzbqService.java
@@ -0,0 +1,21 @@
+package com.mosty.hczx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.hczx.TbHcRytzbq;
+import com.mosty.base.model.query.hczx.TbHcRytzbqQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+public interface TbHcRytzbqService {
+
+    @ApiOperation("获取人员特征标签列表--分页")
+    IPage<TbHcRytzbq> selectPage(TbHcRytzbqQuery dto);
+
+    @ApiOperation("获取人员特征标签列表--不分页")
+    List<TbHcRytzbq> selectList(TbHcRytzbq dto);
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcSydjServer.java b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcSydjServer.java
new file mode 100644
index 0000000..9025e42
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/service/TbHcSydjServer.java
@@ -0,0 +1,17 @@
+package com.mosty.hczx.service;
+
+import com.mosty.base.model.dto.hczx.TbHcSydjQueryDto;
+import com.mosty.base.model.dto.hczx.TbHcSydjSaveDto;
+import com.mosty.base.model.entity.hczx.TbHcSydj;
+import com.mosty.base.model.vo.hczx.TbHcSydjVo;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbHcSydjServer {
+
+    @ApiOperation("保存或者修改涉疫登记信息")
+    void sydjSaveOrEdit(TbHcSydjSaveDto dto);
+    @ApiOperation("保存涉疫登记信息")
+    void editSydj(TbHcSydjSaveDto dto);
+    @ApiOperation("根据身份证号码和盘查Id查询人员涉疫登记信息")
+    TbHcSydjVo getRySydjInfo(TbHcSydjQueryDto dto);
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/HttpClientUtils.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/HttpClientUtils.java
new file mode 100644
index 0000000..c4cbaa5
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/HttpClientUtils.java
@@ -0,0 +1,560 @@
+package com.mosty.hczx.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpStatus;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.AuthSchemes;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.security.cert.X509Certificate;
+import java.util.*;
+
+@Slf4j
+public class HttpClientUtils {
+
+
+	public static final String CHARSET = "UTF-8";
+	private static final RequestConfig REQUEST_CONFIG = RequestConfig.custom().setSocketTimeout(15000).setConnectTimeout(15000).setConnectionRequestTimeout(15000).build();
+
+		public static String doGet(String url, Map<String, String> params) {
+		return doGet(url, params, CHARSET);
+	}
+	
+	public static String doGetSSL(String url, Map<String, String> params) {
+		return doGetSSL(url, params, CHARSET);
+	}
+
+	public static String doPost(String url, Map<String, String> params) {
+		return doPost(url, params, CHARSET);
+	}
+
+	public static String doPostForJson(String url, String json) {
+		return doPostForJson(url, json, CHARSET);
+	}
+	
+	public static String doPostForJson(String url, String json, Map<String, String> headersMap) {
+		return doPostForJsonHeaders(url, json, CHARSET, headersMap);
+	}
+	
+	public static String doPostSSLForJson(String url, String json) {
+		return doPostSSLForJson(url, json, CHARSET);
+	}
+
+	/**
+	 * HTTP GET
+	 * 
+	 * @param url
+	 *            请求的url地址 ?之前的地址
+	 * @param params
+	 *            请求的参数
+	 * @param charset
+	 *            编码格式
+	 * @return 页面内容
+	 */
+	public static String doGet(String url, Map<String, String> params, String charset) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			if (params != null && !params.isEmpty()) {
+				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
+				for (Map.Entry<String, String> entry : params.entrySet()) {
+					String value = entry.getValue();
+					if (value != null) {
+						pairs.add(new BasicNameValuePair(entry.getKey(), value));
+					}
+				}
+				// 将请求参数和url进行拼接
+				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
+			}
+			HttpGet httpGet = new HttpGet(url);
+			httpGet.setConfig(REQUEST_CONFIG);
+
+			// 创建默认的httpClient实例.
+			httpClient = HttpClients.createDefault();
+			response = httpClient.execute(httpGet);
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != 200) {
+				httpGet.abort();
+				return "HttpClient, error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @Title: doGetSSL
+	 * @Description: get https
+	 * @param url
+	 * @param params
+	 * @param charset
+	 * @return String
+	 */
+	public static String doGetSSL(String url, Map<String, String> params, String charset) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			if (params != null && !params.isEmpty()) {
+				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
+				for (Map.Entry<String, String> entry : params.entrySet()) {
+					String value = entry.getValue();
+					if (value != null) {
+						pairs.add(new BasicNameValuePair(entry.getKey(), value));
+					}
+				}
+				// 将请求参数和url进行拼接
+				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
+			}
+			HttpGet httpGet = new HttpGet(url);
+			httpGet.setConfig(REQUEST_CONFIG);
+
+			// 创建默认的httpClient实例. 在调用SSL之前需要重写验证方法，取消检测SSL
+			X509TrustManager trustManager = new X509TrustManager() {
+				@Override
+				public X509Certificate[] getAcceptedIssuers() {
+					return null;
+				}
+
+				@Override
+				public void checkClientTrusted(X509Certificate[] xcs, String str) {
+				}
+
+				@Override
+				public void checkServerTrusted(X509Certificate[] xcs, String str) {
+				}
+			};
+			SSLContext ctx = SSLContext.getInstance(SSLConnectionSocketFactory.TLS);
+			ctx.init(null, new TrustManager[] { trustManager }, null);
+			SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(ctx, NoopHostnameVerifier.INSTANCE);
+			RequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD_STRICT).setExpectContinueEnabled(Boolean.TRUE)
+					.setTargetPreferredAuthSchemes(Arrays.asList(AuthSchemes.NTLM, AuthSchemes.DIGEST)).setProxyPreferredAuthSchemes(Arrays.asList(AuthSchemes.BASIC)).build();
+			Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.INSTANCE)
+					.register("https", socketFactory).build();
+			// 创建ConnectionManager，添加Connection配置信息
+			PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+			httpClient = HttpClients.custom().setConnectionManager(connectionManager).setDefaultRequestConfig(requestConfig).build();
+
+			httpGet.addHeader("AppKey", "679049566846189568");
+			
+			response = httpClient.execute(httpGet);
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != 200) {
+				httpGet.abort();
+				return "HttpClient, error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * HTTP POST
+	 * 
+	 * @param url
+	 *            请求的url地址 ?之前的地址
+	 * @param params
+	 *            请求的参数
+	 * @param charset
+	 *            编码格式
+	 * @return 页面内容
+	 */
+	public static String doPost(String url, Map<String, String> params, String charset) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+		//log.info("doPost url: " + url);
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			List<NameValuePair> pairs = null;
+			if (params != null && !params.isEmpty()) {
+				pairs = new ArrayList<NameValuePair>(params.size());
+				for (Map.Entry<String, String> entry : params.entrySet()) {
+					String value = entry.getValue();
+					if (value != null) {
+						pairs.add(new BasicNameValuePair(entry.getKey(), value));
+					}
+				}
+				//log.info("doPost pairs: " + JacksonUtils.objToJson(pairs));
+			}
+			HttpPost httpPost = new HttpPost(url);
+			if (pairs != null && pairs.size() > 0) {
+				httpPost.setEntity(new UrlEncodedFormEntity(pairs, CHARSET));
+			}
+			httpPost.setConfig(REQUEST_CONFIG);
+			// 创建默认的httpClient实例.
+			httpClient = HttpClients.createDefault();
+			response = httpClient.execute(httpPost);
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != HttpStatus.SC_OK) {
+				httpPost.abort();
+				return "HttpClient,	error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			log.info("doPost HttpEntity: " + result);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * HTTP POST 参数为json
+	 * 
+	 * @param url
+	 * @param json
+	 * @param charset
+	 * @return
+	 */
+	public static String doPostForJson(String url, String json, String charset) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+//		log.info("doPostForJson url: " + url);
+//		log.info("doPostForJson json: " + json);
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			
+			StringEntity stringentity = new StringEntity(json, charset);
+			stringentity.setContentType("application/json");
+
+			httpPost.setEntity(stringentity);
+			httpPost.setConfig(REQUEST_CONFIG);
+			// 创建默认的httpClient实例.
+			httpClient = HttpClients.createDefault();
+			// 执行请求
+			response = httpClient.execute(httpPost);
+
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != HttpStatus.SC_OK) {
+				httpPost.abort();
+				return "HttpClient,	error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+//			log.info("doPostForJson HttpEntity: " + result);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * HTTP POST 参数为json
+	 * 
+	 * @param url
+	 * @param json
+	 * @param charset
+	 * @return
+	 */
+	public static String doPostForJsonHeaders(String url, String json, String charset, Map<String, String> headersMap) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+		log.info("doPostForJson url: " + url);
+		//log.info("doPostForJson json: " + json);
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			HttpPost httpPost = new HttpPost(url);
+			
+			StringEntity stringentity = new StringEntity(json, charset);
+			stringentity.setContentType("application/json");
+
+			//请求头部
+			if(null != headersMap && !headersMap.isEmpty()){
+				Iterator<Map.Entry<String, String>> itr = headersMap.entrySet().iterator();
+				while(itr.hasNext()){
+					Map.Entry<String, String> ent = itr.next();
+					httpPost.addHeader(ent.getKey(), ent.getValue());
+				}
+			}
+			
+			httpPost.setEntity(stringentity);
+			httpPost.setConfig(REQUEST_CONFIG);
+			// 创建默认的httpClient实例.
+			httpClient = HttpClients.createDefault();
+			// 执行请求
+			response = httpClient.execute(httpPost);
+
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != HttpStatus.SC_OK) {
+				httpPost.abort();
+				return "HttpClient,	error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			log.info("doPostForJson HttpEntity: " + result);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @Title: doPostSSLForJson
+	 * @Description: post https
+	 * @param url
+	 * @param json
+	 * @param charset
+	 * @return String
+	 */
+	public static String doPostSSLForJson(String url, String json, String charset) {
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			HttpPost httpPost = new HttpPost(url);
+
+			StringEntity stringentity = new StringEntity(json, charset);
+			stringentity.setContentType("application/json");
+
+			httpPost.setEntity(stringentity);
+			httpPost.setConfig(REQUEST_CONFIG);
+
+			// 在调用SSL之前需要重写验证方法，取消检测SSL
+			X509TrustManager trustManager = new X509TrustManager() {
+				@Override
+				public X509Certificate[] getAcceptedIssuers() {
+					return null;
+				}
+				@Override
+				public void checkClientTrusted(X509Certificate[] xcs, String str) {
+				}
+				@Override
+				public void checkServerTrusted(X509Certificate[] xcs, String str) {
+				}
+			};
+			SSLContext ctx = SSLContext.getInstance(SSLConnectionSocketFactory.TLS);
+			ctx.init(null, new TrustManager[] { trustManager }, null);
+			SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(ctx, NoopHostnameVerifier.INSTANCE);
+			RequestConfig requestConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD_STRICT).setExpectContinueEnabled(Boolean.TRUE)
+					.setTargetPreferredAuthSchemes(Arrays.asList(AuthSchemes.NTLM, AuthSchemes.DIGEST)).setProxyPreferredAuthSchemes(Arrays.asList(AuthSchemes.BASIC)).build();
+			Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
+					.register("http", PlainConnectionSocketFactory.INSTANCE).register("https", socketFactory).build();
+			// 创建ConnectionManager，添加Connection配置信息
+			PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
+			httpClient = HttpClients.custom().setConnectionManager(connectionManager).setDefaultRequestConfig(requestConfig).build();
+
+			// 执行请求
+			response = httpClient.execute(httpPost);
+
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != HttpStatus.SC_OK) {
+				httpPost.abort();
+				return "HttpClient,	error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * doGetForJson（json方式的get请求）
+	 * @param url
+	 * @param params
+	 * @param charset
+	 * @return
+	 */
+	public static String doGetForJson(String url, Map<String, String> params, String charset) {
+		if (StringUtils.isBlank(url)) {
+			return null;
+		}
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		try {
+			if (params != null && !params.isEmpty()) {
+				List<NameValuePair> pairs = new ArrayList<NameValuePair>(params.size());
+				for (Map.Entry<String, String> entry : params.entrySet()) {
+					String value = entry.getValue();
+					if (value != null) {
+						pairs.add(new BasicNameValuePair(entry.getKey(), value));
+					}
+				}
+				// 将请求参数和url进行拼接
+				url += "?" + EntityUtils.toString(new UrlEncodedFormEntity(pairs, charset));
+			}
+			HttpGet httpGet = new HttpGet(url);
+			httpGet.setConfig(REQUEST_CONFIG);
+			httpGet.setHeader("Content-Type", "application/json;charset=UTF-8");
+
+			// 创建默认的httpClient实例.
+			httpClient = HttpClients.createDefault();
+			response = httpClient.execute(httpGet);
+			int statusCode = response.getStatusLine().getStatusCode();
+			if (statusCode != 200) {
+				httpGet.abort();
+				return "HttpClient, error status code : " + statusCode;
+			}
+			HttpEntity entity = response.getEntity();
+			String result = null;
+			if (entity != null) {
+				result = EntityUtils.toString(entity, "utf-8");
+			}
+			EntityUtils.consume(entity);
+			return result;
+		} catch (Exception e) {
+			log.error(e.getLocalizedMessage(), e);
+		} finally {
+			try {
+				// 关闭连接,释放资源
+				if (response != null) {
+					response.close();
+				}
+				if (httpClient != null) {
+					httpClient.close();
+				}
+			} catch (IOException e) {
+				log.error(e.getLocalizedMessage(), e);
+			}
+		}
+		return null;
+	}
+
+	public static void main(String[] args) {
+		System.out.println("2".contains("1,2"));
+	}
+	
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/ImageUtils.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/ImageUtils.java
new file mode 100644
index 0000000..40a2f05
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/ImageUtils.java
@@ -0,0 +1,307 @@
+package com.mosty.hczx.utils;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import javax.net.ssl.*;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.geom.AffineTransform;
+import java.awt.image.*;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Iterator;
+
+/**
+ * 图片处理类<br>
+ *
+ * @author Esacpe
+ * @version 2014-8-22
+ */
+
+public class ImageUtils {
+
+
+    /**
+     * 将图片缩放处理方法<br>
+     *
+     * @param source    源图片对象
+     * @param targetW   转换后的宽度
+     * @param targetH   转换后的高度
+     * @param sameScale 是否等比例缩放
+     * @return BufferedImage
+     */
+    public static BufferedImage resize(BufferedImage source, int targetW,
+                                       int targetH, boolean sameScale) { // targetW，targetH分别表示目标长和宽
+        int type = source.getType();
+        BufferedImage target = null;
+        double sx = (double) targetW / source.getWidth();
+        double sy = (double) targetH / source.getHeight();
+        if (sameScale) { // 需要等比例缩放
+            if (sx > sy) {
+                sx = sy;
+                targetW = (int) (sx * source.getWidth());
+            } else {
+                sy = sx;
+                targetH = (int) (sy * source.getHeight());
+            }
+        }
+        if (type == BufferedImage.TYPE_CUSTOM) { // handmade
+            ColorModel cm = source.getColorModel();
+            WritableRaster raster = cm.createCompatibleWritableRaster(targetW,
+                    targetH);
+            boolean alphaPremultiplied = cm.isAlphaPremultiplied();
+            target = new BufferedImage(cm, raster, alphaPremultiplied, null);
+        } else {
+            target = new BufferedImage(targetW, targetH, type);
+        }
+        Graphics2D g = target.createGraphics();
+        // smoother than exlax:
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+        g.drawRenderedImage(source, AffineTransform.getScaleInstance(sx, sy));
+        g.dispose();
+        return target;
+    }
+
+    /**
+     * 将图片放大与缩小<br>
+     *
+     * @param sourceByte 源图片的字节数组
+     * @param width      转换后的宽度
+     * @param height     转换后的高度
+     * @param sameScale  是否等比例缩放
+     * @return byte[]
+     */
+    public static byte[] convertImageSize(byte[] sourceByte, int width,
+                                          int height, boolean sameScale) throws Exception {
+        byte[] returnValue = null;
+        if (sourceByte != null && sourceByte.length > 0) {
+            ByteArrayInputStream in = new ByteArrayInputStream(sourceByte);
+            // BufferedImage srcImage = getReadImage(in);
+            BufferedImage srcImage = null;
+            try {
+                srcImage = ImageIO.read(in); // RGB
+            } catch (Exception e) {
+            }
+            if (srcImage != null) {
+                BufferedImage srcImageTarget = resize(srcImage, width, height,
+                        sameScale);
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                boolean flag = ImageIO.write(srcImageTarget, "JPEG", out);
+                returnValue = out.toByteArray();
+            }
+        }
+        return returnValue;
+    }
+
+    /**
+     * 将图片放大与缩小后另存<br>
+     *
+     * @param fromFileStr   来源文件名
+     * @param saveToFileStr 目标文件名
+     * @param width         转换后的宽度
+     * @param height        转换后的高度
+     * @param sameScale     是否等比例缩放
+     */
+    public static void saveImageAsJpg(String fromFileStr, String saveToFileStr,
+                                      int width, int height, boolean sameScale) throws Exception {
+        String imgType = "JPEG";
+        if (fromFileStr.toLowerCase().endsWith(".png")) {
+            imgType = "PNG";
+        }
+        File saveFile = new File(saveToFileStr);
+        File fromFile = new File(fromFileStr);
+        BufferedImage srcImage = getReadImage(fromFile);
+        if (srcImage != null) {
+            if (width > 0 || height > 0) {
+                srcImage = resize(srcImage, width, height, sameScale);
+            }
+            ImageIO.write(srcImage, imgType, saveFile);
+        }
+    }
+
+    /**
+     * 根据文件取得bufferedImage对象（自动识别RGB与CMYK）<br>
+     *
+     * @param file 来源文件名
+     * @return BufferedImage
+     */
+    private static BufferedImage getReadImage(File file) throws Exception {
+        BufferedImage srcImage = null;
+        ImageInputStream input = ImageIO.createImageInputStream(file); // 只能接收File或FileInputStream，ByteArrayInputStream无效
+        Iterator readers = ImageIO.getImageReaders(input);
+        if (readers == null || !readers.hasNext()) {
+            throw new RuntimeException("1 No ImageReaders found");
+        }
+        ImageReader reader = (ImageReader) readers.next();
+        reader.setInput(input);
+        String format = reader.getFormatName();
+        if ("JPEG".equalsIgnoreCase(format) || "JPG".equalsIgnoreCase(format)) {
+            try {
+                srcImage = ImageIO.read(file); // RGB
+            } catch (Exception e) {
+                Raster raster = reader.readRaster(0, null);// CMYK
+                srcImage = createJPEG4(raster);
+            }
+            input.close();
+        }
+        return srcImage;
+    }
+
+    /**
+     * RGB彩色空间转换为CMYK<br>
+     *
+     * @param raster
+     * @return BufferedImage
+     */
+    private static BufferedImage createJPEG4(Raster raster) {
+        int w = raster.getWidth();
+        int h = raster.getHeight();
+        byte[] rgb = new byte[w * h * 3]; // 彩色空间转换
+        float[] Y = raster.getSamples(0, 0, w, h, 0, (float[]) null);
+        float[] Cb = raster.getSamples(0, 0, w, h, 1, (float[]) null);
+        float[] Cr = raster.getSamples(0, 0, w, h, 2, (float[]) null);
+        float[] K = raster.getSamples(0, 0, w, h, 3, (float[]) null);
+        for (int i = 0, imax = Y.length, base = 0; i < imax; i++, base += 3) {
+            float k = 220 - K[i], y = 255 - Y[i], cb = 255 - Cb[i], cr = 255 - Cr[i];
+            double val = y + 1.402 * (cr - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+            val = y - 0.34414 * (cb - 128) - 0.71414 * (cr - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base + 1] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+            val = y + 1.772 * (cb - 128) - k;
+            val = (val - 128) * .65f + 128;
+            rgb[base + 2] = val < 0.0 ? (byte) 0 : val > 255.0 ? (byte) 0xff
+                    : (byte) (val + 0.5);
+        }
+        raster = Raster.createInterleavedRaster(new DataBufferByte(rgb,
+                rgb.length), w, h, w * 3, 3, new int[]{0, 1, 2}, null);
+        ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
+        ColorModel cm = new ComponentColorModel(cs, false, true,
+                Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
+        return new BufferedImage(cm, (WritableRaster) raster, true, null);
+    }
+
+    /**
+     * 网络图片转成base64 https
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static String encodeImageToBase64Https(String url) throws Exception {
+        String base64 = null;
+        SSLContext sslcontext = SSLContext.getInstance("SSL", "SunJSSE");
+        sslcontext.init(null, new TrustManager[]{new MyX509TrustManager()}, new java.security.SecureRandom());
+        URL urls = new URL(url);
+        HostnameVerifier ignoreHostnameVerifier = new HostnameVerifier() {
+            public boolean verify(String s, SSLSession sslsession) {
+                System.out.println("WARNING: Hostname is not matched for cert.");
+                return true;
+            }
+        };
+        HttpsURLConnection.setDefaultHostnameVerifier(ignoreHostnameVerifier);
+        HttpsURLConnection.setDefaultSSLSocketFactory(sslcontext.getSocketFactory());
+        //之后任何Https协议网站皆能正常访问，同第一种情况
+        HttpURLConnection conn = null;
+        try {
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_MOVED_PERM) {
+                String location = conn.getHeaderField("Location");
+                String s = encodeImageToBase64Https(location.trim());
+                if (org.apache.commons.lang3.StringUtils.isNotBlank(s)) {
+                    return s;
+                }
+
+            } else {
+                //通过输入流获取图片数据
+                InputStream inStream = conn.getInputStream();
+                //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+                ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+                //创建一个Buffer字符串
+                byte[] buffer = new byte[1024];
+                //每次读取的字符串长度，如果为-1，代表全部读取完毕
+                int len = 0;
+                //使用一个输入流从buffer里把数据读取出来
+                while ((len = inStream.read(buffer)) != -1) {
+                    //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                    outStream.write(buffer, 0, len);
+                }
+                //关闭输入流
+                inStream.close();
+                byte[] data = outStream.toByteArray();
+                //对字节数组Base64编码
+                BASE64Encoder encoder = new BASE64Encoder();
+                base64 = encoder.encode(data).replaceAll("[\\s*\t\n\r]", "");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("解析失败!");
+        }
+        return base64;
+    }
+
+    /**
+     * 网络图片转成base64
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static String encodeImageToBase64(String url) throws Exception {
+        //打开链接
+        URL urls = new URL(url);
+        HttpURLConnection conn = null;
+        try {
+            conn = (HttpURLConnection) urls.openConnection();
+            //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+            //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+            //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+            //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+            //关闭输入流
+            inStream.close();
+            byte[] data = outStream.toByteArray();
+            //对字节数组Base64编码
+            BASE64Encoder encoder = new BASE64Encoder();
+            String base64 = encoder.encode(data).replaceAll("[\\s*\t\n\r]", "");
+            return base64;//返回Base64编码过的字节数组字符串
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("解析失败!");
+        }
+    }
+
+
+
+    public static void main(String argv[]) throws Exception {
+
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/JacksonUtils.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/JacksonUtils.java
new file mode 100644
index 0000000..d39d9ff
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/JacksonUtils.java
@@ -0,0 +1,204 @@
+package com.mosty.hczx.utils;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JacksonUtils {
+	private final static ObjectMapper objectMapper = new ObjectMapper();
+
+	private JacksonUtils() {
+
+	}
+
+	public static ObjectMapper getInstance() {
+		return objectMapper;
+	}
+
+	/**
+	 * javaBean、列表数组转换为json字符串
+	 */
+	public static String objToJson(Object obj) throws Exception {
+		return objectMapper.writeValueAsString(obj);
+	}
+
+	/**
+	 * javaBean、列表数组转换为json字符串,忽略空值
+	 */
+	public static String objToJsonIgnoreNull(Object obj) throws Exception {
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		return mapper.writeValueAsString(obj);
+	}
+
+	/**
+	 * json 转JavaBean
+	 */
+
+	public static <T> T jsonToPojo(String jsonString, Class<T> clazz) throws Exception {
+		objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+		return objectMapper.readValue(jsonString, clazz);
+	}
+
+	/**
+	 * json字符串转换为map
+	 */
+	public static <T> Map<String, Object> jsonToMap(String jsonString) throws Exception {
+		ObjectMapper mapper = new ObjectMapper();
+		mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+		return mapper.readValue(jsonString, Map.class);
+	}
+
+	/**
+	 * json字符串转换为map
+	 */
+	public static <T> Map<String, T> jsonToMap(String jsonString, Class<T> clazz) throws Exception {
+		Map<String, Map<String, Object>> map = (Map<String, Map<String, Object>>) objectMapper.readValue(jsonString, new TypeReference<Map<String, T>>() {
+		});
+		Map<String, T> result = new HashMap<String, T>();
+		for (Map.Entry<String, Map<String, Object>> entry : map.entrySet()) {
+			result.put(entry.getKey(), mapToPojo(entry.getValue(), clazz));
+		}
+		return result;
+	}
+
+	/**
+	 * 深度转换json成map
+	 *
+	 * @param json
+	 * @return
+	 */
+	public static Map<String, Object> jsonToMapDeeply(String json) throws Exception {
+		return jsonToMapRecursion(json, objectMapper);
+	}
+
+	/**
+	 * 把json解析成list，如果list内部的元素存在jsonString，继续解析
+	 *
+	 * @param json
+	 * @param mapper
+	 *            解析工具
+	 * @return
+	 * @throws Exception
+	 */
+	private static List<Object> jsonToListRecursion(String json, ObjectMapper mapper) throws Exception {
+		if (json == null) {
+			return null;
+		}
+
+		List<Object> list = mapper.readValue(json, List.class);
+
+		for (Object obj : list) {
+			if (obj != null && obj instanceof String) {
+				String str = (String) obj;
+				if (str.startsWith("[")) {
+					obj = jsonToListRecursion(str, mapper);
+				} else if (obj.toString().startsWith("{")) {
+					obj = jsonToMapRecursion(str, mapper);
+				}
+			}
+		}
+
+		return list;
+	}
+
+	/**
+	 * 把json解析成map，如果map内部的value存在jsonString，继续解析
+	 *
+	 * @param json
+	 * @param mapper
+	 * @return
+	 * @throws Exception
+	 */
+	private static Map<String, Object> jsonToMapRecursion(String json, ObjectMapper mapper) throws Exception {
+		if (json == null) {
+			return null;
+		}
+
+		Map<String, Object> map = mapper.readValue(json, Map.class);
+
+		for (Map.Entry<String, Object> entry : map.entrySet()) {
+			Object obj = entry.getValue();
+			if (obj != null && obj instanceof String) {
+				String str = ((String) obj);
+
+				if (str.startsWith("[")) {
+					List<?> list = jsonToListRecursion(str, mapper);
+					map.put(entry.getKey(), list);
+				} else if (str.startsWith("{")) {
+					Map<String, Object> mapRecursion = jsonToMapRecursion(str, mapper);
+					map.put(entry.getKey(), mapRecursion);
+				}
+			}
+		}
+
+		return map;
+	}
+
+	/**
+	 * 与javaBean json数组字符串转换为列表
+	 */
+	public static <T> List<T> jsonToList(String jsonArrayStr, Class<T> clazz) throws Exception {
+		JavaType javaType = getCollectionType(ArrayList.class, clazz);
+		List<T> lst = (List<T>) objectMapper.readValue(jsonArrayStr, javaType);
+		return lst;
+	}
+
+	/**
+	 * 深度转换json成列表
+	 */
+	public static List<Object> jsonToListDeeply(String jsonArrayStr) throws Exception {
+		return jsonToListRecursion(jsonArrayStr, objectMapper);
+	}
+	
+	/**
+	 * 获取泛型的Collection Type
+	 *
+	 * @param collectionClass
+	 *            泛型的Collection
+	 * @param elementClasses
+	 *            元素类
+	 * @return JavaType Java类型
+	 * @since 1.0
+	 */
+	public static JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
+		return objectMapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+	}
+
+	/**
+	 * map 转JavaBean
+	 */
+	public static <T> T mapToPojo(Map map, Class<T> clazz) {
+		return objectMapper.convertValue(map, clazz);
+	}
+
+	/**
+	 * map 转json
+	 *
+	 * @param map
+	 * @return
+	 */
+	public static String mapToJson(Map map) {
+		try {
+			return objectMapper.writeValueAsString(map);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return "";
+	}
+
+	/**
+	 * map 转JavaBean
+	 */
+	public static <T> T objToPojo(Object obj, Class<T> clazz) {
+		return objectMapper.convertValue(obj, clazz);
+	}
+	
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/MD5Utils.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/MD5Utils.java
new file mode 100644
index 0000000..64492c2
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/MD5Utils.java
@@ -0,0 +1,87 @@
+package com.mosty.hczx.utils;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class MD5Utils {
+	private static MessageDigest md5 = null;
+	static {
+		try {
+			md5 = MessageDigest.getInstance("MD5");
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+		}
+	}
+
+	/**
+	 * 用于获取一个String的md5值
+	 * 
+	 * @param string
+	 * @return
+	 */
+	public static String getMd5(String str) {
+		byte[] bs = md5.digest(str.getBytes());
+		StringBuilder sb = new StringBuilder(40);
+		for (byte x : bs) {
+			if ((x & 0xff) >> 4 == 0) {
+				sb.append("0").append(Integer.toHexString(x & 0xff));
+			} else {
+				sb.append(Integer.toHexString(x & 0xff));
+			}
+		}
+		return sb.toString();
+	}
+
+	public static void main(String[] args) {
+		System.out.println(getMd5("abc@123"));
+	}
+
+	/**
+	 * 通过网站域名URL获取该网站的源码
+	 * 
+	 * @param url
+	 * @return String
+	 * @throws Exception
+	 */
+	public static InputStream getURLinStream(String pathUrl) throws Exception {
+		URL url = new URL(pathUrl);
+		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+		conn.setRequestMethod("GET");
+		conn.setConnectTimeout(5 * 1000);
+		return conn.getInputStream(); // 通过输入流获取html二进制数据
+	}
+
+	/**
+	 * 获取md5
+	 * 
+	 * @param path
+	 * @return
+	 * @throws Exception
+	 */
+	public static String getUrlMd5(String url) throws Exception {
+		try {
+			InputStream fis = getURLinStream(url);
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			byte[] buffer = new byte[1024];
+			int length = -1;
+			while ((length = fis.read(buffer, 0, 1024)) != -1) {
+				md.update(buffer, 0, length);
+			}
+			BigInteger bigInt = new BigInteger(1, md.digest());
+			return bigInt.toString(16);
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return "";
+	}
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/MyX509TrustManager.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/MyX509TrustManager.java
new file mode 100644
index 0000000..f3f9e39
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/MyX509TrustManager.java
@@ -0,0 +1,22 @@
+package com.mosty.hczx.utils;
+
+
+import javax.net.ssl.X509TrustManager;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class MyX509TrustManager implements X509TrustManager {
+
+    // 检查客户端证书
+    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }
+
+    // 检查服务器端证书
+    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    }
+
+    // 返回受信任的X509证书数组
+    public X509Certificate[] getAcceptedIssuers() {
+        return null;
+    }
+}
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/PinYinUtil.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/PinYinUtil.java
new file mode 100644
index 0000000..0873a31
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/PinYinUtil.java
@@ -0,0 +1,91 @@
+package com.mosty.hczx.utils;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by 张海军 on 2022/4/12 10:52
+ *
+ * @ClassName PinYinUtil
+ */
+public  class PinYinUtil {
+
+
+        private PinYinUtil() {}
+
+        /**
+         * 获取中文拼音首字母，其他字符不变
+         *
+         * @param str
+         * @return String
+         */
+        public static String getShortPinyin(String str) {
+            return getShortPinyin(str, true);
+        }
+
+        /**
+         * 获取中文拼音首字母
+         * @param str
+         * @param retain 为true保留其他字符
+         * @return String
+         */
+        public static String getShortPinyin(String str, boolean retain) {
+            return getPinyin(str, true, retain);
+        }
+
+        /**
+         * 获取中文拼音，其他字符不变
+         *
+         * @param str
+         * @return String
+         */
+        public static String getFullPinyin(String str) {
+            return getFullPinyin(str, true);
+        }
+
+        /**
+         * 获取中文拼音
+         * @param str
+         * @param retain 为true保留其他字符
+         * @return String
+         */
+        public static String getFullPinyin(String str, boolean retain) {
+            return getPinyin(str, false, retain);
+        }
+
+        /**
+         * 获取中文拼音
+         *
+         * @param str
+         * @param shortPinyin 为true获取中文拼音首字母
+         * @param retain      为true保留其他字符
+         * @return String
+         */
+        public static String getPinyin(String str, boolean shortPinyin, boolean retain) {
+            if (StringUtils.isBlank(str)) {
+                return "";
+            }
+            StringBuffer pinyinBuffer = new StringBuffer();
+            char[] arr = str.toCharArray();
+            for (char c : arr) {
+                String[] temp = PinyinHelper.toHanyuPinyinStringArray(c);
+                if (ArrayUtils.isNotEmpty(temp)) {
+                    if (StringUtils.isNotBlank(temp[0])) {
+                        if (shortPinyin) {
+                            pinyinBuffer.append(temp[0].charAt(0));
+                        } else {
+                            pinyinBuffer.append(temp[0].replaceAll("\\d", ""));
+                        }
+                    }
+                } else {
+                    if (retain) {
+                        pinyinBuffer.append(c);
+                    }
+                }
+            }
+            return pinyinBuffer.toString();
+        }
+
+    }
+
diff --git a/mosty-hczx/src/main/java/com/mosty/hczx/utils/StringUtils.java b/mosty-hczx/src/main/java/com/mosty/hczx/utils/StringUtils.java
new file mode 100644
index 0000000..28cd515
--- /dev/null
+++ b/mosty-hczx/src/main/java/com/mosty/hczx/utils/StringUtils.java
@@ -0,0 +1,1105 @@
+package com.mosty.hczx.utils;
+
+import com.mosty.base.utils.DateUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 
+ * 字符串处理类<br>
+ * 
+ * @author redstorm
+ * @version 2011-3-15
+ * 
+ */
+public class StringUtils {
+
+	private static Logger logger = LogManager.getLogger(StringUtils.class);
+
+	public static final String enterNewline = String.valueOf((char) 13)
+			+ String.valueOf((char) 10); // windows下的换行符
+
+	public static final String enterNewline_linux = String.valueOf((char) 10); // linux下的换行符
+
+	public StringUtils() {
+	}
+
+	/**
+	 * null 转换为空字符串<br>
+	 * 
+	 * @param temp
+	 *            需要转换的字符串
+	 * @return String
+	 */
+	public static String nullToStr(String temp) {
+		if (temp == null)
+			temp = "";
+		return temp;
+	}
+
+	/**
+	 * 判断字符串是否为空，空格、回车符、换行符、Tab符默认为空<br>
+	 * 
+	 * @param str
+	 *            判断的字符串
+	 * @return boolean 返回是否为空(为null时返回true)
+	 */
+	public static boolean isBlank(String temp) {
+		boolean returnValue = true;
+		if (temp != null) {
+			returnValue = temp.matches("\\s*");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 两个字符串连接，null 按空字符串处理<br>
+	 * 
+	 * @param str1
+	 *            字符串1
+	 * @param str2
+	 *            字符串2
+	 * @return String
+	 */
+	public static String stringConcat(String str1, String str2) {
+		String temp = "";
+		if (str1 != null) {
+			temp = str1;
+		}
+		if (str2 != null) {
+			temp = temp.concat(str2);
+		}
+		return temp;
+	}
+
+	/**
+	 * 返回字符串分割后的字符串数组,不同于 String.split() 方法,可以正确的得到特殊字符的分割结果<br>
+	 * 
+	 * @param str
+	 *            被分割的字符串
+	 * @param splitStr
+	 *            分割符,可以是一个字符串
+	 * @return String[]
+	 */
+	public static String[] split(String str, String splitStr) {
+		List<String> coll = new ArrayList<String>();
+		if (str != null && !"".equals(str) && splitStr != null
+				&& !"".equals(splitStr)) {
+			String tempStr = str;
+			int at = tempStr.indexOf(splitStr);
+			while (at != -1) {
+				coll.add(tempStr.substring(0, at));
+				tempStr = tempStr.substring(at + splitStr.length());
+				at = tempStr.indexOf(splitStr);
+			}
+			coll.add(tempStr);
+		}
+		return (String[]) coll.toArray(new String[0]);
+	}
+
+	/**
+	 * 去掉字符串的单引号与双引号<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String clearMark(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll("'", "");
+			returnValue = returnValue.replaceAll("\"", "");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 文本字符串转换成HTML格式<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 <li>& 转换成 ＆amp; <li>空格 转换成 ＆nbsp; <li>" 转换成 ＆quot;
+	 *            <li>< 转换成 ＆lt; <li>>转换成 ＆gt; <li>\n 转换成 ＜br＞
+	 * @return String
+	 */
+	public static String txtToHtml(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll("&", "&amp;");
+			returnValue = returnValue.replaceAll(" ", "&nbsp;");
+			returnValue = returnValue.replaceAll("\"", "&quot;");
+			returnValue = returnValue.replaceAll("<", "&lt;");
+			returnValue = returnValue.replaceAll(">", "&gt;");
+			returnValue = returnValue.replaceAll("\n", "<br>");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 文本字符串转换成HTML格式<br>
+	 * （不替换 ＆符号）
+	 * 
+	 * @param str
+	 *            需要转换的字符串 <li>空格 转换成 ＆nbsp; <li>" 转换成 ＆quot; <li>< 转换成 ＆lt; <li>>
+	 *            转换成 ＆gt; <li>\n 转换成 ＜br＞
+	 * @return String
+	 */
+	public static String txtToHtml2(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll(" ", "&nbsp;");
+			returnValue = returnValue.replaceAll("\"", "&quot;");
+			returnValue = returnValue.replaceAll("<", "&lt;");
+			returnValue = returnValue.replaceAll(">", "&gt;");
+			returnValue = returnValue.replaceAll("\n", "<br>");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * HTML格式的字符串转换成文本格式<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 <li>＆amp; 转换成 & <li>＆nbsp; 转换成 空格 <li>＆quot; 转换成 "
+	 *            <li>＆lt; 转换成 < <li>＆gt; 转换成 > <li>＜br＞ 转换成 \n <li>＜br/＞ 转换成 \n
+	 * @return String
+	 */
+	public static String htmlToTxt(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = returnValue.replaceAll("<br/>", "\n");
+			returnValue = returnValue.replaceAll("<br>", "\n");
+			returnValue = returnValue.replaceAll("&lt;", "<");
+			returnValue = returnValue.replaceAll("&gt;", ">");
+			returnValue = returnValue.replaceAll("&nbsp;", " ");
+			returnValue = returnValue.replaceAll("&amp;", "&");
+			returnValue = returnValue.replaceAll("&quot;", "\"");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 当前字符转换行符转换成空格<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 (char)13 + (char)10 转换成 空格
+	 * @return String
+	 */
+	public static String enterToSpace(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll("\n", " ");
+			returnValue = returnValue.replaceAll(enterNewline, " ");
+			returnValue = returnValue
+					.replaceAll(String.valueOf((char) 13), " ");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 当前字符转换行符转换成空格<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 (char)13 + (char)10 转换成 空字符串
+	 * @return String
+	 */
+	public static String enterToEmpty(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll("\n", "");
+			returnValue = returnValue.replaceAll(enterNewline, "");
+			returnValue = returnValue.replaceAll(String.valueOf((char) 13), "");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得SQL中的条件表达式<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 '（单引号） 转换成 ''（两个单引号，SQL中默认两个单引号为一个单引号字符）
+	 * @return String
+	 */
+	public static String getSqlExpression(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll("'", "''");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 当前字符转换行符转换成回车符<br>
+	 * 
+	 * @param str
+	 *            需要转换的字符串 (char)13 + (char)10 转换成 (char)13 回车符
+	 * @return String
+	 */
+	public static String enterConvert(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str.replaceAll(enterNewline, String
+					.valueOf((char) 13));
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得JS的字符串（主要处理特殊字符）<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String getStringForJS(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str;
+			returnValue = returnValue.replaceAll("\\\\", "\\\\\\\\");
+			returnValue = returnValue.replaceAll("\"", "\\\\\"");
+			returnValue = returnValue.replaceAll(enterNewline, "\\n");
+			returnValue = returnValue.replaceAll(String.valueOf((char) 13),
+					"\\n");
+			returnValue = returnValue.replaceAll("\n", "\\n");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得JS要替换的字符串正则表达式（主要处理特殊字符）<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String getStringForJSReplace(String str) {
+		String returnValue = "";
+		if (str != null && !"".equals(str)) {
+			returnValue = str;
+			returnValue = returnValue.replaceAll("\\\\", "\\\\\\\\\\\\\\\\");
+			returnValue = returnValue.replaceAll("\"", "\\\\\\\\\"");
+			returnValue = returnValue.replaceAll(enterNewline, "\\\\\\\\n");
+			returnValue = returnValue.replaceAll(String.valueOf((char) 13),
+					"\\\\\\\\n");
+			returnValue = returnValue.replaceAll("\n", "\\\\\\\\n");
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得当前URL完整地址，包括参数字符串<br>
+	 * 
+	 * @param request
+	 *            当前的 request 对象
+	 * @return String
+	 */
+	public static String getCurURL(HttpServletRequest request) {
+		String returnValue = request.getRequestURI();
+		String queryString = request.getQueryString();
+		if (queryString != null) {
+			returnValue = returnValue + "?" + queryString;
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得当前URL替换后的完整地址<br>
+	 * <br>
+	 * （注意：如替换的参数名不存则增加，参数值为中文直接用URLEncode方法转换，queryString中如有多个相同的参数则同时替换）
+	 * 
+	 * @param request
+	 *            当前的 request 对象
+	 * @param parameterMap
+	 *            替换的参数名与值的Map集合
+	 * @return String
+	 */
+	@SuppressWarnings("rawtypes")
+	public static String getCurURLReplaced(HttpServletRequest request,
+			Map parameterMap) {
+		String requestUri = request.getRequestURI();
+		String queryString = request.getQueryString();
+		return getCurURLReplaced(requestUri, queryString, parameterMap);
+	}
+
+	/**
+	 * 取得当前URL替换后的完整地址<br>
+	 * <br>
+	 * （注意：如替换的参数名不存则增加，参数值为中文直接用URLEncode方法转换，queryString中如有多个相同的参数则同时替换）
+	 * 
+	 * @param requestUri
+	 *            当前的请求地址
+	 * @param queryString
+	 *            当前请求地址中的get参数字符串
+	 * @param parameterMap
+	 *            替换的参数名与值的Map集合
+	 * @return String
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static String getCurURLReplaced(String requestUri,
+			String queryString, Map parameterMap) {
+		String returnValue = "";
+		requestUri = nullToStr(requestUri);
+		if (parameterMap == null || parameterMap.isEmpty()) { // 参数为空
+			if (queryString == null || "".equals(queryString)) {
+				returnValue = requestUri;
+			} else {
+				returnValue = requestUri + "?" + queryString;
+			}
+		} else {
+			String key, value;
+			if (queryString == null || "".equals(queryString)) { // 本身没有参数
+				StringBuffer sb = new StringBuffer();
+				Iterator iterator = parameterMap.keySet().iterator();
+				while (iterator.hasNext()) { // 不存在的新增
+					key = (String) iterator.next();
+					value = (String) parameterMap.get(key);
+					if (sb.length() == 0) {
+						sb.append("?");
+					} else {
+						sb.append("&");
+					}
+					sb.append(key + "=" + URLEncode(value));
+				}
+				returnValue = requestUri + sb.toString();
+
+			} else { // 本身有参数
+				StringBuffer sb = new StringBuffer();
+				String[] tempArray = queryString.split("&");
+				Map addMap = new HashMap(parameterMap);
+				for (int i = 0; i < tempArray.length; i++) {
+					String[] keyArray = tempArray[i].split("=");
+					key = keyArray[0];
+					sb.append("&");
+					if (parameterMap.containsKey(key)) {
+						value = (String) parameterMap.get(key);
+						sb.append(key + "=" + URLEncode(value));
+						addMap.remove(key);
+					} else {
+						sb.append(tempArray[i]);
+					}
+				}
+				Iterator iterator = addMap.keySet().iterator();
+				while (iterator.hasNext()) { // 不存在的新增
+					key = (String) iterator.next();
+					value = (String) addMap.get(key);
+					sb.append("&" + key + "=" + URLEncode(value));
+				}
+				returnValue = requestUri + "?" + sb.toString().substring(1);
+			}
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 中文字符串转换，转成 ISO8859-1 编码格式<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String getCharSetISO8859(String str) {
+		try {
+			if (str == null)
+				return "";
+			String tempStr = str;
+			byte[] tempArray = tempStr.getBytes("ISO8859-1");
+			String temp = new String(tempArray);
+			return temp;
+		} catch (Exception ex) {
+			logger.error("中文字符串转换出错ISO8859: " + ex.getMessage(), ex);
+		}
+		return "";
+	}
+
+	/**
+	 * 中文字符串转换，GBK转成 UTF8 编码格式<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String getGBK_UTF8(String str) {
+		try {
+			if (str == null)
+				return "";
+			String tempStr = str;
+			byte[] tempArray = tempStr.getBytes("GBK");
+			String temp = new String(tempArray, "UTF-8");
+			return temp;
+		} catch (Exception ex) {
+			logger.error("中文字符串转换出错GBK_UTF8: " + ex.getMessage(), ex);
+		}
+		return "";
+	}
+
+	/**
+	 * 中文字符串转换，UTF8转成GBK 编码格式<br>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String getUTF8_GBK(String str) {
+		try {
+			if (str == null)
+				return "";
+			String tempStr = str;
+			byte[] tempArray = tempStr.getBytes("UTF-8");
+			String temp = new String(tempArray, "GBK");
+			return temp;
+		} catch (Exception ex) {
+			logger.error("中文字符串转换出错UTF8_GBK: " + ex.getMessage(), ex);
+		}
+		return "";
+	}
+
+	/**
+	 * URL中的中文字符串转换<br>
+	 * 
+	 * <p>
+	 * 说明：没有通过页面提交的，则用java.net.URLDecoder.decode(str, "UTF-8")还原
+	 * </p>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String URLEncode(String str) {
+		String returnValue = "";
+		try {
+			if (str != null) {
+				returnValue = java.net.URLEncoder.encode(str, "UTF-8");
+			}
+		} catch (Exception ex) {
+			logger.error("URL中的中文字符串转换出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+
+	/**
+	 * URL中的中文字符串还原<br>
+	 * 
+	 * <p>
+	 * 说明：直接用URLEncode()的返回值调用该方法是无效的，必须是在请求页面中调用才能还原，因为页面请求是按 ISO8859-1 格式编码的
+	 * </p>
+	 * 
+	 * @param str
+	 * @return String
+	 */
+	public static String URLDecode(String str) {
+		String returnValue = "";
+		try {
+			if (str != null) {
+				byte[] tempArray = str.getBytes("ISO8859-1");
+				returnValue = new String(tempArray, "UTF-8");
+			}
+		} catch (Exception ex) {
+			logger.error("URL中的中文字符串还原出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得字符串长度(一个汉字为两个字符长度)<br>
+	 * 
+	 * @param sourceStr
+	 *            需要处理的字符串
+	 * @return long
+	 */
+	public static long getStringLength(String sourceStr) {
+		long returnValue = 0;
+		if (sourceStr == null) {
+			return (returnValue);
+		}
+		for (int i = 0; i < sourceStr.length(); i++) {
+			char[] tempChar = sourceStr.substring(i, i + 1).toCharArray();
+			if ((int) tempChar[0] > 255)
+				returnValue += 2;
+			else
+				returnValue++;
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得重复次数的字符串<br>
+	 * 
+	 * @param sourceStr
+	 *            重复源
+	 * @param repeatTimes
+	 *            重复次数
+	 * @return String
+	 */
+	public static String getRepeatString(String sourceStr, long repeatTimes) {
+		if (repeatTimes == 0) {
+			return "";
+		}
+		StringBuffer returnStr = new StringBuffer();
+		for (int i = 0; i < repeatTimes; i++) {
+			returnStr.append(sourceStr);
+		}
+		return returnStr.toString();
+	}
+
+	/**
+	 * 取得指定长度的左字符串,不足长度的以 replaceString 右填充<br>
+	 * 
+	 * @param sourceStr
+	 *            需要处理的字符串
+	 * @param specityLength
+	 *            指定长度(一个汉字为两个字符长度,如果截断地方为一个汉字,则可能长度小1)
+	 * @param replaceString
+	 *            不足长度时填充的字符
+	 * @return String
+	 */
+	public static String getLeftSpecifyString(String sourceStr,
+			long specityLength, String replaceString) {
+		if (sourceStr == null) {
+			return (getRepeatString(replaceString, specityLength));
+		}
+		long realLength = getStringLength(sourceStr);
+		StringBuffer returnStr = new StringBuffer();
+		if (realLength < specityLength) {
+			returnStr.append(sourceStr);
+			returnStr.append(getRepeatString(replaceString, specityLength
+					- realLength));
+		} else {
+			returnStr.append(getLeftString(sourceStr, specityLength));
+		}
+		return returnStr.toString();
+	}
+
+	/**
+	 * 取得字符串的左子串,长度由 leftLength 指定<br>
+	 * 
+	 * @param sourceStr
+	 *            需要处理的字符串
+	 * @param leftLength
+	 *            指定长度,从左边取该长度(一个汉字为两个字符长度,如果截断地方为一个汉字,则可能长度小1)
+	 * @return String
+	 */
+	public static String getLeftString(String sourceStr, long leftLength) {
+		StringBuffer returnStr = new StringBuffer();
+		long tempLength = 0;
+		for (int i = 0; i < sourceStr.length(); i++) {
+			String tempStr = sourceStr.substring(i, i + 1);
+			char[] tempChar = tempStr.toCharArray();
+			if ((int) tempChar[0] > 255)
+				tempLength += 2;
+			else
+				tempLength++;
+			if (tempLength < leftLength) {
+				returnStr.append(tempStr);
+			} else {
+				if (tempLength == leftLength)
+					returnStr.append(tempStr);
+				break;
+			}
+		}
+		return returnStr.toString();
+	}
+
+	/**
+	 * 取得指定长度的右字符串,不足长度的以 replaceString 左填充<br>
+	 * 
+	 * @param sourceStr
+	 *            需要处理的字符串
+	 * @param specityLength
+	 *            指定长度(一个汉字为两个字符长度,如果截断地方为一个汉字,则可能长度小1)
+	 * @param replaceString
+	 *            不足长度时填充的字符
+	 * @return String
+	 */
+	public static String getRightSpecifyString(String sourceStr,
+			long specityLength, String replaceString) {
+		if (sourceStr == null) {
+			return (getRepeatString(replaceString, specityLength));
+		}
+		long realLength = getStringLength(sourceStr);
+		StringBuffer returnStr = new StringBuffer();
+		if (realLength < specityLength) {
+			returnStr.append(getRepeatString(replaceString, specityLength
+					- realLength));
+			returnStr.append(sourceStr);
+		} else {
+			returnStr.append(getRightString(sourceStr, specityLength));
+		}
+		return returnStr.toString();
+	}
+
+	/**
+	 * 取得字符串的右子串,长度由 leftLength 指定<br>
+	 * 
+	 * @param sourceStr
+	 *            需要处理的字符串
+	 * @param rightLength
+	 *            指定长度,从右边取该长度(一个汉字为两个字符长度,如果截断地方为一个汉字,则可能长度小1)
+	 * @return String
+	 */
+	public static String getRightString(String sourceStr, long rightLength) {
+		StringBuffer returnStr = new StringBuffer();
+		long tempLength = 0;
+		for (int i = sourceStr.length() - 1; i >= 0; i--) {
+			String tempStr = sourceStr.substring(i, i + 1);
+			char[] tempChar = tempStr.toCharArray();
+			if ((int) tempChar[0] > 255)
+				tempLength += 2;
+			else
+				tempLength++;
+			if (tempLength < rightLength) {
+				returnStr.insert(0, tempStr);
+			} else {
+				if (tempLength == rightLength)
+					returnStr.insert(0, tempStr);
+				break;
+			}
+		}
+		return returnStr.toString();
+	}
+
+	/**
+	 * 取得指定长度的字符串,长度由 targetlength 指定<br>
+	 * 
+	 * @param sourceString
+	 *            需要处理的字符串
+	 * @param targetlength
+	 *            指定长度,从左边取该长度(一个汉字为两个字符长度)
+	 * @return String
+	 */
+	public static String displayTitle(String sourceString, long targetlength) {
+		String returnValue = "";
+		if (sourceString != null) {
+			if (getStringLength(sourceString) <= targetlength * 2)
+				returnValue = sourceString;
+			else
+				returnValue = getLeftString(sourceString,
+						(targetlength - 1) * 2)
+						+ "…";
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 把格式化的日期转换为没有分隔符的字数日期
+	 * 
+	 * @param s
+	 * @return
+	 */
+	public static String changeTime(String s) {
+		String time = "";
+		if (!"".equals(s)) {
+			String[] ss = s.split(" ");
+
+			if (ss.length == 2) {
+				String[] sss = ss[0].split("-");
+				String[] sss2 = ss[1].split(":");
+				for (int i = 0; i < sss.length; i++) {
+					time = time + sss[i];
+				}
+				for (int i = 0; i < sss2.length; i++) {
+					time = time + sss2[i];
+				}
+			} else if (ss.length == 1) {
+				String[] sss = ss[0].split("-");
+				if (sss.length == 1) {
+					time = sss[0];
+				} else {
+					for (int i = 0; i < sss.length; i++) {
+						time = time + sss[i];
+					}
+				}
+			}
+		}
+		return time;
+	}
+
+	/**
+	 * 取得人民币大写金额<br>
+	 * 
+	 * @param money
+	 * @return String
+	 */
+	public static String getChineseMoney(double money) {
+		if (money > 999999999999999.99 || money < 0) { // 不符合的数值
+			return "";
+		}
+		if (money == 0) {
+			return "零元整";
+		}
+		StringBuffer returnValue = new StringBuffer();
+		String chinaDigital[] = new String[] { "零", "壹", "贰", "叁", "肆", "伍",
+				"陆", "柒", "捌", "玖" };
+		String chinaUnit[] = new String[] { "仟", "佰", "拾", "万", "仟", "佰", "拾",
+				"亿", "仟", "佰", "拾", "万", "仟", "佰", "拾", "", "元", "角", "分" };
+		java.text.DecimalFormat fmt = new java.text.DecimalFormat(".00");
+		String moneyStr = fmt.format(money);
+		int moneyLength = moneyStr.length();
+		String tempChar = "";
+		int tempInt = 0;
+		int tempAtArray = 0;
+		int zeroCount = 0; // 记0个数
+		boolean lastZero = false;
+		for (int i = 0; i < moneyLength; i++) {
+			tempChar = moneyStr.substring(i, i + 1);
+			if (".".equals(tempChar)) {
+				if (money >= 1) {
+					returnValue.append("元");
+				}
+			} else {
+				tempInt = Integer.parseInt(tempChar);
+				tempAtArray = 19 - moneyLength + i;
+				if (tempInt == 0) { // 为零的处理
+					lastZero = true;
+					zeroCount++;
+					if (tempAtArray == 7
+							|| (tempAtArray % 4 == 3 && zeroCount < 4)) { // 亿必需出现
+						returnValue.append(chinaUnit[tempAtArray]);
+						zeroCount = 0;
+					}
+				} else {
+					zeroCount = 0;
+					if (lastZero) {
+						if (money >= 1) {
+							returnValue.append(chinaDigital[0]);
+						}
+					}
+					returnValue.append(chinaDigital[tempInt]);
+					returnValue.append(chinaUnit[tempAtArray]);
+					lastZero = false;
+				}
+			}
+		}
+		if (moneyStr.endsWith("0")) {
+			returnValue.append("整");
+		}
+		return returnValue.toString();
+	}
+
+	/**
+	 * 判断字符串是否为空，空格、回车符、换行符、Tab符默认为空<br>
+	 * 
+	 * @param str
+	 *            判断的字符串
+	 * @return boolean 返回是否为空(为null时返回true)
+	 */
+	public static boolean isBlank(Object temp) {
+		boolean returnValue = true;
+		if (temp != null) {
+			if (temp instanceof String)
+				returnValue = temp.toString().matches("\\s*");
+			else
+				returnValue = false;
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得用人民币大写金额表示的整数,格式如: (贰仟零捌万零伍佰壹拾贰)<br>
+	 * 
+	 * @param money
+	 * @return String
+	 */
+	public static String getChineseNumberAsMoney(long money) {
+		if (money > 999999999999999.99 || money < 0) { // 不符合的数值
+			return "";
+		}
+		if (money == 0) {
+			return "零";
+		}
+		StringBuffer returnValue = new StringBuffer();
+		String chinaDigital[] = new String[] { "零", "壹", "贰", "叁", "肆", "伍",
+				"陆", "柒", "捌", "玖" };
+		String chinaUnit[] = new String[] { "仟", "佰", "拾", "万", "仟", "佰", "拾",
+				"亿", "仟", "佰", "拾", "万", "仟", "佰", "拾", "", "", "", "" };
+		java.text.DecimalFormat fmt = new java.text.DecimalFormat(".00");
+		String moneyStr = fmt.format(money);
+		int moneyLength = moneyStr.length();
+		String tempChar = "";
+		int tempInt = 0;
+		int tempAtArray = 0;
+		int zeroCount = 0; // 记0个数
+		boolean lastZero = false;
+		for (int i = 0; i < moneyLength; i++) {
+			tempChar = moneyStr.substring(i, i + 1);
+			if (".".equals(tempChar)) {
+				if (money >= 1) {
+					// returnValue.append("元");
+				}
+			} else {
+				tempInt = Integer.parseInt(tempChar);
+				tempAtArray = 19 - moneyLength + i;
+				if (tempInt == 0) { // 为零的处理
+					lastZero = true;
+					zeroCount++;
+					if (tempAtArray == 7
+							|| (tempAtArray % 4 == 3 && zeroCount < 4)) { // 亿必需出现
+						returnValue.append(chinaUnit[tempAtArray]);
+						zeroCount = 0;
+					}
+				} else {
+					zeroCount = 0;
+					if (lastZero) {
+						if (money >= 1) {
+							returnValue.append(chinaDigital[0]);
+						}
+					}
+					returnValue.append(chinaDigital[tempInt]);
+					returnValue.append(chinaUnit[tempAtArray]);
+					lastZero = false;
+				}
+			}
+		}
+		return returnValue.toString();
+	}
+
+	/**
+	 * 取得 0 到 999999999 之间的数字中文字符串,格式如: (二千零八万零五百一十二)<br>
+	 * 
+	 * @param num
+	 * @return String
+	 */
+	public static String getChineseNumber(long number) {
+		if (number > 999999999 || number < 0) { // 不符合的数值
+			return "";
+		}
+		if (number == 0) {
+			return "零";
+		}
+		StringBuffer returnValue = new StringBuffer();
+		String chinaDigital[] = new String[] { "零", "一", "二", "三", "四", "五",
+				"六", "七", "八", "九" };
+		String chinaUnit[] = new String[] { "亿", "千", "百", "十", "万", "千", "百",
+				"十", "" };
+		String tempStr = "" + number;
+		int numberLength = tempStr.length();
+		String tempChar = "";
+		int tempInt = 0;
+		int tempAtArray = 0;
+		int zeroCount = 0;
+		boolean lastZero = false;
+		for (int i = 0; i < numberLength; i++) {
+			tempChar = tempStr.substring(i, i + 1);
+			tempInt = Integer.parseInt(tempChar);
+			tempAtArray = 9 - numberLength + i;
+			if (tempInt == 0) { // 为零的处理
+				lastZero = true;
+				zeroCount++;
+				if (tempAtArray == 0 || (tempAtArray % 4 == 0 && zeroCount < 4)) { // 亿必需出现
+					returnValue.append(chinaUnit[tempAtArray]);
+					zeroCount = 0;
+				}
+			} else {
+				zeroCount = 0;
+				if (lastZero) {
+					if (number >= 1) {
+						returnValue.append(chinaDigital[0]);
+					}
+				}
+				returnValue.append(chinaDigital[tempInt]);
+				returnValue.append(chinaUnit[tempAtArray]);
+				lastZero = false;
+			}
+		}
+		return returnValue.toString();
+	}
+
+	/**
+	 * 将 15 位身份证号码转换为 18 位身份证号码<br>
+	 * 
+	 * @param sfzh
+	 * @return String
+	 */
+	public static String convertTo18Sfzh(String sfzh) {
+		String returnValue = sfzh;
+		try {
+			if (sfzh.length() == 15) {
+				String tempStr1 = sfzh.substring(0, 6);
+				String tempStr2 = "19" + sfzh.substring(6);
+				String tempStrAll = tempStr1 + tempStr2;
+				int lastAt = 0;
+				for (int i = 0; i < 17; i++) {
+					int bitInt = Integer.parseInt(tempStrAll
+							.substring(i, i + 1));
+					int bitIntTemp = 1;
+					for (int j = 0; j < 17 - i; j++) {
+						bitIntTemp = (bitIntTemp * 2) % 11;
+					}
+					lastAt += bitInt * bitIntTemp;
+				}
+				lastAt = lastAt % 11;
+				returnValue = tempStrAll
+						+ "10X98765432".substring(lastAt, lastAt + 1);
+			}
+		} catch (Exception ex) {
+			logger.error("转换成18位身份证号码出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 是否为一个有效的 18 位身份证号码<br>
+	 * 
+	 * @param sfzh
+	 * @return boolean
+	 */
+	@SuppressWarnings("unused")
+	public static boolean isValidSfzh(String sfzh) {
+		boolean returnValue = false;
+		try {
+			if (!isBlank(sfzh)) {
+				int length = sfzh.length();
+				if (length == 18) {
+					boolean bitValid = true;
+					for (int i = 0; i < 17; i++) {
+						String bitChar = sfzh.substring(i, i + 1);
+						if ("1234567890".indexOf(bitChar) == -1) {
+							bitValid = false;
+							break;
+						}
+					}
+					if (bitValid) {
+						java.util.Date csrq = DateUtils.stringToDate(sfzh
+								.substring(6, 14), "yyyyMMdd");
+						int lastAt = 0;
+						for (int i = 0; i < 17; i++) {
+							int bitInt = Integer.parseInt(sfzh.substring(i,
+									i + 1));
+							int bitIntTemp = 1;
+							for (int j = 0; j < 17 - i; j++) {
+								bitIntTemp = (bitIntTemp * 2) % 11;
+							}
+							lastAt += bitInt * bitIntTemp;
+						}
+						lastAt = lastAt % 11;
+						String checkBit = "10X98765432".substring(lastAt,
+								lastAt + 1);
+						String lastBit = sfzh.substring(17);
+						lastBit = lastBit.toUpperCase();
+						if (checkBit.equals(lastBit)) {
+							returnValue = true;
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			// logger.error("18 位身份证号码校验出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 取得HTML中某个结点替换后的字符串（流程定义保存HTML时用）<br>
+	 * 说明：搜索到关键字后以<>为前后匹配截取
+	 * 
+	 * @param htmlString
+	 *            HTML字符串
+	 * @param searchKey
+	 *            搜索关键字
+	 * @param nodeString
+	 *            新的结点字符串
+	 * @return String
+	 */
+	public static String getHTMLNodeReplaceString(String htmlString,
+			String searchKey, String nodeString) {
+		String returnValue = htmlString;
+		if (!isBlank(htmlString) && !isBlank(searchKey)) {
+			int foundI = htmlString.indexOf(searchKey);
+			if (foundI != -1) {
+				int startI = htmlString.lastIndexOf("<", foundI);
+				int endI = htmlString.indexOf(">", foundI);
+				if (startI != -1 && endI != -1) {
+					returnValue = htmlString.substring(0, startI)
+							+ nullToStr(nodeString)
+							+ htmlString.substring(endI + 1);
+				}
+			}
+		}
+		return returnValue;
+	}
+
+	/**
+	 * 生成32位的UUID<br>
+	 * 
+	 * @return String
+	 */
+	public static String get32UUID() {
+		UUID uuid = UUID.randomUUID();
+		String returnValue = uuid.toString();
+		returnValue = returnValue.replace("-", "");
+		return returnValue;
+	}
+
+
+	
+	
+	//更具所属责任区生成对应SQL
+		public static String GenerationSql(String sszrq){
+			String[] sszrqArray = sszrq.split(",");
+			StringBuffer sb = new StringBuffer();
+			sb.append("and (");
+			for(int i = 0 ; i < sszrqArray.length ; i++ ){
+				if(null != sszrqArray[i] && !sszrqArray[i].equals("")){
+					sb.append(" code = '"+ sszrqArray[i] +"' ");
+					if(i != (sszrqArray.length-1)){
+						sb.append(" or ");
+					}
+				}
+			}
+			sb.append(")");
+			return sb.toString();
+		}
+ 
+	/**
+	 * 去掉字符串中的空格、回车、换行符、制表符
+	 * 
+	 * replaceBlank (这里用一句话描述这个方法的作用)
+	 * TODO(这里描述方法适用条件/执行流程/使用方法/注意事项)
+	 * @author Administrator
+	 * @datetime 2016-5-3 下午4:50:01
+	 * @param str
+	 * @return
+	 * @throws (抛出的异常)
+	 * @since JDK 1.7
+	 */
+	public static String replaceBlank(String str) {
+		if (str != null) {
+			Pattern ptn = Pattern.compile("\\s*|\t|\r|\n");
+			Matcher matcher = ptn.matcher(str);
+			return matcher.replaceAll("");
+		}
+		return str;
+	}
+	
+	/**
+	 * Base64字符串转码至byte数组
+	 * @param str
+	 * @return
+	 */
+	public static byte[] getBase64DecodeByte(String str) {
+		byte[] returnValue = (byte[])null;
+		try {
+			if(!StringUtils.isBlank(str)) {
+				returnValue = Base64.decodeBase64(str);
+			}
+		} catch (Exception e) {
+			// logger.error("取得byte数组解码后的BASE64出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+
+	/**
+	 * byte数组转码至Base64字符串
+	 * @param bytes
+	 * @return
+	 */
+	public static String getByteToBase64(byte[] bytes) {
+		String returnValue = "";
+		try {
+			if(bytes != null) {
+				returnValue = Base64.encodeBase64String(bytes);
+			}
+		} catch (Exception e) {
+			// logger.error("取得byte数组解码后的BASE64出错: " + ex.getMessage(), ex);
+		}
+		return returnValue;
+	}
+	
+}
diff --git a/mosty-hczx/src/main/resources/application.yml b/mosty-hczx/src/main/resources/application.yml
new file mode 100644
index 0000000..ca6d56c
--- /dev/null
+++ b/mosty-hczx/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_hczx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
diff --git a/mosty-hczx/src/main/resources/bootstrap.yml b/mosty-hczx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..1639575
--- /dev/null
+++ b/mosty-hczx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8014
+  servlet:
+    context-path: /mosty-hczx/
+spring:
+  application:
+    name: mosty-hczx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-hczx/src/main/resources/logback-spring.xml b/mosty-hczx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-hczx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-hczx/src/main/resources/mapper/TbHcBpcclMapper.xml b/mosty-hczx/src/main/resources/mapper/TbHcBpcclMapper.xml
new file mode 100644
index 0000000..83351ae
--- /dev/null
+++ b/mosty-hczx/src/main/resources/mapper/TbHcBpcclMapper.xml
@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.hczx.mapper.TbHcBpcclMapper">
+    <resultMap type="com.mosty.base.model.entity.hczx.TbHcBpccl" id="tbHcBpccl">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="hpzl" column="hpzl" jdbcType="VARCHAR"/>
+        <result property="hphm" column="hphm" jdbcType="VARCHAR"/>
+        <result property="clsbdh" column="clsbdh" jdbcType="VARCHAR"/>
+        <result property="jdcsyrsfzh" column="jdcsyrsfzh" jdbcType="VARCHAR"/>
+        <result property="jdcsyr" column="jdcsyr" jdbcType="VARCHAR"/>
+        <result property="pcrq" column="pcrq" jdbcType="TIMESTAMP"/>
+        <result property="pcsj" column="pcsj" jdbcType="TIMESTAMP"/>
+        <result property="pcsrlx" column="pcsrlx" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="bqmc" column="bqmc" jdbcType="VARCHAR"/>
+        <result property="bqxxsj" column="bqxxsj" jdbcType="VARCHAR"/>
+        <result property="pcclJg" column="pccl_jg" jdbcType="VARCHAR"/>
+        <result property="pcclJgmc" column="pccl_jgmc" jdbcType="VARCHAR"/>
+        <result property="pcclYjdwdm" column="pccl_yjdwdm" jdbcType="VARCHAR"/>
+        <result property="pcclYjdw" column="pccl_yjdw" jdbcType="VARCHAR"/>
+        <result property="pcclYjyy" column="pccl_yjyy" jdbcType="VARCHAR"/>
+        <result property="pcmjId" column="pcmj_id" jdbcType="VARCHAR"/>
+        <result property="pcmjSfzh" column="pcmj_sfzh" jdbcType="VARCHAR"/>
+        <result property="pcmjXm" column="pcmj_xm" jdbcType="VARCHAR"/>
+        <result property="pcmjJh" column="pcmj_jh" jdbcType="VARCHAR"/>
+        <result property="kkId" column="kk_id" jdbcType="VARCHAR"/>
+        <result property="kkSsdwdm" column="kk_ssdwdm" jdbcType="VARCHAR"/>
+        <result property="kkSsdwmc" column="kk_ssdwmc" jdbcType="VARCHAR"/>
+        <result property="kkSsfsxdm" column="kk_ssfsxdm" jdbcType="VARCHAR"/>
+        <result property="kkSsfsxmc" column="kk_ssfsxmc" jdbcType="VARCHAR"/>
+        <result property="kkSsdszdm" column="kk_ssdszdm" jdbcType="VARCHAR"/>
+        <result property="kkSsdszmc" column="kk_ssdszmc" jdbcType="VARCHAR"/>
+        <result property="kkLx" column="kk_lx" jdbcType="VARCHAR"/>
+        <result property="kkMc" column="kk_mc" jdbcType="VARCHAR"/>
+        <result property="kkXzqh" column="kk_xzqh" jdbcType="VARCHAR"/>
+        <result property="kkSzmc" column="kk_szmc" jdbcType="VARCHAR"/>
+        <result property="kkHchrlx" column="kk_hchrlx" jdbcType="VARCHAR"/>
+        <result property="kkSfsz" column="kk_sfsz" jdbcType="VARCHAR"/>
+        <result property="sjly" column="sjly" jdbcType="VARCHAR"/>
+        <result property="zdxh" column="zdxh" jdbcType="VARCHAR"/>
+        <result property="zdch" column="zdch" jdbcType="VARCHAR"/>
+        <result property="zdsim" column="zdsim" jdbcType="VARCHAR"/>
+        <result property="ssdwdycs" column="ssdwdycs" jdbcType="INTEGER"/>
+        <result property="glxtdm" column="glxtdm" jdbcType="VARCHAR"/>
+        <result property="glxtid" column="glxtid" jdbcType="VARCHAR"/>
+        <result property="xsd" column="xsd" jdbcType="VARCHAR"/>
+        <result property="sfxf" column="sfxf" jdbcType="VARCHAR"/>
+        <result property="yjzlid" column="yjzlid" jdbcType="VARCHAR"/>
+        <result property="jzid" column="jzid" jdbcType="VARCHAR"/>
+        <result property="bbid" column="bbid" jdbcType="VARCHAR"/>
+        <result property="pcfs" column="pcfs" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id,hpzl,hphm,clsbdh,jdcsyrsfzh,jdcsyr,pcrq,pcsj,pcsrlx,jd,wd,zbhash,bqmc,ssbmid,ssxgajid,sssgajid,
+                                        bqxxsj,pccl_jg,pccl_jgmc,pccl_yjdwdm,pccl_yjdw,pccl_yjyy,pcmj_id,pcmj_sfzh,pcmj_xm,pcmj_jh,kk_id,
+                                        kk_ssdwdm,kk_ssdwmc,kk_ssfsxdm,kk_ssfsxmc,kk_ssdszdm,kk_ssdszmc,kk_lx,kk_mc,kk_xzqh,kk_szmc,
+                                        kk_hchrlx,kk_sfsz,sjly,zdxh,zdch,zdsim,ssdwdycs,glxtdm,glxtid,xsd,sfxf,yjzlid,jzid,bbid,pcfs,
+                                        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                                        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.hczx.TbHcBpccl">
+        insert into tb_hc_bpccl(id, hpzl, hphm, clsbdh, jdcsyrsfzh, jdcsyr, pcrq, pcsj, pcsrlx, jd, wd, zb, zbhash,
+                                ssbmid, ssxgajid, sssgajid,
+                                bqmc, bqxxsj, pccl_jg, pccl_jgmc, pccl_yjdwdm, pccl_yjdw, pccl_yjyy,
+                                pcmj_id, pcmj_sfzh, pcmj_xm, pcmj_jh, kk_id, kk_ssdwdm, kk_ssdwmc, kk_ssfsxdm,
+                                kk_ssfsxmc, kk_ssdszdm, kk_ssdszmc, kk_lx, kk_mc, kk_xzqh, kk_szmc, kk_hchrlx,
+                                kk_sfsz, sjly, zdxh, zdch, zdsim, ssdwdycs, glxtdm, glxtid, xsd, sfxf, yjzlid, jzid,
+                                bbid, pcfs, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                                xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{hpzl}, #{hphm}, #{clsbdh}, #{jdcsyrsfzh}, #{jdcsyr}, #{pcrq}, #{pcsj}, #{pcsrlx}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{ssbmid}, #{ssxgajid}, #{sssgajid}, #{bqmc}, #{bqxxsj}, #{pcclJg}, #{pcclJgmc},
+                #{pcclYjdwdm}, #{pcclYjdw}, #{pcclYjyy},
+                #{pcmjId}, #{pcmjSfzh}, #{pcmjXm}, #{pcmjJh}, #{kkId}, #{kkSsdwdm}, #{kkSsdwmc}, #{kkSsfsxdm},
+                #{kkSsfsxmc}, #{kkSsdszdm}, #{kkSsdszmc}, #{kkLx}, #{kkMc}, #{kkXzqh}, #{kkSzmc}, #{kkHchrlx},
+                #{kkSfsz}, #{sjly}, #{zdxh}, #{zdch}, #{zdsim}, #{ssdwdycs}, #{glxtdm}, #{glxtid}, #{xsd},
+                #{sfxf}, #{yjzlid}, #{jzid}, #{bbid}, #{pcfs}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm},
+                #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <select id="selectCarCount" resultType="Integer">
+        select count(*)
+        from tb_hc_bpccl
+        where DATE_FORMAT(pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(*)
+        from tb_hc_bpccl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and DATE_FORMAT(a.pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="dto.hpzl != null and dto.hpzl != ''">
+            and hpzl = #{dto.hpzl}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and hphm like concat('%',#{dto.hphm},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="getList" resultType="com.mosty.base.model.entity.hczx.TbHcBpccl" parameterType="Map">
+        select * from tb_hc_bpccl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and DATE_FORMAT(a.pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="dto.hpzl != null and dto.hpzl != ''">
+            and hpzl = #{dto.hpzl}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and hphm like concat('%',#{dto.hphm},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        order by pcrq desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.hczx.TbHcBpccl">
+        update tb_hc_bpccl
+        <set>
+            <if test="hpzl != null and hpzl != ''">
+                hpzl = #{hpzl},
+            </if>
+            <if test="hphm != null and hphm != ''">
+                hphm = #{hphm},
+            </if>
+            <if test="clsbdh != null and clsbdh != ''">
+                clsbdh = #{clsbdh},
+            </if>
+            <if test="jdcsyrsfzh != null and jdcsyrsfzh != ''">
+                jdcsyrsfzh = #{jdcsyrsfzh},
+            </if>
+            <if test="jdcsyr != null and jdcsyr != ''">
+                jdcsyr = #{jdcsyr},
+            </if>
+            <if test="pcrq != null">
+                pcrq = #{pcrq},
+            </if>
+            <if test="pcsj != null">
+                pcsj = #{pcsj},
+            </if>
+            <if test="pcsrlx != null and pcsrlx != ''">
+                pcsrlx = #{pcsrlx},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="bqmc != null and bqmc != ''">
+                bqmc = #{bqmc},
+            </if>
+            <if test="bqxxsj != null and bqxxsj != ''">
+                bqxxsj = #{bqxxsj},
+            </if>
+            <if test="pcclJg != null and pcclJg != ''">
+                pccl_jg = #{pcclJg},
+            </if>
+            <if test="pcclJgmc != null and pcclJgmc != ''">
+                pccl_jgmc = #{pcclJgmc},
+            </if>
+            <if test="pcclYjdwdm != null and pcclYjdwdm != ''">
+                pccl_yjdwdm = #{pcclYjdwdm},
+            </if>
+            <if test="pcclYjdw != null and pcclYjdw != ''">
+                pccl_yjdw = #{pcclYjdw},
+            </if>
+            <if test="pcclYjyy != null and pcclYjyy != ''">
+                pccl_yjyy = #{pcclYjyy},
+            </if>
+            <if test="pcmjId != null and pcmjId != ''">
+                pcmj_id = #{pcmjId},
+            </if>
+            <if test="pcmjSfzh != null and pcmjSfzh != ''">
+                pcmj_sfzh = #{pcmjSfzh},
+            </if>
+            <if test="pcmjXm != null and pcmjXm != ''">
+                pcmj_xm = #{pcmjXm},
+            </if>
+            <if test="pcmjJh != null and pcmjJh != ''">
+                pcmj_jh = #{pcmjJh},
+            </if>
+            <if test="kkId != null and kkId != ''">
+                kk_id = #{kkId},
+            </if>
+            <if test="kkSsdwdm != null and kkSsdwdm != ''">
+                kk_ssdwdm = #{kkSsdwdm},
+            </if>
+            <if test="kkSsdwmc != null and kkSsdwmc != ''">
+                kk_ssdwmc = #{kkSsdwmc},
+            </if>
+            <if test="kkSsfsxdm != null and kkSsfsxdm != ''">
+                kk_ssfsxdm = #{kkSsfsxdm},
+            </if>
+            <if test="kkSsfsxmc != null and kkSsfsxmc != ''">
+                kk_ssfsxmc = #{kkSsfsxmc},
+            </if>
+            <if test="kkSsdszdm != null and kkSsdszdm != ''">
+                kk_ssdszdm = #{kkSsdszdm},
+            </if>
+            <if test="kkSsdszmc != null and kkSsdszmc != ''">
+                kk_ssdszmc = #{kkSsdszmc},
+            </if>
+            <if test="kkLx != null and kkLx != ''">
+                kk_lx = #{kkLx},
+            </if>
+            <if test="kkMc != null and kkMc != ''">
+                kk_mc = #{kkMc},
+            </if>
+            <if test="kkXzqh != null and kkXzqh != ''">
+                kk_xzqh = #{kkXzqh},
+            </if>
+            <if test="kkSzmc != null and kkSzmc != ''">
+                kk_szmc = #{kkSzmc},
+            </if>
+            <if test="kkHchrlx != null and kkHchrlx != ''">
+                kk_hchrlx = #{kkHchrlx},
+            </if>
+            <if test="kkSfsz != null and kkSfsz != ''">
+                kk_sfsz = #{kkSfsz},
+            </if>
+            <if test="sjly != null and sjly != ''">
+                sjly = #{sjly},
+            </if>
+            <if test="zdxh != null and zdxh != ''">
+                zdxh = #{zdxh},
+            </if>
+            <if test="zdch != null and zdch != ''">
+                zdch = #{zdch},
+            </if>
+            <if test="zdsim != null and zdsim != ''">
+                zdsim = #{zdsim},
+            </if>
+            <if test="ssdwdycs != null">
+                ssdwdycs = #{ssdwdycs},
+            </if>
+            <if test="glxtdm != null and glxtdm != ''">
+                glxtdm = #{glxtdm},
+            </if>
+            <if test="glxtid != null and glxtid != ''">
+                glxtid = #{glxtid},
+            </if>
+            <if test="xsd != null and xsd != ''">
+                xsd = #{xsd},
+            </if>
+            <if test="sfxf != null and sfxf != ''">
+                sfxf = #{sfxf},
+            </if>
+            <if test="yjzlid != null and yjzlid != ''">
+                yjzlid = #{yjzlid},
+            </if>
+            <if test="jzid != null and jzid != ''">
+                jzid = #{jzid},
+            </if>
+            <if test="bbid != null and bbid != ''">
+                bbid = #{bbid},
+            </if>
+            <if test="pcfs != null and pcfs != ''">
+                pcfs = #{pcfs},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getClOf2h" resultMap="tbHcBpccl">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from (
+        select b.hphm as hphm_b,max(b.pcsj) as pcsj_b from tb_hc_bpccl b where b.xt_sjzt = '1' and b.xt_scbz = '0'
+        and b.id not in (
+        select pccl_id from tb_hc_bpcry c where c.xt_scbz = '0' and c.xt_sjzt = '1' and c.pccl_id is not null
+        )
+        and b.pcmj_sfzh = #{sfzh}
+        and DATE_FORMAT(b.pcsj,'%Y-%m-%d %H:%i:%s') >= #{time}
+        group by b.hphm
+        ) t left join tb_hc_bpccl a on a.hphm = t.hphm_b and t.pcsj_b = a.pcsj
+        and a.xt_scbz = '0' and a.xt_sjzt = '1'
+    </select>
+
+    <select id="getCountCl" resultType="int">
+        select count(1) from tb_hc_bpccl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.pcclJg != null and dto.pcclJg != ''">
+            and pccl_jg = #{dto.pcclJg}
+        </if>
+        <if test="dto.hpzl != null and dto.hpzl != ''">
+            and hpzl = #{dto.hpzl}
+        </if>
+        <if test="dto.pcsrlx != null and dto.pcsrlx != ''">
+            and pcsrlx = #{dto.pcsrlx}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and hphm like concat('%',#{dto.hphm},'%')
+        </if>
+
+        <if test="dto.pcmjXm != null and dto.pcmjXm != ''">
+            and pcmj_xm like concat('%',#{dto.pcmjXm},'%')
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and DATE_FORMAT(pcrq,'%Y-%m-%d') between #{dto.kssj} and #{dto.jssj}
+        </if>
+        <if test="dto.bqmc != null and dto.bqmc != ''">
+            and bqmc like concat('%',#{dto.bqmc}, '%')
+        </if>
+
+    </select>
+
+    <select id="getListCl" resultMap="tbHcBpccl">
+        select
+        <include refid="base_column_list"/>
+        from tb_hc_bpccl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.pcclJg != null and dto.pcclJg != ''">
+            and pccl_jg = #{dto.pcclJg}
+        </if>
+        <if test="dto.hpzl != null and dto.hpzl != ''">
+            and hpzl = #{dto.hpzl}
+        </if>
+        <if test="dto.pcsrlx != null and dto.pcsrlx != ''">
+            and pcsrlx = #{dto.pcsrlx}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and hphm like concat('%',#{dto.hphm},'%')
+        </if>
+        <if test="dto.pcmjXm != null and dto.pcmjXm != ''">
+            and pcmj_xm like concat('%',#{dto.pcmjXm},'%')
+        </if>
+
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and DATE_FORMAT(pcrq,'%Y-%m-%d') between #{dto.kssj} and #{dto.jssj}
+        </if>
+        <if test="dto.bqmc != null and dto.bqmc != ''">
+            and bqmc like concat('%',#{dto.bqmc}, '%')
+        </if>
+        order by pcrq desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectPcclTj" resultType="java.util.Map">
+        select count(1) count,ssxgaj, ssxgajid from tb_hc_bpccl where pcrq &lt;= #{jssj} and pcrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="selectZdclTj" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_hc_bpccl where pcrq &lt;= #{jssj} and pcrq >= #{kssj}
+        and bqmc is not null and bqmc !=''
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="getPctj" resultType="java.util.Map">
+
+        SELECT ssbmdm, ssbm,SUM(pcry) pcry, SUM(pccl) pccl FROM (
+
+					SELECT ssbmdm, ssbm,COUNT(1) pcry,0 pccl FROM tb_hc_bpcry
+					where  xt_sjzt = '1' and xt_scbz = '0'
+                    <if test="query.kssj != null and query.kssj != ''">
+                        and pcsj >= #{query.kssj}
+                    </if>
+                    <if test="query.jssj != null and query.jssj != ''">
+                        and pcsj >= #{query.jssj}
+                    </if>
+                    <if test="query.ssbmdm != null and query.ssbmdm != ''">
+                        and ssbmdm like concat(#{query.ssbmdm},'%')
+                    </if>
+					GROUP BY ssbmdm,ssbm
+
+					UNION ALL
+					SELECT ssbmdm, ssbm,0 pcry,COUNT(1) pccl FROM tb_hc_bpccl
+					where  xt_sjzt = '1' and xt_scbz = '0'
+                    <if test="query.kssj != null and query.kssj != ''">
+                        and pcsj >= #{query.kssj}
+                    </if>
+                    <if test="query.jssj != null and query.jssj != ''">
+                        and pcsj >= #{query.jssj}
+                    </if>
+                    <if test="query.ssbmdm != null and query.ssbmdm != ''">
+                        and ssbmdm like concat(#{query.ssbmdm},'%')
+                    </if>
+					GROUP BY ssbmdm,ssbm
+        ) tj GROUP BY ssbmdm,ssbm
+
+    </select>
+
+    <select id="getPctjRy" resultType="int">
+        SELECT COUNT(1) FROM tb_hc_bpcry
+        where  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="query.kssj != null and query.kssj != ''">
+            and pcsj >= #{query.kssj}
+        </if>
+        <if test="query.jssj != null and query.jssj != ''">
+            and pcsj >= #{query.jssj}
+        </if>
+        <if test="query.ssbmdm != null and query.ssbmdm != ''">
+            and ssbmdm like concat(#{query.ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="getPctjCl" resultType="int">
+        SELECT COUNT(1) FROM tb_hc_bpccl
+        where  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="query.kssj != null and query.kssj != ''">
+            and pcsj >= #{query.kssj}
+        </if>
+        <if test="query.jssj != null and query.jssj != ''">
+            and pcsj >= #{query.jssj}
+        </if>
+        <if test="query.ssbmdm != null and query.ssbmdm != ''">
+            and ssbmdm like concat(#{query.ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="getPcWptj" resultType="int">
+        SELECT sum(sl) FROM (
+        SELECT COUNT(1) sl FROM `tb_hc_bpcry_wp`  where  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="time != null and time != ''">
+            and DATE_FORMAT(xt_cjsj,'%Y-%m-%d') = #{time}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        UNION ALL
+        SELECT COUNT(1) sl FROM `tb_hc_bpccl_wp`  where  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="time != null and time != ''">
+            and DATE_FORMAT(xt_cjsj,'%Y-%m-%d') = #{time}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        ) t
+
+    </select>
+</mapper>
diff --git a/mosty-hczx/src/main/resources/mapper/TbHcBpcryMapper.xml b/mosty-hczx/src/main/resources/mapper/TbHcBpcryMapper.xml
new file mode 100644
index 0000000..07fb473
--- /dev/null
+++ b/mosty-hczx/src/main/resources/mapper/TbHcBpcryMapper.xml
@@ -0,0 +1,568 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.hczx.mapper.TbHcBpcryMapper">
+    <resultMap type="com.mosty.base.model.entity.hczx.TbHcBpcry" id="tbHcBpcry">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sfzh" column="sfzh" jdbcType="VARCHAR"/>
+        <result property="xm" column="xm" jdbcType="VARCHAR"/>
+        <result property="xbdm" column="xbdm" jdbcType="VARCHAR"/>
+        <result property="csrq" column="csrq" jdbcType="VARCHAR"/>
+        <result property="mzdm" column="mzdm" jdbcType="VARCHAR"/>
+        <result property="whcddm" column="whcddm" jdbcType="VARCHAR"/>
+        <result property="jgdm" column="jgdm" jdbcType="VARCHAR"/>
+        <result property="zzxz" column="zzxz" jdbcType="VARCHAR"/>
+        <result property="lxdh" column="lxdh" jdbcType="VARCHAR"/>
+        <result property="pcrq" column="pcrq" jdbcType="TIMESTAMP"/>
+        <result property="pcsj" column="pcsj" jdbcType="TIMESTAMP"/>
+        <result property="pcsrlx" column="pcsrlx" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="pcclId" column="pccl_id" jdbcType="VARCHAR"/>
+        <result property="bqmc" column="bqmc" jdbcType="VARCHAR"/>
+        <result property="bqxxsj" column="bqxxsj" jdbcType="VARCHAR"/>
+        <result property="pcclJg" column="pccl_jg" jdbcType="VARCHAR"/>
+        <result property="pcclJgmc" column="pccl_jgmc" jdbcType="VARCHAR"/>
+        <result property="pcclYjdwdm" column="pccl_yjdwdm" jdbcType="VARCHAR"/>
+        <result property="pcclYjdw" column="pccl_yjdw" jdbcType="VARCHAR"/>
+        <result property="pcclYjyy" column="pccl_yjyy" jdbcType="VARCHAR"/>
+        <result property="pcmjId" column="pcmj_id" jdbcType="VARCHAR"/>
+        <result property="pcmjSfzh" column="pcmj_sfzh" jdbcType="VARCHAR"/>
+        <result property="pcmjXm" column="pcmj_xm" jdbcType="VARCHAR"/>
+        <result property="pcmjJh" column="pcmj_jh" jdbcType="VARCHAR"/>
+        <result property="kkId" column="kk_id" jdbcType="VARCHAR"/>
+        <result property="kkSsdwdm" column="kk_ssdwdm" jdbcType="VARCHAR"/>
+        <result property="kkSsdwmc" column="kk_ssdwmc" jdbcType="VARCHAR"/>
+        <result property="kkSsfsxdm" column="kk_ssfsxdm" jdbcType="VARCHAR"/>
+        <result property="kkSsfsxmc" column="kk_ssfsxmc" jdbcType="VARCHAR"/>
+        <result property="kkSsdszdm" column="kk_ssdszdm" jdbcType="VARCHAR"/>
+        <result property="kkSsdszmc" column="kk_ssdszmc" jdbcType="VARCHAR"/>
+        <result property="kkLx" column="kk_lx" jdbcType="VARCHAR"/>
+        <result property="kkMc" column="kk_mc" jdbcType="VARCHAR"/>
+        <result property="kkXzqh" column="kk_xzqh" jdbcType="VARCHAR"/>
+        <result property="kkSzmc" column="kk_szmc" jdbcType="VARCHAR"/>
+        <result property="kkHchrlx" column="kk_hchrlx" jdbcType="VARCHAR"/>
+        <result property="kkSfsz" column="kk_sfsz" jdbcType="VARCHAR"/>
+        <result property="sjly" column="sjly" jdbcType="VARCHAR"/>
+        <result property="zdxh" column="zdxh" jdbcType="VARCHAR"/>
+        <result property="zdch" column="zdch" jdbcType="VARCHAR"/>
+        <result property="zdsim" column="zdsim" jdbcType="VARCHAR"/>
+        <result property="ssdwdycs" column="ssdwdycs" jdbcType="INTEGER"/>
+        <result property="glxtdm" column="glxtdm" jdbcType="VARCHAR"/>
+        <result property="glxtid" column="glxtid" jdbcType="VARCHAR"/>
+        <result property="xsd" column="xsd" jdbcType="VARCHAR"/>
+        <result property="sfxf" column="sfxf" jdbcType="VARCHAR"/>
+        <result property="yjzlid" column="yjzlid" jdbcType="VARCHAR"/>
+        <result property="jzid" column="jzid" jdbcType="VARCHAR"/>
+        <result property="bbid" column="bbid" jdbcType="VARCHAR"/>
+        <result property="pcfs" column="pcfs" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        ,sfzh,xm,xbdm,csrq,mzdm,whcddm,jgdm,zzxz,lxdh,pcrq,pcsj,pcsrlx,jd,wd,zbhash,pccl_id,bqmc,
+        ssbmid,ssxgajid,sssgajid,
+        bqxxsj,pccl_jg,pccl_jgmc,pccl_yjdwdm,pccl_yjdw,pccl_yjyy,pcmj_id,pcmj_sfzh,pcmj_xm,pcmj_jh,kk_id,
+        kk_ssdwdm,kk_ssdwmc,kk_ssfsxdm,kk_ssfsxmc,kk_ssdszdm,kk_ssdszmc,kk_lx,kk_mc,kk_xzqh,kk_szmc,
+        kk_hchrlx,kk_sfsz,sjly,zdxh,zdch,zdsim,ssdwdycs,glxtdm,glxtid,xsd,sfxf,yjzlid,jzid,bbid,pcfs,
+        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.hczx.TbHcBpcry">
+        insert into tb_hc_bpcry(id, sfzh, xm, xbdm, csrq, mzdm, whcddm, jgdm, zzxz, lxdh, pcrq, pcsj, pcsrlx, jd, wd,
+                                zb, zbhash, pccl_id, bqmc, bqxxsj, pccl_jg, pccl_jgmc, pccl_yjdwdm, pccl_yjdw,
+                                pccl_yjyy,ssbmid,ssxgajid,sssgajid,
+                                pcmj_id, pcmj_sfzh, pcmj_xm, pcmj_jh, kk_id, kk_ssdwdm, kk_ssdwmc, kk_ssfsxdm,
+                                kk_ssfsxmc, kk_ssdszdm, kk_ssdszmc, kk_lx, kk_mc, kk_xzqh, kk_szmc, kk_hchrlx,
+                                kk_sfsz, sjly, zdxh, zdch, zdsim, ssdwdycs, glxtdm, glxtid, xsd, sfxf, yjzlid, jzid,
+                                bbid, pcfs, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                                xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, xjzdz)
+        values (#{id}, #{sfzh}, #{xm}, #{xbdm}, #{csrq}, #{mzdm}, #{whcddm}, #{jgdm}, #{zzxz}, #{lxdh}, #{pcrq},
+                #{pcsj}, #{pcsrlx}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}), #{zbhash},
+                #{pcclId}, #{bqmc}, #{bqxxsj}, #{pcclJg}, #{pcclJgmc}, #{pcclYjdwdm}, #{pcclYjdw}, #{pcclYjyy},
+                #{ssbmid},#{ssxgajid},#{sssgajid},
+                #{pcmjId}, #{pcmjSfzh}, #{pcmjXm}, #{pcmjJh}, #{kkId}, #{kkSsdwdm}, #{kkSsdwmc}, #{kkSsfsxdm},
+                #{kkSsfsxmc}, #{kkSsdszdm}, #{kkSsdszmc}, #{kkLx}, #{kkMc}, #{kkXzqh}, #{kkSzmc}, #{kkHchrlx},
+                #{kkSfsz}, #{sjly}, #{zdxh}, #{zdch}, #{zdsim}, #{ssdwdycs}, #{glxtdm}, #{glxtid}, #{xsd},
+                #{sfxf}, #{yjzlid}, #{jzid}, #{bbid}, #{pcfs}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm},
+                #{xtZhgxbm}, #{bz}, #{xjzdz})
+    </insert>
+
+    <select id="selectCrewCount" resultType="Integer">
+        select count(*)
+        from tb_hc_bpcry a
+        where a.xt_scbz = '0'
+          and a.xt_sjzt = '1'
+          and DATE_FORMAT(a.pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+    </select>
+
+
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(*)
+        from tb_hc_bpcry a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and DATE_FORMAT(a.pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh like concat('%',#{dto.sfzh},'%')
+        </if>
+        <if test="dto.lxdh != null and dto.lxdh != ''">
+            and lxdh like concat('%',#{dto.lxdh},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="getList" resultType="com.mosty.base.model.entity.hczx.TbHcBpcry" parameterType="Map">
+        select * from tb_hc_bpcry a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and DATE_FORMAT(a.pcrq, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh like concat('%',#{dto.sfzh},'%')
+        </if>
+        <if test="dto.lxdh != null and dto.lxdh != ''">
+            and lxdh like concat('%',#{dto.lxdh},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        order by pcsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getCountRy" resultType="Integer" parameterType="Map">
+        select count(*)
+        from tb_hc_bpcry a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+
+        <if test="dto.pcmjXm != null and dto.pcmjXm != ''">
+            and pcmj_xm like concat('%',#{dto.pcmjXm},'%')
+        </if>
+
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh like concat('%',#{dto.sfzh},'%')
+        </if>
+        <if test="dto.lxdh != null and dto.lxdh != ''">
+            and lxdh like concat('%',#{dto.lxdh},'%')
+        </if>
+        <if test="dto.pcclJg != null and dto.pcclJg != ''">
+            and pccl_jg = #{dto.pcclJg}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and DATE_FORMAT(pcrq,'%Y-%m-%d') between #{dto.kssj} and #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm}, '%')
+        </if>
+        <if test="dto.bqmc != null and dto.bqmc != ''">
+            and bqmc like concat('%',#{dto.bqmc}, '%')
+        </if>
+    </select>
+
+    <select id="getListRy" resultType="com.mosty.base.model.entity.hczx.TbHcBpcry" parameterType="Map">
+        select * from tb_hc_bpcry a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm like concat('%',#{dto.xm},'%')
+        </if>
+
+        <if test="dto.pcmjXm != null and dto.pcmjXm != ''">
+            and pcmj_xm like concat('%',#{dto.pcmjXm},'%')
+        </if>
+
+
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and sfzh like concat('%',#{dto.sfzh},'%')
+        </if>
+        <if test="dto.lxdh != null and dto.lxdh != ''">
+            and lxdh like concat('%',#{dto.lxdh},'%')
+        </if>
+        <if test="dto.pcclJg != null and dto.pcclJg != ''">
+            and pccl_jg = #{dto.pcclJg}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and DATE_FORMAT(pcrq,'%Y-%m-%d') between #{dto.kssj} and #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm}, '%')
+        </if>
+        <if test="dto.bqmc != null and dto.bqmc != ''">
+            and bqmc like concat('%',#{dto.bqmc}, '%')
+        </if>
+        order by pcsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.hczx.TbHcBpcry">
+        update tb_hc_bpcry
+        <set>
+            <if test="sfzh != null and sfzh != ''">
+                sfzh = #{sfzh},
+            </if>
+            <if test="xm != null and xm != ''">
+                xm = #{xm},
+            </if>
+            <if test="xbdm != null and xbdm != ''">
+                xbdm = #{xbdm},
+            </if>
+            <if test="csrq != null and csrq != ''">
+                csrq = #{csrq},
+            </if>
+            <if test="mzdm != null and mzdm != ''">
+                mzdm = #{mzdm},
+            </if>
+            <if test="whcddm != null and whcddm != ''">
+                whcddm = #{whcddm},
+            </if>
+            <if test="jgdm != null and jgdm != ''">
+                jgdm = #{jgdm},
+            </if>
+            <if test="zzxz != null and zzxz != ''">
+                zzxz = #{zzxz},
+            </if>
+            <if test="xjzdz != null and xjzdz != ''">
+                xjzdz = #{xjzdz},
+            </if>
+            <if test="lxdh != null and lxdh != ''">
+                lxdh = #{lxdh},
+            </if>
+            <if test="pcrq != null">
+                pcrq = #{pcrq},
+            </if>
+            <if test="pcsj != null">
+                pcsj = #{pcsj},
+            </if>
+            <if test="pcsrlx != null and pcsrlx != ''">
+                pcsrlx = #{pcsrlx},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="pcclId != null and pcclId != ''">
+                pccl_id = #{pcclId},
+            </if>
+            <if test="bqmc != null and bqmc != ''">
+                bqmc = #{bqmc},
+            </if>
+            <if test="bqxxsj != null and bqxxsj != ''">
+                bqxxsj = #{bqxxsj},
+            </if>
+            <if test="pcclJg != null and pcclJg != ''">
+                pccl_jg = #{pcclJg},
+            </if>
+            <if test="pcclJgmc != null and pcclJgmc != ''">
+                pccl_jgmc = #{pcclJgmc},
+            </if>
+            <if test="pcclYjdwdm != null and pcclYjdwdm != ''">
+                pccl_yjdwdm = #{pcclYjdwdm},
+            </if>
+            <if test="pcclYjdw != null and pcclYjdw != ''">
+                pccl_yjdw = #{pcclYjdw},
+            </if>
+            <if test="pcclYjyy != null and pcclYjyy != ''">
+                pccl_yjyy = #{pcclYjyy},
+            </if>
+            <if test="pcmjId != null and pcmjId != ''">
+                pcmj_id = #{pcmjId},
+            </if>
+            <if test="pcmjSfzh != null and pcmjSfzh != ''">
+                pcmj_sfzh = #{pcmjSfzh},
+            </if>
+            <if test="pcmjXm != null and pcmjXm != ''">
+                pcmj_xm = #{pcmjXm},
+            </if>
+            <if test="pcmjJh != null and pcmjJh != ''">
+                pcmj_jh = #{pcmjJh},
+            </if>
+            <if test="kkId != null and kkId != ''">
+                kk_id = #{kkId},
+            </if>
+            <if test="kkSsdwdm != null and kkSsdwdm != ''">
+                kk_ssdwdm = #{kkSsdwdm},
+            </if>
+            <if test="kkSsdwmc != null and kkSsdwmc != ''">
+                kk_ssdwmc = #{kkSsdwmc},
+            </if>
+            <if test="kkSsfsxdm != null and kkSsfsxdm != ''">
+                kk_ssfsxdm = #{kkSsfsxdm},
+            </if>
+            <if test="kkSsfsxmc != null and kkSsfsxmc != ''">
+                kk_ssfsxmc = #{kkSsfsxmc},
+            </if>
+            <if test="kkSsdszdm != null and kkSsdszdm != ''">
+                kk_ssdszdm = #{kkSsdszdm},
+            </if>
+            <if test="kkSsdszmc != null and kkSsdszmc != ''">
+                kk_ssdszmc = #{kkSsdszmc},
+            </if>
+            <if test="kkLx != null and kkLx != ''">
+                kk_lx = #{kkLx},
+            </if>
+            <if test="kkMc != null and kkMc != ''">
+                kk_mc = #{kkMc},
+            </if>
+            <if test="kkXzqh != null and kkXzqh != ''">
+                kk_xzqh = #{kkXzqh},
+            </if>
+            <if test="kkSzmc != null and kkSzmc != ''">
+                kk_szmc = #{kkSzmc},
+            </if>
+            <if test="kkHchrlx != null and kkHchrlx != ''">
+                kk_hchrlx = #{kkHchrlx},
+            </if>
+            <if test="kkSfsz != null and kkSfsz != ''">
+                kk_sfsz = #{kkSfsz},
+            </if>
+            <if test="sjly != null and sjly != ''">
+                sjly = #{sjly},
+            </if>
+            <if test="zdxh != null and zdxh != ''">
+                zdxh = #{zdxh},
+            </if>
+            <if test="zdch != null and zdch != ''">
+                zdch = #{zdch},
+            </if>
+            <if test="zdsim != null and zdsim != ''">
+                zdsim = #{zdsim},
+            </if>
+            <if test="ssdwdycs != null">
+                ssdwdycs = #{ssdwdycs},
+            </if>
+            <if test="glxtdm != null and glxtdm != ''">
+                glxtdm = #{glxtdm},
+            </if>
+            <if test="glxtid != null and glxtid != ''">
+                glxtid = #{glxtid},
+            </if>
+            <if test="xsd != null and xsd != ''">
+                xsd = #{xsd},
+            </if>
+            <if test="sfxf != null and sfxf != ''">
+                sfxf = #{sfxf},
+            </if>
+            <if test="yjzlid != null and yjzlid != ''">
+                yjzlid = #{yjzlid},
+            </if>
+            <if test="jzid != null and jzid != ''">
+                jzid = #{jzid},
+            </if>
+            <if test="bbid != null and bbid != ''">
+                bbid = #{bbid},
+            </if>
+            <if test="pcfs != null and pcfs != ''">
+                pcfs = #{pcfs},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getRyOf2h" resultMap="tbHcBpcry">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from (
+        select b.sfzh as sfzh_b,max(b.pcsj) as pcsj_b from tb_hc_bpcry b where b.xt_sjzt = '1' and b.xt_scbz = '0'
+        and b.pccl_id is null
+        and b.pcmj_sfzh = #{sfzh}
+        and DATE_FORMAT(b.pcsj,'%Y-%m-%d %H:%i:%s') >= #{time}
+        group by b.sfzh
+        ) t left join tb_hc_bpcry a on a.sfzh = t.sfzh_b and t.pcsj_b = a.pcsj
+        and a.xt_scbz = '0' and a.xt_sjzt = '1'
+    </select>
+
+
+    <select id="selectPcryTj" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_hc_bpcry where pcrq &lt;= #{jssj} and pcrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="selectZdryTj" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_hc_bpcry where pcrq &lt;= #{jssj} and pcrq >= #{kssj}
+        and bqmc is not null
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+
+    <select id="getSsbm" resultType="java.lang.String">
+       SELECT  DISTINCT ssbmdm  FROM `tb_hc_bpcry_bq`  where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="query.ssbmdm != null and query.ssbmdm != ''">
+            and ssbmdm like concat(#{query.ssbmdm},'%')
+        </if>
+
+        <if test="query.kssj != null and query.kssj != ''">
+            and xt_cjsj >= #{query.kssj}
+        </if>
+        <if test="query.jssj != null and query.jssj != ''">
+            and xt_cjsj &lt;= #{query.jssj}
+        </if>
+
+
+    </select>
+
+    <select id="getRyBqtj" resultType="java.util.Map">
+        SELECT IFNULL( bqmc, 'ZCRY' ) bqmc, IFNULL( bqxxsj, '正常人员' ) bqxxsj, COUNT( 1 ) sl
+        FROM `tb_hc_bpcry` where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and pcsj >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and xt_cjsj &lt;= #{jssj}
+        </if>
+        GROUP BY bqmc, bqxxsj
+    </select>
+
+    <select id="getClBqtj" resultType="java.util.Map">
+        SELECT
+            ( CASE WHEN bqmc = '' THEN 'ZCCL' ELSE bqmc END ) AS bqmc,
+            ( CASE WHEN bqxxsj = '' THEN '正常车辆' ELSE bqxxsj END ) AS bqxxsj,
+            COUNT( 1 ) sl
+        FROM `tb_hc_bpccl` where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and pcsj >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and xt_cjsj &lt;= #{jssj}
+        </if>
+        GROUP BY bqmc, bqxxsj
+    </select>
+
+
+</mapper>
diff --git a/mosty-hczx/src/main/resources/rebel.xml b/mosty-hczx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..dc9d9e6
--- /dev/null
+++ b/mosty-hczx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-hczx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-hczx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-jcgl/mosty-jcgl.iml b/mosty-jcgl/mosty-jcgl.iml
new file mode 100644
index 0000000..371f6b2
--- /dev/null
+++ b/mosty-jcgl/mosty-jcgl.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353924" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-jcgl/pom.xml b/mosty-jcgl/pom.xml
new file mode 100644
index 0000000..988eee3
--- /dev/null
+++ b/mosty-jcgl/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-jcgl</artifactId>
+    <description>基础管理</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/MostyJcglApplication.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/MostyJcglApplication.java
new file mode 100644
index 0000000..761cbf7
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/MostyJcglApplication.java
@@ -0,0 +1,30 @@
+package com.mosty.base.manager;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	基础管理微服务
+ * @author kevin
+ * @date 2022/1/22 4:23 PM
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+//@MapperScan(basePackages = {"com.mosty","com.mosty.*.mapper"})
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@EnableDiscoveryClient
+@EnableScheduling
+@SpringBootApplication
+public class MostyJcglApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyJcglApplication.class, args);
+	}
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/config/FeignConfig.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/FeignConfig.java
new file mode 100644
index 0000000..ef5bc76
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.base.manager.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/config/GlobalYmlConfig.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..30beeed
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.base.manager.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/config/WebMvcConfig.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/WebMvcConfig.java
new file mode 100644
index 0000000..c9ad639
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/config/WebMvcConfig.java
@@ -0,0 +1,122 @@
+package com.mosty.base.manager.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("doc.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglAbfcController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglAbfcController.java
new file mode 100644
index 0000000..b5ed813
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglAbfcController.java
@@ -0,0 +1,70 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglAbfcService;
+import com.mosty.base.model.dto.jcgl.TbJcglAbfcDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/26
+ **/
+@Api(tags = "安保风采相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/abfc")
+public class TbJcglAbfcController {
+
+    private final TbJcglAbfcService tbJcglAbfcService;
+
+    @ApiOperation("添加安保风采")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "添加安保风采", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglAbfcDto dto) {
+        return ResponseResult.success(this.tbJcglAbfcService.addEntity(dto));
+    }
+
+    @ApiOperation("修改安保风采")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改安保风采", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglAbfcDto dto) {
+        return ResponseResult.success(this.tbJcglAbfcService.editEntity(dto));
+    }
+
+    @ApiOperation("批量删除安保风采")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除安保风采", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteEntity(@RequestParam List<String> ids) {
+        this.tbJcglAbfcService.deleteEntity(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询安保风采列表")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<List<TbJcglAbfc>> getPageList(TbJcglAbfcQuery dto) {
+        return ResponseResult.success(this.tbJcglAbfcService.getPageList(dto));
+    }
+
+    @ApiOperation("查询安保风采详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglAbfc> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglAbfcService.getInfo(id));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBqController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBqController.java
new file mode 100644
index 0000000..4ce902e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBqController.java
@@ -0,0 +1,161 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglBqDto;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+import com.mosty.base.manager.service.TbJcglBqService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡防警力标签表（技能/经验）;(tb_jcgl_bq)表控制层
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Api(tags = "巡防警力标签表对象功能接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglBq")
+public class TbJcglBqController{
+
+    private final TbJcglBqService tbJcglBqService;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防警力标签单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "标签ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbJcglBqVo> queryById(@PathVariable String id){
+        return ResponseResult.success(tbJcglBqService.queryById(id));
+    }
+    
+    /** 
+     * 分页查询
+     *
+     * @param tbJcglBq 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglBqVo>> paginQuery(TbJcglBqQuery tbJcglBq){
+        IPage<TbJcglBqVo> page = tbJcglBqService.paginQuery(tbJcglBq);
+        return ResponseResult.success(page);
+    }
+    
+    /** 
+     * 新增数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡防警力标签新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglBqDto tbJcglBq){
+        return ResponseResult.success(tbJcglBqService.insert(tbJcglBq));
+    }
+    
+    /** 
+     * 更新数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡防警力标签更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglBqDto tbJcglBq){
+        return ResponseResult.success(tbJcglBqService.update(tbJcglBq));
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡防警力标签删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id){
+        return ResponseResult.success(tbJcglBqService.deleteById(id));
+    }
+
+     /**
+      * 通过主键删除数据
+      *
+      * @param id 主键
+      * @return 是否成功
+      */
+     @ApiOperation("通过主键删除数据")
+     @DeleteMapping("/bacth")
+     @Log(title = "巡防警力标签删除", businessType = BusinessType.UPDATE)
+     @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+     public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id){
+         return ResponseResult.success(tbJcglBqService.deleteByIds(id));
+     }
+
+     /**
+      * 通过标签名称验证是否重复
+      *
+      * @param mc 标签名称
+      * @return 是否成功
+      */
+     @ApiOperation("通过标签名称验证是否重复")
+     @JwtSysUser
+     @GetMapping("/check")
+     @ApiImplicitParam(name = "mc", value = "标签名称", paramType = "query", required = true, dataType="String")
+     public ResponseResult<Boolean> check(@RequestParam(value = "mc") String mc){
+         return ResponseResult.success(tbJcglBqService.checkMc(mc));
+     }
+
+     /**
+      * 统计标签数量
+      *
+      * @param
+      * @return 是否成功
+      */
+     @ApiOperation("统计标签数量")
+     @JwtSysUser
+     @GetMapping("/countBqsl")
+     public ResponseResult countBqsl(TbJcglBqVo tbJcglBqVo){
+         return ResponseResult.success(tbJcglBqService.countBqsl(tbJcglBqVo ));
+     }
+
+    /**
+     * 通过主键注销数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键注销数据")
+    @JwtSysUser
+    @PutMapping("/zcbqByIds")
+    @Log(title = "巡防警力标签注销", businessType = BusinessType.UPDATE)
+//    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> zcbqByIds(@RequestBody  List<String> id){
+        return ResponseResult.success(tbJcglBqService.zcbqByIds(id));
+    }
+
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxdController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxdController.java
new file mode 100644
index 0000000..094dd56
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxdController.java
@@ -0,0 +1,73 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglBxd;
+import com.mosty.base.model.query.jcgl.TbJcglBxdQuery;
+import com.mosty.base.manager.service.TbJcglBxdService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = {"巡防区域必巡点接口"})
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbJcglBxd")
+public class TbJcglBxdController {
+
+    private final TbJcglBxdService tbJcglBxdService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询必巡点列表")
+    public ResponseResult<IPage<TbJcglBxd>> queryList(TbJcglBxdQuery bxdQuery) {
+        return ResponseResult.success(tbJcglBxdService.queryBxd(bxdQuery));
+    }
+
+    @PostMapping({"/addBxd"})
+    @JwtSysUser
+    @Log(title = "新增必巡点", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增必巡点")
+    public ResponseResult addBxd(@RequestBody TbJcglBxd bxd) {
+        return ResponseResult.success(tbJcglBxdService.addBxd(bxd));
+    }
+
+    @PostMapping({"/updateBxd"})
+    @JwtSysUser
+    @Log(title = "修改必巡点", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改必巡点")
+    public ResponseResult updateBxd(@RequestBody TbJcglBxd bxd) {
+        return ResponseResult.success(tbJcglBxdService.editBxd(bxd));
+    }
+
+    @GetMapping({"/selectById"})
+    @JwtSysUser
+    @ApiOperation(value = "查询必巡点详情")
+    public ResponseResult selectByid(String id) {
+        return ResponseResult.success(tbJcglBxdService.selectById(id));
+    }
+
+    @PostMapping({"/deleteBxd"})
+    @JwtSysUser
+    @Log(title = "删除必巡点", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除必巡点")
+    public ResponseResult deleteBxd(@RequestBody List<String> list) {
+        return ResponseResult.success(tbJcglBxdService.deleteBxd(list));
+    }
+
+    @PostMapping({"/createdBxd"})
+    @ApiOperation(value = "自动计算的必巡点添加")
+    public ResponseResult createdBxd(@RequestBody List<Map<String, Object>> list) {
+        tbJcglBxdService.createdBxd(list);
+        return ResponseResult.success();
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxxController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxxController.java
new file mode 100644
index 0000000..df0d038
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglBxxController.java
@@ -0,0 +1,66 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglBxxDto;
+import com.mosty.base.model.query.jcgl.TbJcglBxxQuery;
+import com.mosty.base.manager.service.TbJcglBxxService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = {"巡防区域必巡线接口"})
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbJcglBxx")
+public class TbJcglBxxController {
+
+    private final TbJcglBxxService tbJcglBxxService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询必巡线列表")
+    public ResponseResult<IPage<TbJcglBxxDto>> queryList(TbJcglBxxQuery bxxQuery) {
+        return ResponseResult.success(tbJcglBxxService.queryBxx(bxxQuery));
+    }
+
+    @PostMapping({"/addBxx"})
+    @JwtSysUser
+    @Log(title = "新增必巡线", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增必巡线")
+    public ResponseResult<Integer> addBxx(@RequestBody TbJcglBxxDto bxx) {
+        return ResponseResult.success(tbJcglBxxService.addBxx(bxx));
+    }
+
+    @PostMapping({"/updateBxx"})
+    @JwtSysUser
+    @Log(title = "修改必巡线", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改必巡线")
+    public ResponseResult<Integer> updateBxx(@RequestBody TbJcglBxxDto bxx) {
+        return ResponseResult.success(tbJcglBxxService.editBxx(bxx));
+    }
+
+    @GetMapping({"/selectById"})
+    @JwtSysUser
+    @ApiOperation(value = "查询必巡线详情")
+    public ResponseResult<TbJcglBxxDto> selectByid(String id) {
+        return ResponseResult.success(tbJcglBxxService.selectById(id));
+    }
+
+    @PostMapping({"/deleteBxx"})
+    @JwtSysUser
+    @Log(title = "删除必巡线", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除必巡线")
+    public ResponseResult<Integer>  deleteBxx(@RequestBody List<String> list) {
+        return ResponseResult.success(tbJcglBxxService.deleteBxx(list));
+    }
+
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglDsfController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglDsfController.java
new file mode 100644
index 0000000..79a2458
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglDsfController.java
@@ -0,0 +1,90 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglAbfcService;
+import com.mosty.base.manager.service.TbJcglDsfService;
+import com.mosty.base.model.dto.jcgl.TbJcglAbfcDto;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfDto;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfJudgeDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.entity.jcgl.TbJcglDsf;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import com.mosty.base.model.query.jcgl.TbJcglDsfQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ **/
+@Api(tags = "第三方相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/dsf")
+public class TbJcglDsfController {
+
+    private final TbJcglDsfService tbJcglDsfService;
+
+    @ApiOperation("添加第三方数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "添加第三方数据", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglDsfDto dto) {
+        return ResponseResult.success(this.tbJcglDsfService.addEntity(dto));
+    }
+
+    @ApiOperation("修改第三方数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改第三方数据", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglDsfDto dto) {
+        return ResponseResult.success(this.tbJcglDsfService.editEntity(dto));
+    }
+
+    @ApiOperation("批量删除第三方")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除第三方", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteEntity(@RequestParam List<String> ids) {
+        this.tbJcglDsfService.deleteEntity(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询第三方列表")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglDsf>> getPageList(TbJcglDsfQuery dto) {
+        return ResponseResult.success(this.tbJcglDsfService.getPageList(dto));
+    }
+
+    @ApiOperation("查询第三方详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglDsf> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglDsfService.getInfo(id));
+    }
+
+    @ApiOperation("修改第三方状态")
+    @JwtSysUser
+    @PostMapping("judge")
+    @Log(title = "修改第三方状态", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> judge(@RequestBody TbJcglDsfJudgeDto dto) {
+        return ResponseResult.success(this.tbJcglDsfService.judge(dto));
+    }
+    @ApiOperation("根据code查询第三方详情")
+    @JwtSysUser
+    @GetMapping("/getDsfInfo/{code}")
+    public ResponseResult<TbJcglDsfVo> getDsfInfo(@PathVariable("code") String code){
+        return ResponseResult.success(this.tbJcglDsfService.getDsfInfo(code));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJwzController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJwzController.java
new file mode 100644
index 0000000..419d97f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJwzController.java
@@ -0,0 +1,66 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.base.manager.service.TbJcglJwzService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "警务站")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglJwz")
+public class TbJcglJwzController {
+
+    private final TbJcglJwzService tbJcglJwzService;
+
+    @GetMapping({"/selectJwzList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询警务站列表")
+    public ResponseResult<IPage<TbJcglJwz>> selectJwzList(TbJcglJwz jwz) {
+        IPage<TbJcglJwz> page = new Page<>(jwz.getPageNo(), jwz.getPageSize());
+        return ResponseResult.success(tbJcglJwzService.selectJwzList(jwz, page));
+    }
+
+    @PostMapping({"/addJwz"})
+    @JwtSysUser
+    @Log(title = "新增警务站", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增警务站")
+    public ResponseResult<Void> addJwz(@RequestBody TbJcglJwz tbJcglJwz) {
+        tbJcglJwzService.addJwz(tbJcglJwz);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/updateJwz"})
+    @JwtSysUser
+    @Log(title = "修改警务站", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改警务站")
+    public ResponseResult<Void> updateJwz(@RequestBody TbJcglJwz jwz) {
+        tbJcglJwzService.updateJwz(jwz);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/deleteJwz"})
+    @JwtSysUser
+    @Log(title = "删除警务站", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除警务站")
+    public ResponseResult<Boolean> deleteJwz(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglJwzService.deleteJwz(id));
+    }
+
+    @GetMapping({"/selectByid"})
+    @JwtSysUser
+    @ApiOperation(value = "查询警务站详情")
+    public ResponseResult selectByid(String id) {
+        return ResponseResult.success(tbJcglJwzService.selectByid(id));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJyqxController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJyqxController.java
new file mode 100644
index 0000000..ba6c090
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJyqxController.java
@@ -0,0 +1,134 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.manager.service.TbJcglJyqxService;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import com.mosty.base.model.query.jcgl.TbJcglJyqxQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/tpJcglJyqx"})
+@Api(tags = {"警用器械"})
+public class TbJcglJyqxController {
+
+    private final TbJcglJyqxService tbJcglJyqxService;
+
+
+
+    @PostMapping({"/xfJyqx"})
+    @JwtSysUser
+    @Log(title = "下发警用器械", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "下发警用器械")
+    public ResponseResult xfZnzb(@RequestBody TbJcglJyqx zb) {
+        tbJcglJyqxService.xfZnzb(zb);
+        return ResponseResult.success();
+
+    }
+
+    @GetMapping({"/htJyqx"})
+    @JwtSysUser
+    @ApiOperation(value = "回退警用器械")
+    public ResponseResult htZnzb(String id,long sl) {
+        tbJcglJyqxService.htZnzb(id,sl);
+        return ResponseResult.success();
+    }
+
+    @GetMapping({"/bsJyqx"})
+    @JwtSysUser
+    @ApiOperation(value = "报损警用器械")
+    public ResponseResult bsZnzb(String id,long sl) {
+        tbJcglJyqxService.bsZnzb(id,sl);
+        return ResponseResult.success();
+    }
+
+
+    @PostMapping("/addJyqx")
+    @JwtSysUser
+    @ApiOperation(value = "新增警用器械")
+    public ResponseResult<Object> addJyqx(@RequestBody TbJcglJyqx jyqx) {
+        tbJcglJyqxService.addJyqx(jyqx);
+        return ResponseResult.success();
+    }
+
+    @GetMapping({"/selectJyqx"})
+    @JwtSysUser
+    @ApiOperation(value = "查询警用装备")
+    public ResponseResult<IPage<TbJcglJyqx>> selectJyqx(TbJcglJyqx jyqx) {
+        IPage<TbJcglJyqx> page = new Page<>(jyqx.getPageNo(), jyqx.getPageSize());
+        return ResponseResult.success(tbJcglJyqxService.selectJyqx(jyqx, page));
+    }
+
+    @PostMapping({"/updateJyqx"})
+    @JwtSysUser
+    @ApiOperation(value = "修改警用装备")
+    public ResponseResult updateJyqx(@RequestBody TbJcglJyqx jyqx) {
+        tbJcglJyqxService.updateJyqx(jyqx);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/deleteJyQxzb"})
+    @JwtSysUser
+    @ApiOperation(value = "删除警用装备")
+    public ResponseResult deleteJyQxzb(@RequestBody List<String> id) {
+        tbJcglJyqxService.deleteJyQxzb(id);
+        return ResponseResult.success();
+    }
+
+    @GetMapping({"selectJyqxXq"})
+    @JwtSysUser
+    @ApiOperation(value = "id查询警用器械")
+    public ResponseResult selectJyqxXq(String id) {
+        return ResponseResult.success(tbJcglJyqxService.selectJyqxXq(id));
+    }
+
+    @ApiOperation("警用器械到期提醒")
+    @JwtSysUser
+    @GetMapping("/jyqxDqtx")
+    public ResponseResult<IPage<TbJcglJyqx>> jyqxDqtx(TbJcglJyqxQuery jyqx) {
+        IPage<TbJcglJyqx> page = new Page<>(jyqx.getPageCurrent(), jyqx.getPageSize());
+        return ResponseResult.success(tbJcglJyqxService.selectDqjyqx(jyqx, page));
+    }
+
+    @ApiOperation("app查询警用器械信息")
+    @JwtSysUser
+    @GetMapping("/getJyqxList")
+    public ResponseResult<IPage<TbJcglJyqx>> getJyqxList(AppSearchQuery dto) {
+        return ResponseResult.success(tbJcglJyqxService.getJyqxList(dto));
+    }
+
+    @Log(title = "导入警用器械", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    @JwtSysUser
+    @Transactional
+    public ResponseResult<String> importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<TbJcglJyqx> util = new ExcelUtil<TbJcglJyqx>(TbJcglJyqx.class);
+        List<TbJcglJyqx> jyqxList = util.importExcel(file.getInputStream());
+        String s = this.tbJcglJyqxService.importData(jyqxList, updateSupport);
+        return ResponseResult.success(s);
+    }
+
+
+    @Log(title = "警用器械模板下载", businessType = BusinessType.IMPORT)
+    @GetMapping("/importTemplate")
+    @JwtSysUser
+    public void importTemplate(HttpServletResponse response) throws Exception {
+        ExcelUtil<TbJcglJyqx> util = new ExcelUtil<TbJcglJyqx>(TbJcglJyqx.class);
+        util.importTemplateExcel(response, "警用器械");
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJzController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJzController.java
new file mode 100644
index 0000000..c8a77bf
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglJzController.java
@@ -0,0 +1,91 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.query.jcgl.TbJcglJzQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglJzAllVo;
+import com.mosty.base.manager.service.TbJcglJzService;
+import com.mosty.base.model.vo.jcgl.TbJcglJzVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务警组 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Api(tags = {"勤务警组接口"})
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbJcglJz")
+public class TbJcglJzController {
+
+    private final TbJcglJzService tbJcglJzService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询勤务警组列表")
+    public ResponseResult<IPage<TbJcglJzAllVo>> queryList(TbJcglJzQuery tbJcglJzQuery) {
+        return ResponseResult.success(this.tbJcglJzService.queryList(tbJcglJzQuery));
+    }
+
+    @PostMapping({"/addJz"})
+    @JwtSysUser
+    @Log(title = "新增勤务警组", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增勤务警组")
+    public ResponseResult<Integer> addJz(@RequestBody TbJcglJzAllVo vo) {
+        return ResponseResult.success(this.tbJcglJzService.saveJz(vo));
+    }
+
+    @PostMapping({"/updateJz"})
+    @JwtSysUser
+    @Log(title = "修改勤务警组", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改勤务警组")
+    public ResponseResult<Integer> updateJz(@RequestBody TbJcglJzAllVo vo) {
+        return ResponseResult.success(this.tbJcglJzService.updateJz(vo));
+    }
+
+    @GetMapping({"/selectByid"})
+    @JwtSysUser
+    @ApiOperation(value = "查询勤务警组详情")
+    public ResponseResult<TbJcglJzAllVo> selectByid(String id) {
+        return ResponseResult.success(this.tbJcglJzService.selectById(id));
+    }
+
+    @PostMapping({"/deleteJz"})
+    @JwtSysUser
+    @Log(title = "删除勤务警组", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除勤务警组")
+    public ResponseResult<Boolean> deleteJz(@RequestBody List<String> list) {
+        return ResponseResult.success(this.tbJcglJzService.deleteBatch(list));
+    }
+
+    @GetMapping("selectJzList")
+    @JwtSysUser
+    @ApiOperation(value = "app查询警组信息")
+    public ResponseResult<Page<TbJcglJzAllVo>> selectJzList(AppSearchQuery dto) {
+        return ResponseResult.success(this.tbJcglJzService.selectJzList(dto));
+    }
+
+
+    @GetMapping({"/tbJzQx"})
+    @ApiOperation(value = "同步警组器械")
+    public ResponseResult<Void> tbJzQx() {
+        this.tbJcglJzService.tbJzQx();
+        return ResponseResult.success();
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKfdController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKfdController.java
new file mode 100644
index 0000000..2a7f6f0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKfdController.java
@@ -0,0 +1,86 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import com.mosty.base.model.query.jcgl.TbJcglKfdQuery;
+import com.mosty.base.manager.service.TbJcglKfdService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ **/
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tpJcglKfd")
+@Api(tags = "快返点")
+public class TbJcglKfdController {
+
+    private final TbJcglKfdService tbJcglKfdService;
+
+    @GetMapping({"/selectKfdList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询快返点列表")
+    public ResponseResult<IPage<TbJcglKfdDto>> selectKfdList(TbJcglKfdQuery dto) {
+        return ResponseResult.success(tbJcglKfdService.selectKfdList(dto));
+    }
+
+    @PostMapping("/addKfd")
+    @JwtSysUser
+    @Log(title = "新增快返点", businessType = BusinessType.INSERT)
+    @ApiOperation("新增快返点")
+    public ResponseResult<Integer> addKfd(@RequestBody TbJcglKfdDto dto) {
+        return ResponseResult.success(tbJcglKfdService.addKfd(dto));
+    }
+
+
+    @PostMapping({"/updateKfd"})
+    @JwtSysUser
+    @Log(title = "修改快返点列表", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改快返点列表")
+    public ResponseResult<Integer> updateKfd(@RequestBody TbJcglKfdDto dto) {
+        return ResponseResult.success(tbJcglKfdService.updateKfd(dto));
+    }
+
+    @GetMapping({"/selectByid"})
+    @JwtSysUser
+    @ApiOperation(value = "查询快返点详情")
+    public ResponseResult<TbJcglKfdDto> selectByid(String id) {
+        return ResponseResult.success(tbJcglKfdService.selectByid(id));
+    }
+
+    @PostMapping({"/deleteKfd"})
+    @JwtSysUser
+    @Log(title = "删除返点详情", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除返点")
+    public ResponseResult<Void> deleteKfd(@RequestBody List<String> id) {
+        tbJcglKfdService.deleteKfd(id);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("getKfdList")
+    @JwtSysUser
+    @ApiOperation(value = "app获取快反点列表")
+    public ResponseResult<Page<TbJcglKfd>> getKfdList(AppSearchQuery dto) {
+        return ResponseResult.success(tbJcglKfdService.getKfdList(dto));
+    }
+
+    @PostMapping("getListAll")
+    @JwtSysUser
+    @ApiOperation(value = "获取所有快反点")
+    public ResponseResult<List<TbJcglKfdDto>> getListAll() {
+        return ResponseResult.success(tbJcglKfdService.getListAll());
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhbmController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhbmController.java
new file mode 100644
index 0000000..732a98a
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhbmController.java
@@ -0,0 +1,63 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglKhbmService;
+import com.mosty.base.model.dto.jcgl.TbJcglKhbmEditPzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import com.mosty.base.model.query.jcgl.TbJcglKhbmQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhbmVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/khbm")
+@Api(tags = "绩效考核部门相关接口")
+public class TbJcglKhbmController {
+
+    private final TbJcglKhbmService tbJcglKhbmService;
+
+    @PostMapping("/addKhbm")
+    @JwtSysUser
+    @ApiOperation(value = "添加绩效考核部门")
+    public ResponseResult<Void> addKhbm(@RequestBody List<String> ssbmidList) {
+        this.tbJcglKhbmService.addKhbm(ssbmidList);
+        return ResponseResult.success();
+    }
+
+    @DeleteMapping("/delKhbm")
+    @JwtSysUser
+    @ApiOperation(value = "删除绩效考核部门")
+    public ResponseResult<Void> delKhbm(@RequestBody List<String> ids) {
+        this.tbJcglKhbmService.delKhbm(ids);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("/getPageList")
+    @JwtSysUser
+    @ApiOperation(value = "查询绩效考核参与部门列表")
+    public ResponseResult<IPage<TbJcglKhbmVo>> getPageList(TbJcglKhbmQuery dto) {
+        return ResponseResult.success(this.tbJcglKhbmService.getPageList(dto));
+    }
+
+    @GetMapping("/getAllKhbm")
+    @JwtSysUser
+    @ApiOperation(value = "查询所有的已选中的部门")
+    public ResponseResult<List<String>> getAllKhbm() {
+        return ResponseResult.success(this.tbJcglKhbmService.getAllKhbm());
+    }
+
+    @PostMapping("/editKhbm")
+    @JwtSysUser
+    @ApiOperation(value = "修改考核部门配置")
+    public ResponseResult<Void> editKhbm(@RequestBody TbJcglKhbm dto) {
+        this.tbJcglKhbmService.editKhbm(dto);
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhmxController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhmxController.java
new file mode 100644
index 0000000..6f7fea0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhmxController.java
@@ -0,0 +1,75 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.manager.service.TbJcglKfdService;
+import com.mosty.base.manager.service.TbJcglKhmxService;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import com.mosty.base.model.entity.jcgl.TbJcglKhmx;
+import com.mosty.base.model.query.jcgl.TbJcglKfdQuery;
+import com.mosty.base.model.query.jcgl.TbJcglKhmxQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhmxVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbjcglKhmx")
+@Api(tags = "考核模型")
+public class TbJcglKhmxController {
+
+    private final TbJcglKhmxService tbJcglKhmxService;
+
+    @GetMapping({"/selectPage"})
+    @JwtSysUser
+    @ApiOperation(value = "查询考核模型")
+    public ResponseResult<IPage<TbJcglKhmx>> selectKfdList(TbJcglKhmxQuery tbJcglkhmx) {
+        return ResponseResult.success(tbJcglKhmxService.paginQuery(tbJcglkhmx));
+    }
+
+    @PostMapping("/addKhmx")
+    @JwtSysUser
+    @Log(title = "新增考核模型", businessType = BusinessType.INSERT)
+    @ApiOperation("新增考核模型")
+    public ResponseResult<Integer> addKhmx(@RequestBody TbJcglKhmx tbJcglKhmx) {
+        return ResponseResult.success(tbJcglKhmxService.insert(tbJcglKhmx));
+    }
+
+
+    @PostMapping({"/updateKhmx"})
+    @JwtSysUser
+    @Log(title = "修改考核模型", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改考核模型")
+    public ResponseResult<Integer> updateKhmx(@RequestBody TbJcglKhmx tbJcglKhmx) {
+        return ResponseResult.success(tbJcglKhmxService.update(tbJcglKhmx));
+    }
+
+    @GetMapping({"/selectByid"})
+    @JwtSysUser
+    @ApiOperation(value = "查询考核模型详情")
+    public ResponseResult<TbJcglKhmxVo> selectByid(String id) {
+        return ResponseResult.success(tbJcglKhmxService.queryById(id));
+    }
+
+    @PostMapping({"/delete"})
+    @JwtSysUser
+    @Log(title = "删除考核模型", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除考核模型")
+    public ResponseResult<Void> delete(@RequestBody List<String> id) {
+        tbJcglKhmxService.deleteByIds(id);
+        return ResponseResult.success();
+    }
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhtjController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhtjController.java
new file mode 100644
index 0000000..cfb397d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglKhtjController.java
@@ -0,0 +1,187 @@
+package com.mosty.base.manager.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglKhtjService;
+import com.mosty.base.manager.task.TbJcglJxkhTask;
+import com.mosty.base.model.entity.jcgl.TbJcglKhtj;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjQuery;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjStatisticsQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhtjVo;
+import com.mosty.base.utils.DecimalUtils;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.config.Excel.ExcelExp;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.config.Excel.ExcelUtilManySheet;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/khtj")
+@Api(tags = "绩效考核统计相关接口")
+public class TbJcglKhtjController {
+
+    private final TbJcglKhtjService tbJcglKhtjService;
+
+    @GetMapping(value = "/autoTimeJxkh")
+    @ApiOperation("启动或者修改定时器绩效考核")
+    public ResponseResult<Boolean> autoTimeXzjq() {
+        TbJcglJxkhTask.jxkh = !TbJcglJxkhTask.jxkh;
+        return ResponseResult.success(TbJcglJxkhTask.jxkh);
+    }
+
+    @PostMapping("/builder")
+    @JwtSysUser
+    @ApiOperation(value = "统计某一天的数据")
+    public ResponseResult<Void> addKhbm(String time) {
+        this.tbJcglKhtjService.builder(time);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("/getPageList")
+    @JwtSysUser
+    @ApiOperation(value = "条件查询列表信息")
+    public ResponseResult<IPage<TbJcglKhtjVo>> getPageList(TbJcglKhtjQuery dto) {
+        return ResponseResult.success(this.tbJcglKhtjService.getPageList(dto));
+    }
+
+    @GetMapping("/getStatistics")
+    @JwtSysUser
+    @ApiOperation(value = "统计数据")
+    public ResponseResult<Map<String, Object>> getStatistics(TbJcglKhtjStatisticsQuery dto) {
+        return ResponseResult.success(this.tbJcglKhtjService.getStatistics(dto));
+    }
+
+    @PostMapping("/export")
+    @JwtSysUser
+    @ApiOperation(value = "导出统计")
+    public void getStatistics(HttpServletResponse response, TbJcglKhtjQuery dto) throws Exception {
+        List<TbJcglKhtjVo> pageList = this.tbJcglKhtjService.getFxbm(dto);
+        if (!CollectionUtils.isEmpty(pageList)) {
+            List<ExcelExp> sheet = new ArrayList<>();
+            for (TbJcglKhtjVo vo : pageList) {
+                dto.setSsbmdm(vo.getSsbmdm());
+                List<TbJcglKhtj> list = this.tbJcglKhtjService.getList(dto);
+                List<TbJcglKhtjVo> voList = new ArrayList<>();
+                if (!CollectionUtils.isEmpty(list)) {
+                    TbJcglKhtjVo tj = new TbJcglKhtjVo();
+                    tj.setSsbm("统计");
+                    tj.setTjrq(list.get(0).getTjrq());
+                    for (TbJcglKhtj khtj : list) {
+                        TbJcglKhtjVo khtjVo = new TbJcglKhtjVo();
+                        BeanUtils.copyProperties(khtj, khtjVo);
+                        khtjVo.setWbbl(khtjVo.getSjbb() == 0 ? "0" : getPercent(khtjVo.getSjbb(), khtjVo.getYbb()));
+                        khtjVo.setXlbl(khtjVo.getSjxl() == 0 ? "0" : getPercent(khtjVo.getSjxl(), khtjVo.getYxl()));
+                        khtjVo.setXllcbl(khtjVo.getSjxllc() == 0 ? "0" : getPercent(khtjVo.getSjxllc(), khtjVo.getYxllc()));
+                        khtjVo.setXlscbl(khtjVo.getSjxlsc() == 0 ? "0" : getPercent(khtjVo.getSjxlsc(), khtjVo.getYxlsc()));
+                        double kf = 0;
+                        //计算三项扣分 得分
+                        if ((ObjectUtils.isNotEmpty(khtjVo.getXlkf()) && khtjVo.getXlkf().compareTo(BigDecimal.ZERO) > 0)
+                                || (ObjectUtils.isNotEmpty(khtjVo.getXlsckf()) && khtjVo.getXlsckf().compareTo(BigDecimal.ZERO) > 0)
+                                || (ObjectUtils.isNotEmpty(khtjVo.getXllckf()) && khtjVo.getXllckf().compareTo(BigDecimal.ZERO) > 0)
+                        ) {
+                            kf = 0.15;
+                        }
+                        khtjVo.setSxdf(10 - kf);
+                        khtjVo.setSxkf(kf);
+
+//                        khtjVo.setQsbl(khtjVo.getSjqs() == 0 ? "0" : getPercent(khtjVo.getSjqs(), khtjVo.getYqs()));
+//                        khtjVo.setCrbl(khtjVo.getSjcr() == 0 ? "0" : getPercent(khtjVo.getSjcr(), khtjVo.getZscr()));
+//                        khtjVo.setCcbl(khtjVo.getSjcc() == 0 ? "0" : getPercent(khtjVo.getSjcc(), khtjVo.getzscc()));
+
+
+                        voList.add(khtjVo);
+
+                        tj.setYbb(khtj.getYbb() + tj.getYbb());
+                        tj.setZsbb(khtj.getZsbb() + tj.getZsbb());
+                        tj.setSjbb(khtj.getSjbb() + tj.getSjbb());
+                        tj.setWbb(khtj.getWbb() + tj.getWbb());
+                        tj.setBbkf(DecimalUtils.add(khtj.getBbkf(), tj.getBbkf()));
+
+
+                        tj.setYxl(khtj.getYxl() + tj.getYxl());
+                        tj.setZsxl(khtj.getZsxl() + tj.getZsxl());
+                        tj.setSjxl(khtj.getSjxl() + tj.getSjxl());
+                        tj.setWxl(khtj.getWxl() + tj.getWxl());
+                        tj.setXlkf(DecimalUtils.add(khtj.getXlkf(), tj.getXlkf()));
+
+
+//
+//                        tj.setYqs(khtj.getYqs() + tj.getYqs());
+//                        tj.setSjqs(khtj.getSjqs() + tj.getSjqs());
+//                        tj.setWqs(khtj.getWqs() + tj.getWqs());
+
+//
+//                        tj.setYcr(khtj.getYcr() + tj.getYcr());
+//                        tj.setSjcr(khtj.getSjcr() + tj.getSjcr());
+//                        tj.setWcr(khtj.getWcr() + tj.getWcr());
+
+
+//                        tj.setYcc(khtj.getYcc() + tj.getYcc());
+//                        tj.setSjcc(khtj.getSjcc() + tj.getSjcc());
+//                        tj.setWcc(khtj.getWcc() + tj.getWcc());
+
+
+                        tj.setYxllc(khtj.getYxllc() + tj.getYxllc());
+                        tj.setZsxllc(khtj.getZsxllc() + tj.getZsxllc());
+                        tj.setSjxllc(khtj.getSjxllc() + tj.getSjxllc());
+                        tj.setWxllc(khtj.getWxllc() + tj.getWxllc());
+                        tj.setXllckf(DecimalUtils.add(khtj.getXllckf(), tj.getXllckf()));
+
+                        tj.setYxlsc(khtj.getYxlsc() + tj.getYxlsc());
+                        tj.setZsxlsc(khtj.getZsxlsc() + tj.getZsxlsc());
+                        tj.setSjxlsc(khtj.getSjxlsc() + tj.getSjxlsc());
+                        tj.setWxlsc(khtj.getWxlsc() + tj.getWxlsc());
+                        tj.setXlsckf(DecimalUtils.add(khtj.getXlsckf(), tj.getXlsckf()));
+                        tj.setSxkf(kf + tj.getSxkf());
+                        tj.setSxdf(10 - tj.getSxkf());
+
+
+                    }
+                    tj.setWbbl(tj.getSjbb() == 0 ? "0" : getPercent(tj.getSjbb(), tj.getYbb()));
+                    tj.setXlbl(tj.getSjxl() == 0 ? "0" : getPercent(tj.getSjxl(), tj.getYxl()));
+//                    tj.setQsbl(tj.getSjqs() == 0 ? "0" : getPercent(tj.getSjqs(), tj.getYqs()));
+//                    tj.setCrbl(tj.getSjcr() == 0 ? "0" : getPercent(tj.getSjcr(), tj.getYcr()));
+//                    tj.setCcbl(tj.getSjcc() == 0 ? "0" : getPercent(tj.getSjcc(), tj.getYcc()));
+                    tj.setXllcbl(tj.getSjxllc() == 0 ? "0" : getPercent(tj.getSjxllc(), tj.getYxllc()));
+                    tj.setXlscbl(tj.getSjxlsc() == 0 ? "0" : getPercent(tj.getSjxlsc(), tj.getYxlsc()));
+                    voList.add(tj);
+                    ExcelExp excelExp = new ExcelExp(vo.getSsbm(), voList, TbJcglKhtjVo.class);
+                    sheet.add(excelExp);
+                }
+            }
+            ExcelUtilManySheet<List<ExcelExp>> util2 = new ExcelUtilManySheet<List<ExcelExp>>(sheet);
+            util2.exportExcelManySheet(response, sheet);
+        }
+
+
+/*        List<TbJcglKhtj> list = this.tbJcglKhtjService.getList(dto);
+        ExcelUtil<TbJcglKhtj> util = new ExcelUtil<>(TbJcglKhtj.class);
+        util.exportExcel(response, list, "考核统计", "考核统计");*/
+    }
+
+    public String getPercent(int x, int y) {
+        double d1 = x * 1.0;
+        double d2 = y * 1.0;
+        NumberFormat per = NumberFormat.getPercentInstance();
+        per.setMaximumFractionDigits(2);
+        return per.format(d1 / d2);
+    }
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglPzfzController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglPzfzController.java
new file mode 100644
index 0000000..eed1531
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglPzfzController.java
@@ -0,0 +1,73 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglPzfzService;
+import com.mosty.base.model.dto.jcgl.TbJcglPzfzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglPzfz;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "分值配置相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/fzpz")
+public class TbJcglPzfzController {
+
+    private final TbJcglPzfzService tbJcglPzfzService;
+
+    @ApiOperation("查询配置分值列表")
+    @JwtSysUser
+    @GetMapping({"/selectPzfzByPzrxm"})
+    public ResponseResult<IPage<Map<String, Object>>> getPageList(TbJcglPzfzDto dto) {
+        return ResponseResult.success(this.tbJcglPzfzService.getPageList(dto));
+    }
+
+    @ApiOperation("查询配置分值列表(无条件)")
+    @JwtSysUser
+    @GetMapping({"/selectPzfzwtj"})
+    public ResponseResult<List<TbJcglPzfz>> getPageListWtj() {
+        return ResponseResult.success(this.tbJcglPzfzService.getPageListWtj());
+    }
+
+    @ApiOperation("添加配置分值")
+    @JwtSysUser
+    @PostMapping({"/addPzfz"})
+    @Log(title = "添加配置分值", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglPzfzDto dto) {
+        return ResponseResult.success(this.tbJcglPzfzService.addEntity(dto));
+    }
+
+    @ApiOperation("删除配置分值")
+    @JwtSysUser
+    @DeleteMapping({"/deleteEntity/{id}"})
+    @Log(title = "删除配置分值", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> deleteEntity(@PathVariable("id") String id) {
+        tbJcglPzfzService.deleteEntity(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改配置分值")
+    @JwtSysUser
+    @PutMapping({"/editEntity"})
+    @Log(title = "修改配置分值", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglPzfzDto dto) {
+        return ResponseResult.success(this.tbJcglPzfzService.editEntity(dto));
+    }
+
+    @ApiOperation("查询配置分值详情")
+    @JwtSysUser
+    @GetMapping("{pzlx}")
+    public ResponseResult<TbJcglPzfz> getInfo(@PathVariable("pzlx") String pzlx) {
+        return ResponseResult.success(this.tbJcglPzfzService.getInfo(pzlx));
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglShabllController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglShabllController.java
new file mode 100644
index 0000000..06e5083
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglShabllController.java
@@ -0,0 +1,69 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglShabllInsertAndEditDto;
+import com.mosty.base.model.entity.jcgl.TbJcglShabll;
+import com.mosty.base.model.query.jcgl.TbJcglShabllQuery;
+import com.mosty.base.manager.service.TbJcglShabllService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Api(tags = "社会安保力量接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglShabll")
+public class TbJcglShabllController {
+
+    private final TbJcglShabllService tbJcglShabllService;
+
+    @ApiOperation("新增社会安保力量")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增社会安保力量", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglShabllInsertAndEditDto dto) {
+        return ResponseResult.success(this.tbJcglShabllService.addEntity(dto));
+    }
+
+    @ApiOperation("修改社会安保力量")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改社会安保力量", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglShabllInsertAndEditDto dto) {
+        return ResponseResult.success(this.tbJcglShabllService.editEntity(dto));
+    }
+
+    @ApiOperation("查询社会安保力量-分页")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglShabll>> getPageList(TbJcglShabllQuery dto) {
+        return ResponseResult.success(this.tbJcglShabllService.getPageList(dto));
+    }
+
+    @ApiOperation("删除社会安保力量-批量删除")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除社会安保力量-批量删除", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> delEntity(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbJcglShabllService.delEntity(ids));
+    }
+
+    @ApiOperation("社会安保力量详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglShabll> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglShabllService.getInfo(id));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfController.java
new file mode 100644
index 0000000..8747afb
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfController.java
@@ -0,0 +1,140 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglBqService;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.model.dto.jcgl.TbJcglBqDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡防接口
+ */
+@Api(tags = "巡访接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXf")
+public class TbJcglXfController {
+
+    private final TbJcglXfService tbJcglXfService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "巡访ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXf> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbJcglXfService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXf>> paginQuery(TbJcglXfQuery query) {
+        IPage<TbJcglXf> page = tbJcglXfService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡访签新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglXf xf) {
+        return ResponseResult.success(tbJcglXfService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡访更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglXf xf) {
+        return ResponseResult.success(tbJcglXfService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡访删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfService.deleteById(id));
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("批量删除")
+    @PostMapping("/bacth")
+    @Log(title = "巡访删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfService.deleteByIds(id));
+    }
+
+    /**
+     * 巡访部门统计
+     *
+     * @param query
+     */
+    @ApiOperation("巡访部门统计")
+    @PostMapping("/xfbmtj")
+    @Log(title = "巡访部门统计", businessType = BusinessType.OTHER)
+    public ResponseResult<List<Map<String,Object>>> xfbmtj(@RequestBody TbJcglXfQuery query) {
+        return ResponseResult.success(tbJcglXfService.xfbmtj(query));
+    }
+
+    @ApiOperation("批量申报")
+    @PostMapping("/bacthSb")
+    @Log(title = "批量申报", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Integer> bacthSb(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfService.bacthSb(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfCyryController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfCyryController.java
new file mode 100644
index 0000000..f446b02
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfCyryController.java
@@ -0,0 +1,115 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglXfCyryService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfCyry;
+import com.mosty.base.model.query.jcgl.TbJcglXfCyryQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡防接口
+ */
+@Api(tags = "从业人员接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXfCyry")
+public class TbJcglXfCyryController {
+
+    private final TbJcglXfCyryService tbJcglXfCyryService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "从业人员ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfCyry> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbJcglXfCyryService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXfCyry>> paginQuery(TbJcglXfCyryQuery query) {
+        IPage<TbJcglXfCyry> page = tbJcglXfCyryService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "从业人员新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglXfCyry xf) {
+        return ResponseResult.success(tbJcglXfCyryService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "从业人员更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglXfCyry xf) {
+        return ResponseResult.success(tbJcglXfCyryService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡访删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfCyryService.deleteById(id));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @PostMapping("/bacth")
+    @Log(title = "巡访删除", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfCyryService.deleteByIds(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfDwglController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfDwglController.java
new file mode 100644
index 0000000..8424f04
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfDwglController.java
@@ -0,0 +1,115 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglXfDwglService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfDwgl;
+import com.mosty.base.model.query.jcgl.TbJcglXfDwglQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡防接口
+ */
+@Api(tags = "单位管理接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXfDwgl")
+public class TbJcglXfDwglController {
+
+    private final TbJcglXfDwglService tbJcglXfDwglService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "单位管理ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfDwgl> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbJcglXfDwglService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXfDwgl>> paginQuery(TbJcglXfDwglQuery query) {
+        IPage<TbJcglXfDwgl> page = tbJcglXfDwglService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "单位管理新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglXfDwgl xf) {
+        return ResponseResult.success(tbJcglXfDwglService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "单位管理更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglXfDwgl xf) {
+        return ResponseResult.success(tbJcglXfDwglService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "单位管理删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfDwglService.deleteById(id));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @PostMapping("/bacth")
+    @Log(title = "单位管理删除", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfDwglService.deleteByIds(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfNrmbController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfNrmbController.java
new file mode 100644
index 0000000..7e08afc
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfNrmbController.java
@@ -0,0 +1,118 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglXfNrmbService;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfNrmb;
+import com.mosty.base.model.query.jcgl.TbJcglXfNrmbQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡访内容模板
+ */
+@Api(tags = "巡访内容模板接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXfNrmb")
+public class TbJcglXfNrmbController {
+
+    private final TbJcglXfNrmbService tbJcglXfNrmbService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防内容数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "内容ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfNrmb> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbJcglXfNrmbService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXfNrmb>> paginQuery(TbJcglXfNrmbQuery query) {
+        IPage<TbJcglXfNrmb> page = tbJcglXfNrmbService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡访内容新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglXfNrmb xf) {
+        return ResponseResult.success(tbJcglXfNrmbService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡访内容更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglXfNrmb xf) {
+        return ResponseResult.success(tbJcglXfNrmbService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡访内容删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfNrmbService.deleteById(id));
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("批量删除")
+    @PostMapping("/bacth")
+    @Log(title = "巡访内容批量删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfNrmbService.deleteByIds(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfZgController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfZgController.java
new file mode 100644
index 0000000..be595a6
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfZgController.java
@@ -0,0 +1,118 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.manager.service.TbJcglXfZgService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfZg;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfZgQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡访战果
+ */
+@Api(tags = "巡访战果")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXfZg")
+public class TbJcglXfZgController {
+
+    private final TbJcglXfZgService tbJcglXfZgService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防战果单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "战果ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfZg> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbJcglXfZgService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXfZg>> paginQuery(TbJcglXfZgQuery query) {
+        IPage<TbJcglXfZg> page = tbJcglXfZgService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡访签新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbJcglXfZg xf) {
+        return ResponseResult.success(tbJcglXfZgService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡访更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbJcglXfZg xf) {
+        return ResponseResult.success(tbJcglXfZgService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡访删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfZgService.deleteById(id));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @PostMapping("/bacth")
+    @Log(title = "巡访删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfZgService.deleteByIds(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclController.java
new file mode 100644
index 0000000..db032a3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclController.java
@@ -0,0 +1,100 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import com.mosty.base.model.entity.jcgl.TbJcglXfcl;
+import com.mosty.base.model.query.jcgl.TbJcglXfclQuery;
+import com.mosty.base.manager.service.TbJcglXfclService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.token.JwtSysUser;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/tpJcglXfcl"})
+@Api(tags = {"巡防车辆"})
+public class TbJcglXfclController {
+
+    private final TbJcglXfclService tbJcglXfclService;
+
+    @GetMapping({"/getXfclList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询巡防车辆")
+    public ResponseResult<IPage<TbJcglXfcl>> getXfclList(TbJcglXfclQuery dto) {
+        return ResponseResult.success(tbJcglXfclService.getXfclList(dto));
+    }
+
+    @PostMapping({"/addXfcl"})
+    @JwtSysUser
+    @ApiOperation(value = "新增巡防车辆")
+    public ResponseResult<Void> addXfcl(@RequestBody TbJcglXfcl cl) {
+        tbJcglXfclService.addXfcl(cl);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/updateXfcl"})
+    @JwtSysUser
+    @ApiOperation(value = "修改巡防车辆")
+    public ResponseResult<Void> updateXfcl(@RequestBody TbJcglXfcl cl) {
+        tbJcglXfclService.updateXfcl(cl);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/deleteXfcl"})
+    @JwtSysUser
+    @ApiOperation(value = "删除巡防车辆")
+    public ResponseResult<Boolean> deleteXfcl(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfclService.deleteXfcl(id));
+    }
+
+    @GetMapping({"/selectClxq"})
+    @JwtSysUser
+    @ApiOperation(value = "查询车辆详情")
+    public ResponseResult<TbJcglXfcl> selectClxq(String id) {
+        return ResponseResult.success(tbJcglXfclService.selectClxq(id));
+    }
+
+    @GetMapping({"/selectXfclList"})
+    @JwtSysUser
+    @ApiOperation(value = "app查询车辆列表")
+    public ResponseResult<Page<TbJcglXfcl>> selectXfclList(AppSearchQuery dto) {
+        return ResponseResult.success(tbJcglXfclService.selectXfclList(dto));
+    }
+
+
+    @Log(title = "导入巡防车辆", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    @JwtSysUser
+    @Transactional
+    public ResponseResult<String> importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<TbJcglXfcl> util = new ExcelUtil<TbJcglXfcl>(TbJcglXfcl.class);
+        List<TbJcglXfcl> xfclList = util.importExcel(file.getInputStream());
+        String s = this.tbJcglXfclService.importData(xfclList, updateSupport);
+        return ResponseResult.success(s);
+    }
+
+
+    @Log(title = "巡防车辆模板下载", businessType = BusinessType.IMPORT)
+    @GetMapping("/importTemplate")
+    @JwtSysUser
+    public void importTemplate(HttpServletResponse response) throws Exception {
+        ExcelUtil<TbJcglXfcl> util = new ExcelUtil<TbJcglXfcl>(TbJcglXfcl.class);
+        util.importTemplateExcel(response, "巡防车辆");
+    }
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclSbController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclSbController.java
new file mode 100644
index 0000000..3f863bb
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfclSbController.java
@@ -0,0 +1,72 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.TbJcglXfclSbService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfclSb;
+import com.mosty.base.model.query.jcgl.TbJcglXfclSbQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "巡防车辆设备接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/xfclSb")
+public class TbJcglXfclSbController {
+
+    private final TbJcglXfclSbService tbJcglXfclSbService;
+
+    @ApiOperation("添加巡防车辆设备")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "添加巡防车辆设备", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglXfclSb dto) {
+        return ResponseResult.success(this.tbJcglXfclSbService.addEntity(dto));
+    }
+
+    @ApiOperation("修改巡防车辆设备")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改巡防车辆设备", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglXfclSb dto) {
+        return ResponseResult.success(this.tbJcglXfclSbService.editEntity(dto));
+    }
+
+    @ApiOperation("批量删除巡防车辆设备")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除巡防车辆设备", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> deleteEntity(@RequestBody List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)){ return ResponseResult.fail("参数不能为空！");}
+        return ResponseResult.success(this.tbJcglXfclSbService.delEntity(ids));
+    }
+
+    @ApiOperation("分页查询车辆设备列表")
+    @JwtSysUser
+    @PostMapping("getPageList")
+    public ResponseResult<IPage<TbJcglXfclSb>> getPageList(@RequestBody TbJcglXfclSbQuery dto) {
+        return ResponseResult.success(this.tbJcglXfclSbService.getXfclSbPage(dto));
+    }
+
+    @ApiOperation("查询车辆设备列表")
+    @JwtSysUser
+    @PostMapping("getXfclSbList")
+    public ResponseResult<List<TbJcglXfclSb>> getXfclSbList(@RequestBody TbJcglXfclSbQuery dto) {
+        return ResponseResult.success(this.tbJcglXfclSbService.getXfclSbList(dto));
+    }
+
+    @ApiOperation("查询巡防车辆设备详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglXfclSb> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglXfclSbService.getInfo(id));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllController.java
new file mode 100644
index 0000000..c9f16e1
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllController.java
@@ -0,0 +1,333 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.mapper.TbJcglYbfjMapper;
+import com.mosty.base.manager.service.TbJcglXfllService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllSearchQuery;
+import com.mosty.base.model.dto.jcgl.TbJcglZyjzSearchDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.jcgl.Ybfj;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.model.vo.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.vo.jcgl.TbJcglZyjz;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.Ybmj;
+import com.mosty.common.core.business.mapper.SysUserMapper;
+import com.mosty.common.core.business.mapper.YbmjMapper;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表控制层
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@RestController
+@AllArgsConstructor
+@Api(tags = "巡防力量表对象功能接口")
+@RequestMapping("/tbJcglXfll")
+public class TbJcglXfllController {
+
+    private final TbJcglXfllService tbJcglXfllService;
+    private final TbJcglYbfjMapper tbJcglYbfjMapper;
+    private final YbmjMapper ybmjMapper;
+    private final SysUserMapper sysUserMapper;
+
+
+    @GetMapping("/ybmjtb")
+    @JwtSysUser
+    @ApiOperation(value = "宜宾民警同步")
+    @Log(title = "宜宾民警同步", businessType = BusinessType.OTHER)
+    public ResponseResult<Void> ybmjtb() {
+//        return ResponseResult.success(tbJcglXfllService.queryById(id));
+        List<Ybmj> ybmjs = ybmjMapper.selectList(new QueryWrapper<>());
+        if (!CollectionUtils.isEmpty(ybmjs)) {
+            for (Ybmj ybmj : ybmjs) {
+                TbJcglXfllDto tbJcglXfllDto = new TbJcglXfllDto();
+                tbJcglXfllDto.setFl("01");
+                tbJcglXfllDto.setXm(ybmj.getXm());
+                tbJcglXfllDto.setSfzh(ybmj.getSfzh());
+                //计算男女
+                int gender = Integer.parseInt(ybmj.getSfzh().substring(16, 17));
+                if (gender % 2 == 1) {
+                    tbJcglXfllDto.setXbdm("1");
+                } else {
+                    tbJcglXfllDto.setXbdm("2");
+                }
+                tbJcglXfllDto.setMzdm("01");
+                tbJcglXfllDto.setZzmm("1");
+                tbJcglXfllDto.setJh(ybmj.getJh());
+                tbJcglXfllDto.setLx("02");
+                tbJcglXfllDto.setLxdh(ybmj.getDh());
+                tbJcglXfllDto.setSsbmdm(ybmj.getSsbmdm());
+                SysUser user = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id_entity_card", ybmj.getSfzh()));
+                if (user != null) {
+                    tbJcglXfllDto.setRyid(String.valueOf(user.getId()));
+                }
+                tbJcglXfllService.add(tbJcglXfllDto);
+                ybmjMapper.deleteById(ybmj);
+            }
+        }
+        return ResponseResult.success();
+    }
+
+
+    @GetMapping("/ybfjtb")
+    @JwtSysUser
+    @ApiOperation(value = "宜宾辅警同步")
+    @Log(title = "宜宾辅警同步", businessType = BusinessType.OTHER)
+    public ResponseResult<Void> ybfjtb() {
+//        return ResponseResult.success(tbJcglXfllService.queryById(id));
+        List<Ybfj> ybfjs = tbJcglYbfjMapper.selectList(new QueryWrapper<>());
+        if (!CollectionUtils.isEmpty(ybfjs)) {
+            for (Ybfj ybfj : ybfjs) {
+                TbJcglXfllDto tbJcglXfllDto = new TbJcglXfllDto();
+                tbJcglXfllDto.setFl("02");
+
+                tbJcglXfllDto.setXm(ybfj.getXm());
+                tbJcglXfllDto.setSfzh(ybfj.getSfzh());
+                //计算男女
+                int gender = Integer.parseInt(ybfj.getSfzh().substring(16, 17));
+                if (gender % 2 == 1) {
+                    tbJcglXfllDto.setXbdm("1");
+                } else {
+                    tbJcglXfllDto.setXbdm("2");
+                }
+                tbJcglXfllDto.setMzdm("01");
+                tbJcglXfllDto.setZzmm("1");
+                tbJcglXfllDto.setJh(ybfj.getJh());
+                tbJcglXfllDto.setLx("02");
+                tbJcglXfllDto.setLxdh(ybfj.getDh());
+                tbJcglXfllDto.setSsbmdm(ybfj.getSsbmdm());
+                tbJcglXfllService.add(tbJcglXfllDto);
+                tbJcglYbfjMapper.deleteById(ybfj);
+            }
+        }
+        return ResponseResult.success();
+    }
+
+    @GetMapping("{id}")
+    @JwtSysUser
+    @ApiOperation(value = "通过ID查询单条数据")
+    @Log(title = "巡防力量ID查询", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "巡防力量ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfllVo> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfllService.queryById(id));
+    }
+
+    @ApiOperation(value = "分页查询", httpMethod = "GET")
+    @JwtSysUser
+    @GetMapping
+    @Log(title = "巡防力量分页查询", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbJcglXfllVo>> paginQuery(TbJcglXfllQuery tbJcglXfll) {
+        IPage<TbJcglXfllVo> page = tbJcglXfllService.getList(tbJcglXfll);
+        return ResponseResult.success(page);
+    }
+
+    @ApiOperation(value = "巡防力量查询--第三方接口", httpMethod = "GET")
+    @GetMapping("getXfllPage")
+    public ResponseResult<IPage<TbJcglXfllVo>> getXfllPage(TbJcglXfllQuery tbJcglXfll) {
+        IPage<TbJcglXfllVo> page = tbJcglXfllService.getXfllPage(tbJcglXfll);
+        return ResponseResult.success(page);
+    }
+
+    @ApiOperation(value = "分页查询", httpMethod = "GET")
+    @JwtSysUser
+    @GetMapping("/querySfzh")
+    @Log(title = "查询身份证号集合", businessType = BusinessType.OTHER)
+    public ResponseResult querySfzh() {
+        List<String> list = tbJcglXfllService.querySfzh();
+        return ResponseResult.success(list);
+    }
+
+    @ApiOperation("新增数据")
+    @PostMapping
+    @JwtSysUser
+    @Log(title = "巡防力量新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> add(@RequestBody TbJcglXfllDto tbJcglXfllDto) {
+        tbJcglXfllService.add(tbJcglXfllDto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("验证人员身份证是否存在")
+    @GetMapping("/check/")
+    @ApiImplicitParam(name = "sfzh", value = "巡防力量身份证号", paramType = "query", required = true, dataType = "String")
+    public ResponseResult<Boolean> add(@RequestParam("sfzh") String sfzh) {
+        tbJcglXfllService.cheskXfll(sfzh);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡防力量修改", businessType = BusinessType.UPDATE)
+    public ResponseResult<Boolean> edit(@RequestBody TbJcglXfllDto tbJcglXfllDto) {
+        tbJcglXfllService.edit(tbJcglXfllDto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @JwtSysUser
+    @PostMapping("deleteList")
+    @Log(title = "巡防力量删除", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "巡防力量ID", paramType = "query", required = true, dataType = "String")
+    public ResponseResult deleteById(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfllService.deleteList(id));
+    }
+
+    @ApiOperation("通过主键删除数据(单个)")
+    @PostMapping("delXfll/{id}")
+    @Log(title = "通过主键删除数据(单个)", businessType = BusinessType.DELETE)
+    public ResponseResult deleteById(@PathVariable("id") String id) {
+        List<String> list = new ArrayList<String>() {{
+            this.add(id);
+        }};
+        return ResponseResult.success(tbJcglXfllService.deleteList(list));
+    }
+
+    @ApiOperation("大屏-勤务中心-警力情况")
+    @JwtSysUser
+    @PostMapping("selectAllPolice")
+    @Log(title = "大屏-勤务中心-警力情况", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "巡防力量ID", paramType = "query", required = true, dataType = "String")
+    public ResponseResult selectAllPolice(@RequestBody TbJcglXfllDto tbJcglXfllDto) {
+        return ResponseResult.success(tbJcglXfllService.selectAllPolice(tbJcglXfllDto));
+    }
+
+    @ApiOperation("查询部门下所有的辅警信息")
+    @JwtSysUser
+    @PostMapping("getFjList/{deptid}")
+    public ResponseResult<List<com.mosty.base.model.dto.jcgl.TbJcglXfllVo>> getFjList(@PathVariable("deptid") String deptid) {
+        return ResponseResult.success(tbJcglXfllService.getFjList(deptid));
+    }
+
+    @ApiOperation("查询部门下的专业警种信息")
+    @JwtSysUser
+    @PostMapping("getZyjzList")
+    public ResponseResult<IPage<TbJcglZyjz>> getZyjzList(@RequestBody TbJcglZyjzSearchDto dto) {
+        return ResponseResult.success(tbJcglXfllService.getZyjzList(dto));
+    }
+
+    @ApiOperation("查询部门下的巡防力量信息")
+    @PostMapping("getXfll")
+    public ResponseResult<List<TbJcglXfllVo>> getXfll(@RequestBody TbJcglXfllQueryAllDto dto) {
+        return ResponseResult.success(tbJcglXfllService.getXfll(dto));
+    }
+
+    @ApiOperation("查询巡防力量 民警、辅警")
+    @JwtSysUser
+    @GetMapping("getXfllList")
+    public ResponseResult<IPage<TbJcglXfllVo>> getXfllList(TbJcglXfllSearchQuery dto) {
+        if (dto.getPageCurrent() == null || dto.getPageSize() == null) {
+            throw new BusinessException("需要分页参数！！");
+        }
+        return ResponseResult.success(tbJcglXfllService.getXfllList(dto));
+    }
+
+    @ApiOperation("根据身份证查询巡组力量信息")
+    @PostMapping("getXfllBySfz/{sfzh}")
+    public ResponseResult<TbJcglXfllDto> getXfllBySfz(@PathVariable("sfzh") String sfzh) {
+        return ResponseResult.success(tbJcglXfllService.getXfllBySfz(sfzh));
+    }
+
+
+    @ApiOperation("通过主键离职人员")
+    @JwtSysUser
+    @PostMapping("lzList")
+    @Log(title = "巡防力量离职", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "巡防力量ID", paramType = "query", required = true, dataType = "String")
+    public ResponseResult lzList(@RequestBody List<String> id) {
+        tbJcglXfllService.lzList(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("通过主键离职人员(单个)")
+    @PostMapping("lzXfll/{id}")
+    @Log(title = "通过主键离职人员(单个)", businessType = BusinessType.DELETE)
+    public ResponseResult lzXfll(@PathVariable("id") String id) {
+        List<String> list = new ArrayList<String>() {{
+            this.add(id);
+        }};
+        tbJcglXfllService.lzList(list);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation(value = "获取离职人员列表")
+    @PostMapping("getLzPage")
+    public ResponseResult<IPage<TbJcglXfll>> getLzPage(@RequestBody TbJcglXfllQuery tbJcglXfll) {
+        IPage<TbJcglXfll> page = tbJcglXfllService.getLzPage(tbJcglXfll);
+        return ResponseResult.success(page);
+    }
+
+
+    @ApiOperation(value = "查询部门下面人员数量")
+    @GetMapping("getRysl")
+    @JwtSysUser
+    public ResponseResult<Integer> getRysl(String ssbmdm) {
+        return ResponseResult.success(tbJcglXfllService.getRysl(ssbmdm));
+    }
+
+    @ApiOperation(value = "人员统计")
+    @GetMapping("getRytj")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getRytj(String ssbmdm) {
+        return ResponseResult.success(tbJcglXfllService.getRytj(ssbmdm));
+    }
+
+    @ApiOperation("获取部门列表")
+    @GetMapping("/getBmAll")
+    @JwtSysUser
+    public ResponseResult<List<TbJcglXfll>> getBmAll() {
+        return ResponseResult.success(this.tbJcglXfllService.getBmAll());
+    }
+
+    @Log(title = "导出巡防力量", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportZY")
+    @JwtSysUser
+    public void export(HttpServletResponse response) {
+        List<TbJcglXfll> list = tbJcglXfllService.export();
+        ExcelUtil<TbJcglXfll> util = new ExcelUtil<
+                >(TbJcglXfll.class);
+        util.exportExcel(response, list, "巡逻辅警导出", "巡逻辅警导出");
+    }
+
+
+    @Log(title = "导入巡防力量", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    @JwtSysUser
+    public ResponseResult<String> importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<TbJcglXfll> util = new ExcelUtil<TbJcglXfll>(TbJcglXfll.class);
+        List<TbJcglXfll> userList = util.importExcel(file.getInputStream());
+        String s = this.tbJcglXfllService.importData(userList, updateSupport);
+        return ResponseResult.success(s);
+    }
+
+
+    @Log(title = "模板下载", businessType = BusinessType.IMPORT)
+    @GetMapping("/importTemplate")
+    @JwtSysUser
+    public void importTemplate(HttpServletResponse response) throws Exception {
+        ExcelUtil<TbJcglXfll> util = new ExcelUtil<TbJcglXfll>(TbJcglXfll.class);
+        util.importTemplateExcel(response, "巡防力量");
+    }
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllFzController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllFzController.java
new file mode 100644
index 0000000..ae031ca
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfllFzController.java
@@ -0,0 +1,88 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.manager.service.TbJcglXfllFzService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllFz;
+import com.mosty.base.model.query.jcgl.TbJcglXfllFzQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@Api(tags = "巡防分组接口")
+@RequestMapping("/tbJcglXfllFz")
+public class TbJcglXfllFzController {
+
+    private final TbJcglXfllFzService tbJcglXfllFzService;
+
+    @GetMapping("{id}")
+    @JwtSysUser
+    @ApiOperation(value = "通过ID查询单条数据")
+    @Log(title = "巡防力量ID查询", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "巡防分组ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbJcglXfllFz> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfllFzService.getById(id));
+    }
+
+    @ApiOperation(value = "分页查询", httpMethod = "GET")
+    @JwtSysUser
+    @GetMapping
+    @Log(title = "巡防分组分页查询", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbJcglXfllFz>> paginQuery(TbJcglXfllFzQuery query) {
+        IPage<TbJcglXfllFz> page = new Page<>(query.getPageCurrent(), query.getPageSize());
+        page = this.tbJcglXfllFzService.page(page, new QueryWrapper<TbJcglXfllFz>().lambda()
+                .like(StringUtils.isNotBlank(query.getJzmc()), TbJcglXfllFz::getJzmc, query.getJzmc())
+                .like(StringUtils.isNotBlank(query.getKeyword()), TbJcglXfllFz::getJzry, query.getKeyword())
+                .orderByDesc(TbJcglXfllFz::getXtCjsj)
+        );
+        return ResponseResult.success(page);
+    }
+
+    @ApiOperation("新增数据")
+    @PostMapping
+    @JwtSysUser
+    @Log(title = "巡防力量分组", businessType = BusinessType.INSERT)
+    public ResponseResult<Boolean> add(@RequestBody TbJcglXfllFz fz) {
+        tbJcglXfllFzService.save(fz);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改数据")
+    @PutMapping
+    @JwtSysUser
+    @Log(title = "修改巡防分组", businessType = BusinessType.UPDATE)
+    public ResponseResult<Boolean> update(@RequestBody TbJcglXfllFz fz) {
+        tbJcglXfllFzService.updateById(fz);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @JwtSysUser
+    @PostMapping("deleteList")
+    @Log(title = "巡防分组删除", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "ID", paramType = "query", required = true, dataType = "List")
+    public ResponseResult deleteById(@RequestBody List<String> id) {
+        return ResponseResult.success(tbJcglXfllFzService.removeByIds(id));
+    }
+
+    @ApiOperation("通过主键删除数据(单个)")
+    @PostMapping("delXfll/{id}")
+    @Log(title = "通过主键删除数据(单个)", businessType = BusinessType.DELETE)
+    public ResponseResult deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbJcglXfllFzService.removeById(id));
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfqyController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfqyController.java
new file mode 100644
index 0000000..49516bf
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfqyController.java
@@ -0,0 +1,107 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglXfqy;
+import com.mosty.base.model.query.hczx.RyClTjQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfqyQuery;
+import com.mosty.base.manager.service.TbJcglXfqyService;
+import com.mosty.base.model.query.jcgl.XfqyQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@RestController
+@AllArgsConstructor
+@Api(tags = "巡防区域功能接口")
+@RequestMapping("/tbJcglXfqy")
+public class TbJcglXfqyController {
+
+    private final TbJcglXfqyService tbJcglXfqyService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询巡防区列表")
+    public ResponseResult<IPage<TbJcglXfqyDto>> queryList(TbJcglXfqyQuery xfqyQuery) {
+        return ResponseResult.success(tbJcglXfqyService.getXfqy(xfqyQuery));
+    }
+
+    @PostMapping({"/addXfqy"})
+    @JwtSysUser
+    @Log(title = "新增巡防区域", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增巡防区域")
+    public ResponseResult<Integer> addXfqy(@RequestBody TbJcglXfqyDto xfqy) {
+        return ResponseResult.success(tbJcglXfqyService.addXfqy(xfqy));
+    }
+
+    @PostMapping({"/updateXfqy"})
+    @JwtSysUser
+    @Log(title = "修改巡防区域", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改巡防区域")
+    public ResponseResult<Integer> updateXfqy(@RequestBody TbJcglXfqyDto xfqy) {
+        return ResponseResult.success(tbJcglXfqyService.editXfqy(xfqy));
+    }
+
+    @GetMapping({"/selectById"})
+    @JwtSysUser
+    @ApiOperation(value = "查询巡防区域详情")
+    public ResponseResult<TbJcglXfqyDto> selectByid(String id) {
+        return ResponseResult.success(tbJcglXfqyService.selectById(id));
+    }
+
+    @PostMapping({"/deleteXfqy"})
+    @JwtSysUser
+    @Log(title = "删除巡防区域", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除巡防区域")
+    public ResponseResult<Integer> deleteXfqy(@RequestBody List<String> list) {
+        return ResponseResult.success(tbJcglXfqyService.deleteXfqy(list));
+    }
+
+    @GetMapping("/getXfqList")
+    @JwtSysUser
+    @ApiOperation(value = "app获取巡防区域信息")
+    public ResponseResult<Page<TbJcglXfqy>> getXfqList(AppSearchQuery dto) {
+        return ResponseResult.success(tbJcglXfqyService.getXfqList(dto));
+    }
+
+    // 泸州态势统计-各区县重点巡防区域
+    @ApiOperation("泸州态势统计-各区县重点巡防区域")
+    @PostMapping("/getZdxfqy")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getZdxfqy(XfqyQuery dto) {
+        return ResponseResult.success(this.tbJcglXfqyService.getZdxfqy(dto));
+    }
+
+    // 泸州态势统计-各区县重点巡防区域
+    @ApiOperation("泸州态势统计-警情与重点区域巡逻对比分析")
+    @PostMapping("/getJqandQyxf")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getJqandQyxf(XfqyQuery dto) {
+        return ResponseResult.success(this.tbJcglXfqyService.getJqandQyxf(dto));
+    }
+
+    // 查询所有巡防区域数据
+    @ApiOperation("查询所有巡防区域数据")
+    @PostMapping("/getListAll")
+    @JwtSysUser
+    public ResponseResult<List<TbJcglXfqyDto>> getListAll() {
+        return ResponseResult.success(this.tbJcglXfqyService.getListAll());
+    }
+
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfwgController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfwgController.java
new file mode 100644
index 0000000..eecfef8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXfwgController.java
@@ -0,0 +1,75 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglXfwgInsertDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfwg;
+import com.mosty.base.model.query.jcgl.TbJcglXfwgQuery;
+import com.mosty.base.manager.service.TbJcglXfwgService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防网格 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@RestController
+@AllArgsConstructor
+@Api(tags = "巡防网格功能接口")
+@RequestMapping("/tbJcglXfwg")
+public class TbJcglXfwgController {
+
+    private final TbJcglXfwgService tbJcglXfwgService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询巡防网格列表")
+    public ResponseResult<IPage<TbJcglXfwgInsertDto>> queryList(TbJcglXfwgQuery dto) {
+        return ResponseResult.success(tbJcglXfwgService.getXfwg(dto));
+    }
+
+    @PostMapping({"/addXfwg"})
+    @JwtSysUser
+    @Log(title = "新增巡防网格", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增巡防网格")
+    public ResponseResult addXfwg(@RequestBody TbJcglXfwgInsertDto xfwg) {
+        return ResponseResult.success(tbJcglXfwgService.addXfwg(xfwg));
+    }
+
+    @PostMapping({"/updateXfwg"})
+    @JwtSysUser
+    @Log(title = "修改巡防网格", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改巡防网格")
+    public ResponseResult updateXfwg(@RequestBody TbJcglXfwgInsertDto xfwg) {
+        return ResponseResult.success(tbJcglXfwgService.editXfwg(xfwg));
+    }
+
+    @GetMapping({"/selectById"})
+    @JwtSysUser
+    @ApiOperation(value = "查询巡防网格详情")
+    public ResponseResult<TbJcglXfwgInsertDto> selectByid(String id) {
+        return ResponseResult.success(tbJcglXfwgService.selectById(id));
+    }
+
+    @PostMapping({"/deleteXfwg"})
+    @JwtSysUser
+    @Log(title = "删除巡防网格", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除巡防网格")
+    public ResponseResult deleteXfwg(@RequestBody List<String> list) {
+        return ResponseResult.success(tbJcglXfwgService.deleteXfwg(list));
+    }
+
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXlfaController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXlfaController.java
new file mode 100644
index 0000000..5cc49f8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXlfaController.java
@@ -0,0 +1,68 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglXlfaDto;
+import com.mosty.base.model.query.jcgl.TbJcglXlfaQuery;
+import com.mosty.base.manager.service.TbJcglXlfaService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/08/11
+ **/
+@Api(tags = "巡逻方案接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbJcglXlfa")
+public class TbJcglXlfaController {
+
+    private final TbJcglXlfaService tbJcglXlfaService;
+
+    @ApiOperation("新增巡逻方案")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增巡逻方案", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglXlfaDto dto) {
+        return ResponseResult.success(this.tbJcglXlfaService.addEntity(dto));
+    }
+
+    @ApiOperation("修改巡逻方案")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改巡逻方案", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> updateEntity(@RequestBody TbJcglXlfaDto dto) {
+        return ResponseResult.success(this.tbJcglXlfaService.updateEntity(dto));
+    }
+
+    @ApiOperation("删除巡逻方案")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除巡逻方案", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> delEntity(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbJcglXlfaService.delEntity(ids));
+    }
+
+    @ApiOperation("查询巡逻方案列表--分页")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbJcglXlfaDto>> getPageList(TbJcglXlfaQuery dto) {
+        return ResponseResult.success(this.tbJcglXlfaService.getPageList(dto));
+    }
+
+    @ApiOperation("查询详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglXlfaDto> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglXlfaService.getInfo(id));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXljlController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXljlController.java
new file mode 100644
index 0000000..5d2a082
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglXljlController.java
@@ -0,0 +1,68 @@
+package com.mosty.base.manager.controller;
+
+import com.mosty.base.manager.service.TbJcglXljlService;
+import com.mosty.base.model.dto.jcgl.TbJcglAbfcDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXljlDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.entity.jcgl.TbJcglXljl;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "训练记录")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/xljl")
+public class TbJcglXljlController {
+
+    private final TbJcglXljlService tbJcglXljlService;
+
+    @ApiOperation("添加训练记录")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "添加训练记录", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbJcglXljlDto dto) {
+        return ResponseResult.success(this.tbJcglXljlService.addEntity(dto));
+    }
+
+    @ApiOperation("修改训练记录")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改训练记录", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbJcglXljlDto dto) {
+        return ResponseResult.success(this.tbJcglXljlService.editEntity(dto));
+    }
+
+    @ApiOperation("批量删除训练记录")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除训练记录", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteEntity(@RequestBody List<String> ids) {
+        this.tbJcglXljlService.deleteEntity(ids);
+        return ResponseResult.success();
+    }
+
+
+    @ApiOperation("查询训练记录详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbJcglXljl> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJcglXljlService.getInfo(id));
+    }
+
+    @ApiOperation("根据巡防人员ID获取人员训练列表")
+    @JwtSysUser
+    @GetMapping("/getListByXfid")
+    public ResponseResult<List<TbJcglXljl>> getListByXfid(String xfid) {
+        return ResponseResult.success(this.tbJcglXljlService.getListByXfid(xfid));
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglZjkController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglZjkController.java
new file mode 100644
index 0000000..ac4ba9c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbJcglZjkController.java
@@ -0,0 +1,73 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglZjk;
+import com.mosty.base.model.query.jcgl.TbJcglZjkQuery;
+import com.mosty.base.manager.service.TbJcglZjkService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 基础管理-专家库 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+@RestController
+@AllArgsConstructor
+@Api(tags = "专家库功能接口")
+@RequestMapping("/tbJcglZjk")
+public class TbJcglZjkController {
+
+    private final TbJcglZjkService tbJcglZjkService;
+
+    @GetMapping({"/queryList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询专家库列表")
+    public ResponseResult<IPage<TbJcglZjk>> queryList(TbJcglZjkQuery zjkQuery) {
+        return ResponseResult.success(tbJcglZjkService.queryPage(zjkQuery));
+    }
+
+    @PostMapping({"/insert"})
+    @JwtSysUser
+    @Log(title = "新增专家库", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增专家库")
+    public ResponseResult insert(@RequestBody TbJcglZjk zjk) {
+        return ResponseResult.success(tbJcglZjkService.insert(zjk));
+    }
+
+    @PostMapping({"/update"})
+    @JwtSysUser
+    @Log(title = "修改专家库", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改专家库")
+    public ResponseResult update(@RequestBody TbJcglZjk zjk) {
+        return ResponseResult.success(tbJcglZjkService.update(zjk));
+    }
+
+    @GetMapping({"/selectById"})
+    @JwtSysUser
+    @ApiOperation(value = "查询专家库详情")
+    public ResponseResult selectByid(String id) {
+        return ResponseResult.success(tbJcglZjkService.selectById(id));
+    }
+
+    @PostMapping({"/delete"})
+    @JwtSysUser
+    @Log(title = "删除专家库", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除专家库")
+    public ResponseResult delete(@RequestBody List<String> list) {
+        return ResponseResult.success(tbJcglZjkService.deleteById(list));
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbSbGzjrController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbSbGzjrController.java
new file mode 100644
index 0000000..91f0fa4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TbSbGzjrController.java
@@ -0,0 +1,74 @@
+package com.mosty.base.manager.controller;
+
+import com.mosty.base.manager.service.TbSbGzjrService;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@Api(tags = "感知接入相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/gzjr")
+public class TbSbGzjrController {
+
+    private final TbSbGzjrService tbSbGzjrService;
+
+    @ApiOperation("添加感知接入")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "添加感知接入", businessType = BusinessType.INSERT)
+    public ResponseResult<String> addEntity(@RequestBody TbSbGzjr dto) {
+        return ResponseResult.success(this.tbSbGzjrService.addEntity(dto));
+    }
+
+    @ApiOperation("修改感知接入")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改感知接入", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbSbGzjr dto) {
+        return ResponseResult.success(this.tbSbGzjrService.editEntity(dto));
+    }
+
+    @ApiOperation("批量删除感知接入")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除感知接入", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteEntity(@RequestParam List<String> ids) {
+        this.tbSbGzjrService.deleteEntity(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询感知接入列表")
+    @JwtSysUser
+    @PostMapping("/getList")
+    public ResponseResult<List<TbSbGzjr>> getList(@RequestBody TbSbGzjr dto) {
+        return ResponseResult.success(this.tbSbGzjrService.getList(dto));
+    }
+
+    @ApiOperation("查询感知接入详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbSbGzjr> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbSbGzjrService.getInfo(id));
+    }
+
+
+    @ApiOperation("根据id取消接入")
+    @JwtSysUser
+    @PostMapping("/qxjr")
+    public ResponseResult<Integer> qxjrById(@RequestBody TbSbGzjr dto) {
+        return ResponseResult.success(this.tbSbGzjrService.qxjr(dto));
+    }
+
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpJcglZbflController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpJcglZbflController.java
new file mode 100644
index 0000000..9bda1c0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpJcglZbflController.java
@@ -0,0 +1,68 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.entity.jcgl.TbJcglZbfl;
+import com.mosty.base.manager.service.TpJcglZbflService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/tpJcglZbfl"})
+@Api(tags = {"装备分类管理"})
+public class TpJcglZbflController {
+
+    private final TpJcglZbflService tpJcglZbflService;
+
+
+    @PostMapping("{addZbfl}")
+    @JwtSysUser
+    @Log(title = "新增装备类型", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增装备类型")
+    public ResponseResult<Void> addZbfl(@RequestBody TbJcglZbfl zbfl) {
+        tpJcglZbflService.addZbfl(zbfl);
+        return ResponseResult.success();
+    }
+
+    @GetMapping(value = "selectLxList")
+    @JwtSysUser
+    @ApiOperation(value = "查询装备类型列表")
+    public ResponseResult<IPage<TbJcglZbfl>> selectList(TbJcglZbfl zbfl) {
+        IPage<TbJcglZbfl> page = new Page<>(zbfl.getPageNo(),zbfl.getPageSize());
+        return ResponseResult.success(tpJcglZbflService.selectList(zbfl,page));
+    }
+
+    @GetMapping("{zbTree}")
+    @JwtSysUser
+    @ApiOperation(value = "查询装备树")
+    public ResponseResult<List<TbJcglZbfl>> zbTree(String scode) {
+        return ResponseResult.success(tpJcglZbflService.zbTree(scode));
+    }
+
+    @PutMapping("{editZbfl}")
+    @JwtSysUser
+    @Log(title = "编辑装备类型", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "编辑装备类型")
+    public ResponseResult<Void> editZbfl(@RequestBody TbJcglZbfl zbfl) {
+        tpJcglZbflService.editZbfl(zbfl);
+        return ResponseResult.success();
+    }
+
+    @PostMapping("deleteZbfl")
+    @JwtSysUser
+    @Log(title = "递归删除装备类型", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "递归删除装备类型")
+    public ResponseResult<Void> deleteZbfl(@RequestBody List<String> id) {
+        tpJcglZbflService.deleteZbfl(id);
+        return ResponseResult.success();
+    }
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpjcglZnzbController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpjcglZnzbController.java
new file mode 100644
index 0000000..39d1c65
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/TpjcglZnzbController.java
@@ -0,0 +1,174 @@
+package com.mosty.base.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.manager.service.TpjcglZnzbService;
+import com.mosty.base.model.dto.jcgl.TbJcglZnzbSearchDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglZnzb;
+import com.mosty.base.model.query.jcgl.TbJcglZnzbQuery;
+import com.mosty.base.model.query.jcgl.TbJcglZyzbQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglZnzbVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.config.Excel.ExcelUtil;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping({"/tpjcglZnzb"})
+@Api(tags = {"智能装备管理"})
+public class TpjcglZnzbController {
+
+    private final TpjcglZnzbService tpjcglZnzbService;
+
+
+    @PostMapping({"/xfZnzb"})
+    @JwtSysUser
+    @Log(title = "下发智能", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "下发智能")
+    public ResponseResult xfZnzb(@RequestBody TbJcglZnzb zb) {
+        tpjcglZnzbService.xfZnzb(zb);
+        return ResponseResult.success();
+
+    }
+
+    @GetMapping({"/htZnzb"})
+    @JwtSysUser
+    @ApiOperation(value = "回退智能装备")
+    public ResponseResult htZnzb(String id) {
+        tpjcglZnzbService.htZnzb(id);
+        return ResponseResult.success();
+    }
+
+    @GetMapping({"/bsZnzb"})
+    @JwtSysUser
+    @ApiOperation(value = "报损智能装备")
+    public ResponseResult bsZnzb(String id) {
+        tpjcglZnzbService.bsZnzb(id);
+        return ResponseResult.success();
+    }
+
+
+    @PostMapping({"/addZnzb"})
+    @JwtSysUser
+    @Log(title = "新增智能装备", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "新增智能装备")
+    public ResponseResult<Integer> addZnzb(@RequestBody TbJcglZnzb tbJcglZnzb) {
+        return ResponseResult.success(tpjcglZnzbService.addZnzb(tbJcglZnzb));
+    }
+
+
+    @PostMapping({"/getZyzb"})
+    @JwtSysUser
+    @ApiOperation(value = "查询专业装备")
+    public ResponseResult<List<TbJcglZnzb>> getZyzb(@RequestBody TbJcglZyzbQuery tbJcglZyzbQuery) {
+        return ResponseResult.success(tpjcglZnzbService.getZyzb(tbJcglZyzbQuery));
+    }
+
+    @GetMapping({"/getZnzb"})
+    @JwtSysUser
+    @ApiOperation(value = "查询智能装备")
+    public ResponseResult<IPage<TbJcglZnzbVo>> getZnzb(TbJcglZnzb zb) {
+        IPage<TbJcglZnzb> tbJcglZnzbIPage = new Page<>(zb.getPageNo(), zb.getPageSize());
+        return ResponseResult.success(tpjcglZnzbService.getZnzb(zb, tbJcglZnzbIPage));
+    }
+
+    @PostMapping({"/editZnzb"})
+    @JwtSysUser
+    @Log(title = "编辑智能装备", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "编辑智能装备")
+    public ResponseResult editZnzb(@RequestBody TbJcglZnzb tbJcglZnzb) {
+        tpjcglZnzbService.editZnzb(tbJcglZnzb);
+        return ResponseResult.success();
+    }
+
+    @PostMapping({"/deleteZnzb"})
+    @JwtSysUser
+    @Log(title = "删除智能装备", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除智能装备")
+    public ResponseResult deleteZnzb(@RequestBody List<String> id) {
+        tpjcglZnzbService.deleteZnzb(id);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("selectZbxq")
+    @JwtSysUser
+    @ApiOperation(value = "id查询智能装备")
+    public ResponseResult<TbJcglZnzbVo> selectZbxq(String id) {
+        return ResponseResult.success(tpjcglZnzbService.selectZbxq(id));
+    }
+
+    @GetMapping({"/znzbDqtx"})
+    @JwtSysUser
+    @ApiOperation(value = "智能装备到期提醒")
+    public ResponseResult<IPage<TbJcglZnzb>> znzbDqtx(TbJcglZnzbQuery tbJcglZnzb) {
+        IPage<TbJcglZnzb> tbJcglZnzbIPage = new Page<>(tbJcglZnzb.getPageCurrent(), tbJcglZnzb.getPageSize());
+        return ResponseResult.success(tpjcglZnzbService.znzbDqtx(tbJcglZnzb, tbJcglZnzbIPage));
+    }
+
+    @GetMapping({"/checkZnzb"})
+    @JwtSysUser
+    @ApiOperation(value = "查询装备到期和故障，提醒部门下的所有人")
+    public ResponseResult<Object> checkZnzb() {
+        return ResponseResult.success(this.tpjcglZnzbService.checkZnzb());
+    }
+
+    @GetMapping({"/getFjzbList"})
+    @JwtSysUser
+    @ApiOperation(value = "查询附近的智能装备")
+    public ResponseResult<IPage<TbJcglZnzbVo>> getFjzbList(TbJcglZnzbSearchDto dto) {
+        return ResponseResult.success(this.tpjcglZnzbService.getFjzbList(dto));
+    }
+
+    @GetMapping("/getZnzbList")
+    @JwtSysUser
+    @ApiOperation(value = "app获取智能装备信息")
+    public ResponseResult<IPage<TbJcglZnzbVo>> getZnzbList(AppSearchQuery dto) {
+        return ResponseResult.success(this.tpjcglZnzbService.getZnzbList(dto));
+    }
+
+    @GetMapping({"/zyZbtj"})
+    @JwtSysUser
+    @ApiOperation(value = "资源装备统计")
+    public ResponseResult<Map<String, Object>> zyZbtj(String ssbmdm) {
+        return ResponseResult.success(tpjcglZnzbService.zyZbtj(ssbmdm));
+    }
+
+    @GetMapping({"/sblxTj"})
+    @JwtSysUser
+    @ApiOperation(value = "设备类型统计")
+    public ResponseResult<List<Map<String, Object>>> sblxTj(String type, String ssbmdm) {
+        return ResponseResult.success(tpjcglZnzbService.sblxTj(type, ssbmdm));
+    }
+
+    @Log(title = "导入智能装备", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    @JwtSysUser
+    public ResponseResult<String> importData(MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelUtil<TbJcglZnzb> util = new ExcelUtil<TbJcglZnzb>(TbJcglZnzb.class);
+        List<TbJcglZnzb> userList = util.importExcel(file.getInputStream());
+        String s = this.tpjcglZnzbService.importData(userList, updateSupport);
+        return ResponseResult.success(s);
+    }
+
+
+    @Log(title = "模板下载", businessType = BusinessType.IMPORT)
+    @GetMapping("/importTemplate")
+    @JwtSysUser
+    public void importTemplate(HttpServletResponse response) throws Exception {
+        ExcelUtil<TbJcglZnzb> util = new ExcelUtil<TbJcglZnzb>(TbJcglZnzb.class);
+        util.importTemplateExcel(response, "智能装备");
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSydwJbxxGxController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSydwJbxxGxController.java
new file mode 100644
index 0000000..d0c5246
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSydwJbxxGxController.java
@@ -0,0 +1,61 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.VwSydwJbxxGxService;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSydwCyryPageQuery;
+import com.mosty.base.model.query.afjcsj.VwSydwJbxxGxQuery;
+import com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@RestController
+@RequestMapping("/vwSydwJbxxGx")
+@AllArgsConstructor
+@Api(tags = {"实有单位基本信息"})
+public class VwSydwJbxxGxController {
+
+    private VwSydwJbxxGxService vwSydwJbxxGxService;
+
+    @GetMapping(value = "selectSydwList")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有单位列表")
+    public ResponseResult<IPage<VwSydwJbxxGx>> selectList(VwSydwJbxxGxQuery dto) {
+        return ResponseResult.success(vwSydwJbxxGxService.selectList(dto));
+    }
+
+    @GetMapping(value = "getStatistics")
+    @JwtSysUser
+    @ApiOperation(value = "统计实有单位")
+    public ResponseResult<List<Map<String,Object>>> getStatistics() {
+        return ResponseResult.success(vwSydwJbxxGxService.getStatistics());
+    }
+
+    @GetMapping(value = "getSydwInfo/{id}")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有单位详情")
+    public ResponseResult<VwSydwJbxxGx> getSydwInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(vwSydwJbxxGxService.getSydwInfo(id));
+    }
+
+    @GetMapping(value = "getSydwCyryPage")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有单位从业人员列表")
+    public ResponseResult<IPage<VwSydwCyryGx>> getSydwCyryPage(VwSydwCyryPageQuery dto) {
+        return ResponseResult.success(vwSydwJbxxGxService.getSydwCyryPage(dto));
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSyrkJzgjGxController.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSyrkJzgjGxController.java
new file mode 100644
index 0000000..5e61b31
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/controller/VwSyrkJzgjGxController.java
@@ -0,0 +1,72 @@
+package com.mosty.base.manager.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.service.VwSyrkJzgjGxService;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSydwJbxxGxQuery;
+import com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@RestController
+@RequestMapping("/vwSyrkJzgjGx")
+@AllArgsConstructor
+@Api(tags = {"实有人口-居住轨迹接口信息表"})
+public class VwSyrkJzgjGxController {
+
+    private VwSyrkJzgjGxService vwSyrkJzgjGxService;
+
+    @GetMapping(value = "selectPageList")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有人口列表")
+    public ResponseResult<IPage<VwSyrkJzgjGx>> selectPageList(VwSyrkJzgjGxQuery dto) {
+        return ResponseResult.success(this.vwSyrkJzgjGxService.selectPageList(dto));
+    }
+
+    @GetMapping(value = "selectGjList")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有人口居住轨迹")
+    public ResponseResult<IPage<VwSyrkJzgjGx>> selectGjList(VwSyrkJzgjGxListQuery dto) {
+        return ResponseResult.success(this.vwSyrkJzgjGxService.selectGjList(dto));
+    }
+
+    @GetMapping(value = "getStatistics")
+    @JwtSysUser
+    @ApiOperation(value = "统计实有人口数据")
+    public ResponseResult<List<Map<String, Object>>> getStatistics() {
+        return ResponseResult.success(this.vwSyrkJzgjGxService.getStatistics());
+    }
+
+    @GetMapping(value = "getSyrkCygj/{zjhm}")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有人口从业轨迹")
+    public ResponseResult<List<VwSydwCyryGx>> getSyrkCygj(@PathVariable("zjhm") String zjhm) {
+        return ResponseResult.success(this.vwSyrkJzgjGxService.getSyrkCygj(zjhm));
+    }
+
+    @GetMapping(value = "getSyrkInfo/{id}")
+    @JwtSysUser
+    @ApiOperation(value = "查询实有人口详情")
+    public ResponseResult<VwSydwCyryGx> getSyrkInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.vwSyrkJzgjGxService.getSyrkInfo(id));
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglAbfcMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglAbfcMapper.java
new file mode 100644
index 0000000..d534352
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglAbfcMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglAbfcMapper extends BaseMapper<TbJcglAbfc> {
+
+    @ApiOperation("查询列表")
+    List<TbJcglAbfc> getList(TbJcglAbfcQuery dto);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBqMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBqMapper.java
new file mode 100644
index 0000000..19908a2
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBqMapper.java
@@ -0,0 +1,43 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglBq;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 巡防警力标签表（技能/经验）;(tb_jcgl_bq)表数据库访问层
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@Mapper
+public interface TbJcglBqMapper extends BaseMapper<TbJcglBq>{
+     IPage<TbJcglBqVo> paginQuery(@Param("page") IPage<TbJcglBq> page, @Param("params") TbJcglBqQuery tbJcglBq);
+
+    List<TbJcglBqVo> countBqsl(@Param("vo") TbJcglBqVo tbJcglBqVo);
+
+    /**
+     * 标签类型统计
+     * @param bqlx
+     * @return
+     */
+    Integer countBqslByBqlx(@Param("bqlx") String bqlx);
+
+    /**
+     * 批量删除
+     * @param list
+     */
+    int deleteBatch(@Param("list") List<String> list);
+
+    /**
+     * 批量注销
+     * @param list
+     */
+    int zxBatch(@Param("list") List<String> list);
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxdMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxdMapper.java
new file mode 100644
index 0000000..3701c41
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxdMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglBxd;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防区域必巡点 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@Mapper
+public interface TbJcglBxdMapper extends BaseMapper<TbJcglBxd> {
+
+    int deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("添加必循点信息")
+    int insertExtity(TbJcglBxd bxd);
+
+    @ApiOperation("修改必循点西悉尼")
+    int updateEntity(TbJcglBxd bxd);
+
+    @ApiOperation("修改之前生成的必巡点的信息")
+    void updateYesterdayBxd();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxxMapper.java
new file mode 100644
index 0000000..d75a0d3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglBxxMapper.java
@@ -0,0 +1,36 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglBxx;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@Mapper
+public interface TbJcglBxxMapper extends BaseMapper<TbJcglBxx> {
+
+    @ApiOperation("根据Id删除数据")
+    int deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("添加必巡线")
+    int insertEntity(TbJcglBxx item);
+
+    @ApiOperation("修改必巡线信息")
+    int updateEntity(TbJcglBxx item);
+
+    @ApiOperation("查询列表分页")
+    List<TbJcglBxx> getPageList(Map<String, Object> map);
+
+    @ApiOperation("查询列表数据总和")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询详情信息")
+    TbJcglBxx getById(@Param("id") String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglDsfMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglDsfMapper.java
new file mode 100644
index 0000000..fbfe835
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglDsfMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglDsf;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglDsfMapper extends BaseMapper<TbJcglDsf> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJwzMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJwzMapper.java
new file mode 100644
index 0000000..c0095f4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJwzMapper.java
@@ -0,0 +1,21 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglJwzMapper extends BaseMapper<TbJcglJwz> {
+
+    void deleteJwz(@Param("id") List<String> id);
+
+    @ApiOperation("添加警务站信息")
+    void insertEntity(TbJcglJwz tbJcglJwz);
+
+    @ApiOperation("修改警务站")
+    void updateEntity(TbJcglJwz jwz);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJyqxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJyqxMapper.java
new file mode 100644
index 0000000..c99daad
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJyqxMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglJyqxMapper extends BaseMapper<TbJcglJyqx> {
+
+    void deleteZb(@Param("id") List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzClMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzClMapper.java
new file mode 100644
index 0000000..2bc33d1
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzClMapper.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJzCl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 勤务警组车辆关联表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Mapper
+public interface TbJcglJzClMapper extends BaseMapper<TbJcglJzCl> {
+
+    @ApiOperation("批量删除")
+    void deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("根据警组ID删除")
+    void deleteByQwjzId(@Param("qwjzId") String qwjzId);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzJyqxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzJyqxMapper.java
new file mode 100644
index 0000000..5f77e52
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzJyqxMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJzJyqx;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 勤务警组警用器械 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+public interface TbJcglJzJyqxMapper extends BaseMapper<TbJcglJzJyqx> {
+
+    /**
+     * 批量删除
+     * @param list
+     */
+    void deleteBatch(@Param("list") List<String> list);
+
+    /**
+     * 根据警组ID删除
+     * @param qwjzId
+     */
+    void deleteByQwjzId(@Param("qwjzId") String qwjzId);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzMapper.java
new file mode 100644
index 0000000..d246822
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzMapper.java
@@ -0,0 +1,38 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglJz;
+import com.mosty.base.model.query.jcgl.TbJcglJzQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglJzAllVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 勤务警组 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@Mapper
+public interface TbJcglJzMapper extends BaseMapper<TbJcglJz> {
+
+    @ApiOperation("警组查询")
+    List<TbJcglJz> queryList(Map<String, Object> map);
+
+    @ApiOperation("批量删除")
+    int deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("id查询")
+    TbJcglJzAllVo queryById(@Param("id") String id);
+
+    @ApiOperation("查询数量")
+    int queryCount(Map<String, Object> map);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzRyMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzRyMapper.java
new file mode 100644
index 0000000..8197928
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzRyMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJzRy;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 勤务警组人员 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+public interface TbJcglJzRyMapper extends BaseMapper<TbJcglJzRy> {
+
+    /**
+     * 批量删除
+     * @param list
+     */
+    void deleteBatch(@Param("list") List<String> list);
+
+    /**
+     * 根据警组ID删除
+     * @param qwjzId
+     */
+    void deleteByQwjzId(@Param("qwjzId") String qwjzId);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzZnzbMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzZnzbMapper.java
new file mode 100644
index 0000000..d322aa3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglJzZnzbMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglJzZnzb;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务警组通讯装备 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+public interface TbJcglJzZnzbMapper extends BaseMapper<TbJcglJzZnzb> {
+
+    @ApiOperation("批量删除")
+    void deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("根据警组ID删除")
+    void deleteByQwjzId(@Param("qwjzId") String qwjzId);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKfdMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKfdMapper.java
new file mode 100644
index 0000000..4279bee
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKfdMapper.java
@@ -0,0 +1,35 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbJcglKfdMapper extends BaseMapper<TbJcglKfd> {
+
+    @ApiOperation("删除快反点信息")
+    void deleteKfd(@Param("id") List<String> id);
+
+    @ApiOperation("保存快反点信息")
+    int insertEntity(TbJcglKfd item);
+
+    @ApiOperation("修改快反点信息")
+    int updateEntity(TbJcglKfd item);
+
+    @ApiOperation("查询列表分页")
+    List<TbJcglKfd> getPageList(Map<String, Object> map);
+
+    @ApiOperation("查询列表不分页")
+    List<TbJcglKfd> getListAll();
+
+    @ApiOperation("查询列表数据总和")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询详情信息")
+    TbJcglKfd getById(@Param("kfdId") String kfdId);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhbmMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhbmMapper.java
new file mode 100644
index 0000000..af41314
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhbmMapper.java
@@ -0,0 +1,24 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.jcgl.TbJcglKhbmEditPzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.simpleframework.xml.Path;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglKhbmMapper extends BaseMapper<TbJcglKhbm> {
+
+    // 删除绩效考核部门
+    void delKhbm(@Param("list") List<String> ids);
+
+    // 查询所有的已选中的部门
+    List<String> getAllKhbm(@Param("ssbmdm") String ssbmdm);
+
+    // 修改考核部门配置
+    void editKhbm(@Param("dto") TbJcglKhbmEditPzDto dto);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhmxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhmxMapper.java
new file mode 100644
index 0000000..591f216
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhmxMapper.java
@@ -0,0 +1,11 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglKhmx;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglKhmxMapper extends BaseMapper<TbJcglKhmx> {
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhtjMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhtjMapper.java
new file mode 100644
index 0000000..0f51a99
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglKhtjMapper.java
@@ -0,0 +1,25 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglKhtj;
+import com.mosty.base.model.vo.jcgl.TbJcglKhtjVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbJcglKhtjMapper extends BaseMapper<TbJcglKhtj> {
+
+    // 统计数量
+    int getCount(Map<String, Object> mp);
+
+    // 统计列表
+    List<TbJcglKhtjVo> getList(Map<String, Object> mp);
+
+    // 统计数量
+    Map<String, Object> getStatistics(Map<String, Object> map);
+
+    List<TbJcglKhtjVo> getFxbm(Map<String, Object> mp);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglPzfzMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglPzfzMapper.java
new file mode 100644
index 0000000..390f8d4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglPzfzMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglPzfz;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbJcglPzfzMapper extends BaseMapper<TbJcglPzfz> {
+    // 查询
+    List<Map<String, Object>> getList(Map<String, Object> map);
+
+    // 删除
+    int deleteByPzfzId(String id);
+
+    // 详情
+    TbJcglPzfz selectPzlx(String pzlx);
+
+    // total
+    int getListCount(Map<String, Object> map);
+
+    // 无条件
+    List<Map<String, Object>> getPageListWtj(Map<String, Object> map);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglShabllMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglShabllMapper.java
new file mode 100644
index 0000000..d12921f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglShabllMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglShabll;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ **/
+@Mapper
+public interface TbJcglShabllMapper extends BaseMapper<TbJcglShabll> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfCyryMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfCyryMapper.java
new file mode 100644
index 0000000..91f791f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfCyryMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfCyry;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfCyryMapper extends BaseMapper<TbJcglXfCyry> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfDwglMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfDwglMapper.java
new file mode 100644
index 0000000..d67379c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfDwglMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfDwgl;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfDwglMapper extends BaseMapper<TbJcglXfDwgl> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfMapper.java
new file mode 100644
index 0000000..a7306c2
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfMapper.java
@@ -0,0 +1,19 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbJcglXfMapper extends BaseMapper<TbJcglXf> {
+
+    List<Map<String, Object>> xfbmtj(TbJcglXfQuery query);
+
+
+    int bacthSb(@Param("list") List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfNrmbMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfNrmbMapper.java
new file mode 100644
index 0000000..c917425
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfNrmbMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfNrmb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfNrmbMapper extends BaseMapper<TbJcglXfNrmb> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfRwMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfRwMapper.java
new file mode 100644
index 0000000..d801dc9
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfRwMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfRw;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfRwMapper extends BaseMapper<TbJcglXfRw> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfZgMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfZgMapper.java
new file mode 100644
index 0000000..ef3854e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfZgMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfZg;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfZgMapper extends BaseMapper<TbJcglXfZg> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclMapper.java
new file mode 100644
index 0000000..6cec05c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfcl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglXfclMapper extends BaseMapper<TbJcglXfcl> {
+
+    void deleteZb(@Param("id") List<String> id);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclSbMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclSbMapper.java
new file mode 100644
index 0000000..82afec3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfclSbMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfclSb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfclSbMapper extends BaseMapper<TbJcglXfclSb> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllFzMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllFzMapper.java
new file mode 100644
index 0000000..3f81c62
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllFzMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllFz;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXfllFzMapper extends BaseMapper<TbJcglXfllFz> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllMapper.java
new file mode 100644
index 0000000..9311fff
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllMapper.java
@@ -0,0 +1,42 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.vo.jcgl.TbJcglZyjz;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglXfllVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表数据库访问层
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Mapper
+public interface TbJcglXfllMapper  extends BaseMapper<TbJcglXfll> {
+
+    IPage<TbJcglXfllVo> getList(@Param("page") IPage<TbJcglXfll> page, @Param("params") TbJcglXfllQuery tbJcglXfll);
+
+    TbJcglXfllVo queryById(String id);
+
+    void deleteList(@Param("id") List<String> id);
+
+    Map<String, Integer> selectAllPolice(TbJcglXfllDto tbJcglXfllDto);
+
+    Map<String, Integer> selectPolice(TbJcglXfllDto tbJcglXfllDto);
+
+    Map<String, Integer> selectAuxPolice(TbJcglXfllDto tbJcglXfllDto);
+
+    @ApiOperation("条件查询巡防力量列表")
+    List<TbJcglZyjz> getxfllList(Map<String, Object> map);
+
+    @ApiOperation("条件查询巡防力量数量")
+    int getxfllCount(Map<String, Object> map);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllbqMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllbqMapper.java
new file mode 100644
index 0000000..6fc7008
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfllbqMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllBq;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表数据库访问层
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@Mapper
+public interface TbJcglXfllbqMapper extends BaseMapper<TbJcglXfllBq> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfqyMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfqyMapper.java
new file mode 100644
index 0000000..099e148
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfqyMapper.java
@@ -0,0 +1,54 @@
+package com.mosty.base.manager.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfqy;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-07-14
+ */
+public interface TbJcglXfqyMapper extends BaseMapper<TbJcglXfqy> {
+
+    @ApiOperation("批量删除")
+    int deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("添加巡防区域")
+    int insertEntity(TbJcglXfqy xfqy);
+
+    @ApiOperation("修改巡逻区域")
+    int updateEntity(TbJcglXfqy item);
+
+    @ApiOperation("查询列表分页")
+    List<TbJcglXfqy> getPageList(Map<String, Object> map);
+
+    @ApiOperation("查询列表数据总和")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询详情信息")
+    TbJcglXfqy getById(@Param("id") String id);
+
+    @ApiOperation("重点区域巡防总数")
+    List<Map<String, Object>> getSfzs();
+
+    @ApiOperation("巡防重点数")
+    List<Map<String, Object>> getSfzd(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("警情统计")
+    List<Map<String, Object>> getJqTj(@Param("kssj") String kssj);
+
+    @ApiOperation("根据时间统计警情")
+    List<Map<String, Object>> getJqTjByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("根据时间统计重点巡防次数")
+    List<Map<String, Object>> getXfzdByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询列表分页")
+    List<TbJcglXfqy> getListAll();
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfwgMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfwgMapper.java
new file mode 100644
index 0000000..7fe91c1
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXfwgMapper.java
@@ -0,0 +1,22 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXfwg;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbJcglXfwgMapper extends BaseMapper<TbJcglXfwg> {
+
+    @ApiOperation("批量删除")
+    int deleteBatch(@Param("list") List<String> list);
+
+    @ApiOperation("新增")
+    int insertEntity(TbJcglXfwg xfwg);
+
+    @ApiOperation("修改")
+    int updateEntity(TbJcglXfwg xfwg);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaMapper.java
new file mode 100644
index 0000000..9587f28
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXlfa;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ **/
+@Mapper
+public interface TbJcglXlfaMapper extends BaseMapper<TbJcglXlfa> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaXldwMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaXldwMapper.java
new file mode 100644
index 0000000..d075ba3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXlfaXldwMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXlfaXldw;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ **/
+@Mapper
+public interface TbJcglXlfaXldwMapper extends BaseMapper<TbJcglXlfaXldw> {
+
+    @ApiOperation("新增")
+    void insertEntity(TbJcglXlfaXldw item);
+
+    @ApiOperation("通过方案ID删除数据")
+    void deleteEntity(@Param("faid") String faid);
+
+    @ApiOperation("根据ID查询方案点位")
+    List<TbJcglXlfaXldw> getListByFaId(@Param("faid") String faid);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXljlMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXljlMapper.java
new file mode 100644
index 0000000..a6711ee
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglXljlMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglXljl;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglXljlMapper extends BaseMapper<TbJcglXljl> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglYbfjMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglYbfjMapper.java
new file mode 100644
index 0000000..e4beb39
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglYbfjMapper.java
@@ -0,0 +1,8 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.Ybfj;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglYbfjMapper extends BaseMapper<Ybfj> {}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZbjlMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZbjlMapper.java
new file mode 100644
index 0000000..214d495
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZbjlMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglZbjl;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJcglZbjlMapper extends BaseMapper<TbJcglZbjl> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZjkMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZjkMapper.java
new file mode 100644
index 0000000..ddc5f9b
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbJcglZjkMapper.java
@@ -0,0 +1,25 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglZjk;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 基础管理-专家库 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+@Mapper
+public interface TbJcglZjkMapper extends BaseMapper<TbJcglZjk> {
+
+    @ApiOperation("批量删除")
+    int deleteBatch(@Param("list") List<String> list);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbSbGzjrMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbSbGzjrMapper.java
new file mode 100644
index 0000000..541d659
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TbSbGzjrMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbSbGzjrMapper extends BaseMapper<TbSbGzjr> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpJcglZbflMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpJcglZbflMapper.java
new file mode 100644
index 0000000..a1d1eb8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpJcglZbflMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.jcgl.TbJcglZbfl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpJcglZbflMapper extends BaseMapper<TbJcglZbfl> {
+    //查询最大的code
+    String selectMaxCode();
+
+    void updateZt(@Param("scode") String scode);
+
+    void updateType(@Param("id") String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpjcglZnzbMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpjcglZnzbMapper.java
new file mode 100644
index 0000000..641fa3e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/TpjcglZnzbMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.vo.jcgl.TbJcglZnzbVo;
+import com.mosty.base.model.entity.jcgl.TbJcglZnzb;
+import com.mosty.common.config.entity.SysDictItem;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TpjcglZnzbMapper extends BaseMapper<TbJcglZnzb> {
+
+    void deleteZb(@Param("id") List<String> id);
+
+    @ApiOperation("查询附近装备列表")
+    List<TbJcglZnzbVo> getFjzbList(Map<String, Object> map);
+
+    @ApiOperation("查询附近装备数量")
+    int getFjzbCount(Map<String, Object> map);
+
+    List<Map<String, Object>> sblxTj(String ssbmdm);
+
+    @ApiOperation("查询字典")
+    SysDictItem selectDict(@Param("dictName") String dictName, @Param("dm") String dm);
+
+    List<Map<String, Object>> znlxTj(@Param("ssbmdm") String ssbmdm ,@Param("scode") String scode);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStMhJgxxbGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStMhJgxxbGxMapper.java
new file mode 100644
index 0000000..c304802
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStMhJgxxbGxMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.afjcsj.VwShareStMhJgxxbGx;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Mapper
+public interface VwShareStMhJgxxbGxMapper extends BaseMapper<VwShareStMhJgxxbGx> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStShzyJtKyqcgpxxGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStShzyJtKyqcgpxxGxMapper.java
new file mode 100644
index 0000000..3fc4162
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStShzyJtKyqcgpxxGxMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.afjcsj.VwShareStShzyJtKyqcgpxxGx;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Mapper
+public interface VwShareStShzyJtKyqcgpxxGxMapper extends BaseMapper<VwShareStShzyJtKyqcgpxxGx> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStTlLksmdpGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStTlLksmdpGxMapper.java
new file mode 100644
index 0000000..7c60765
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwShareStTlLksmdpGxMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.mapper;
+
+import com.mosty.base.model.entity.afjcsj.VwShareStTlLksmdpGx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Mapper
+public interface VwShareStTlLksmdpGxMapper extends BaseMapper<VwShareStTlLksmdpGx> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwCyryGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwCyryGxMapper.java
new file mode 100644
index 0000000..358df97
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwCyryGxMapper.java
@@ -0,0 +1,12 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+public interface VwSydwCyryGxMapper extends BaseMapper<VwSydwCyryGx> {
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwJbxxGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwJbxxGxMapper.java
new file mode 100644
index 0000000..d3b01ae
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSydwJbxxGxMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@Mapper
+public interface VwSydwJbxxGxMapper extends BaseMapper<VwSydwJbxxGx> {
+
+    @ApiOperation("查询实有单位列表")
+    List<VwSydwJbxxGx> selectSydwList(Map<String,Object> map);
+
+    @ApiOperation("查询是实有单位数量")
+    Integer selectSydwCount(Map<String,Object> map);
+
+    @ApiOperation("实有单位统计")
+    List<Map<String, Object>> getStatistics();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSyrkJzgjGxMapper.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSyrkJzgjGxMapper.java
new file mode 100644
index 0000000..312e205
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mapper/VwSyrkJzgjGxMapper.java
@@ -0,0 +1,24 @@
+package com.mosty.base.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+public interface VwSyrkJzgjGxMapper extends BaseMapper<VwSyrkJzgjGx> {
+
+    @ApiOperation("查询实有人口数量")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询实有人口列表")
+    List<VwSyrkJzgjGx> getList(Map<String, Object> map);
+
+    @ApiOperation("查询实有人口统计")
+    List<Map<String, Object>> getStatistics();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..cf6d146
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.base.manager.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/MybatisPlusConfig.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..6cc57fb
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.base.manager.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbBaseAdaptRemoteService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..4b28cf9
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,175 @@
+package com.mosty.base.manager.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.sql.BatchUpdateException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    // 部门信息
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据部门deptid获取所属分县局、所属地市州
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门下的所有的子部门信息
+    public List<String> getChildDept(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return null;
+        }
+        ResponseResult<List<String>> responseResult = mostyBaseFeignService.getChildDept(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门部门下的子部门异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门部门下的子部门异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门下的所有的子部门信息
+    public List<String> getChildDeptByOrgCode(String ssbmdm) {
+        if (StringUtils.isBlank(ssbmdm)) {
+            return null;
+        }
+        ResponseResult<List<String>> responseResult = mostyBaseFeignService.getChildDeptByOrgCode(ssbmdm);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门部门下的子部门异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门部门下的子部门异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 发送系统消息
+    public Integer sendMsg(SysMessageInfoInsertDto dto) {
+        ResponseResult<Integer> responseResult = mostyBaseFeignService.sendMsg(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送系统消息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送系统消息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门下的用户列表，不包含子部门
+    public List<SysUserDeptVO> getUserList(String deptid) {
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserList(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的用户列表异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的用户列表异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询所有的用户数据（包含对应的部门信息）
+    public List<SysUserDeptVO> getUserAll(String deptid) {
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserAll(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所有的用户数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所有的用户数据异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据经纬度获取位置信息
+    public JSONObject getAddress(String jd, String wd) {
+        ResponseResult<JSONObject> responseResult = mostyBaseFeignService.getAddress(jd, wd);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据经纬度获取位置信息 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据经纬度获取位置信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据经纬度获取位置信息
+    public JSONObject getLzAddress(String jd, String wd) {
+        ResponseResult<JSONObject> responseResult = mostyBaseFeignService.getLzAddress(jd, wd);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据经纬度获取位置信息 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据经纬度获取位置信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取配置信息
+    public String getValue(String pzj) {
+        ResponseResult<String> responseResult = mostyBaseFeignService.getValue(pzj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取配置信息 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取配置信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取位置信息
+    public String getLocation(String jd, String wd) {
+        String address = "";
+        ResponseResult<JSONObject> obj = this.mostyBaseFeignService.getLzAddress(jd, wd);
+        if (obj != null && obj.getData() != null) {
+            String city = StringUtils.isNotBlank(obj.getData().getString("city")) ? obj.getData().getString("city") : "";
+            String suburb = StringUtils.isNotBlank(obj.getData().getString("suburb")) ? obj.getData().getString("suburb") : "";
+            String town = StringUtils.isNotBlank(obj.getData().getString("town")) ? obj.getData().getString("town") : "";
+            String village = StringUtils.isNotBlank(obj.getData().getString("village")) ? obj.getData().getString("village") : "";
+            address = city + suburb + town + village;
+        }
+        return address;
+    }
+
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbHczxAdaptRemoteService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbHczxAdaptRemoteService.java
new file mode 100644
index 0000000..cb10d40
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbHczxAdaptRemoteService.java
@@ -0,0 +1,60 @@
+package com.mosty.base.manager.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.feign.service.MostyHczxFeignService;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbHczxAdaptRemoteService {
+
+    // 部门信息
+    private final MostyHczxFeignService mostyHczxFeignService;
+
+    // 查询部门的盘查人员的数量
+    public Integer getSjpcr(String ssbmdm, String time) {
+        ResponseResult<Integer> responseResult = mostyHczxFeignService.getSjpcr(ssbmdm, time);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门的盘查人员的数量 异常responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门的盘查人员的数量！");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询部门的盘查车辆的数量
+    public Integer getSjpcc(String ssbmdm, String time) {
+        ResponseResult<Integer> responseResult = mostyHczxFeignService.getSjpcc(ssbmdm, time);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门的盘查车辆的数量 异常responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门的盘查车辆的数量！");
+        }
+        return responseResult.getData();
+    }
+    // 查询部门的盘查物品的数量
+    public Integer getPcWptj(String ssbmdm, String time) {
+        ResponseResult<Integer> responseResult = mostyHczxFeignService.getPcWptj(ssbmdm, time);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门的盘查车辆的数量 异常responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门的盘查车辆的数量！");
+        }
+        return responseResult.getData();
+    }
+
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbQwzxAdaptRemoteService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbQwzxAdaptRemoteService.java
new file mode 100644
index 0000000..c2324d9
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbQwzxAdaptRemoteService.java
@@ -0,0 +1,46 @@
+package com.mosty.base.manager.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 勤务中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbQwzxAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    // 查询部门的报备的数量
+    public Integer getBbCount(String ssbmdm, String time) {
+        ResponseResult<Integer> responseResult = mostyQwzxFeignService.getBbCount(ssbmdm, time);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门的报备的数量 异常responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门的报备的数量异常！");
+        }
+        return responseResult.getData();
+    }
+    // 查询查询部门时长、里程
+    public Map<String, Integer> getScLc(String ssbmdm, String time) {
+        ResponseResult<Map<String, Integer>> responseResult = mostyQwzxFeignService.getScLc(ssbmdm, time);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门时长、里程 异常responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门时长、里程！");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYjzlAdaptRrmoteService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYjzlAdaptRrmoteService.java
new file mode 100644
index 0000000..f500719
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYjzlAdaptRrmoteService.java
@@ -0,0 +1,46 @@
+package com.mosty.base.manager.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.feign.service.MostyYjzlFeignService;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.yjzl.TbZlxxVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYjzlAdaptRrmoteService {
+
+    private final MostyYjzlFeignService mostyYjzlFeignService;
+
+    // 查询犯罪预测数量
+    public Integer getFzyjCount(String ssbmdm, String time, String sfxl) {
+        ResponseResult<Integer> responseResult = mostyYjzlFeignService.getFzyjCount(ssbmdm, time, sfxl);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询犯罪预测数量 异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询犯罪预测数量 异常!");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询指令的数量
+    public Integer getZlCount(String ssbmdm, String time, String zlzxzt) {
+        ResponseResult<Integer> responseResult = mostyYjzlFeignService.getZlCount(ssbmdm, time, zlzxzt);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询指令的数量 异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询指令的数量 异常!");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYsZxAdaptRemoteService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYsZxAdaptRemoteService.java
new file mode 100644
index 0000000..77264e2
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/remote/TbYsZxAdaptRemoteService.java
@@ -0,0 +1,93 @@
+package com.mosty.base.manager.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用公安机关要素接口
+ **/
+@Service
+@Slf4j
+public class TbYsZxAdaptRemoteService {
+
+    @Resource
+    private MostyYszxFeignService tbYszxFeignService;
+
+    /**
+     * 添加公安机要素
+     *
+     * @param dto
+     * @return
+     */
+    public int addGajg(TbYsGajgDto dto) {
+        ResponseResult<Integer> responseResult = tbYszxFeignService.add(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用添加公安机关要素失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return 0;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 编辑公安机要素
+     *
+     * @param dto
+     * @return
+     */
+    public void updateGajg(TbYsGajgDto dto) {
+        ResponseResult<Void> responseResult = tbYszxFeignService.update(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用修改公安机关要素失败  responseResult = {}", JSON.toJSONString(responseResult));
+        }
+    }
+
+    /**
+     * 查询公安机关要素详情
+     *
+     * @param id
+     * @return
+     */
+    public TbYsGajgVo getGajgInfo(String id) {
+        ResponseResult<TbYsGajgVo> responseResult = tbYszxFeignService.getInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用查询公安机关要素详情失败  responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 删除公安机关要素
+     *
+     * @param id
+     * @return
+     */
+    public void delEntity(String id) {
+        ResponseResult<Void> responseResult = tbYszxFeignService.delEntity(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用删除公安机关要素失败  responseResult = {}", JSON.toJSONString(responseResult));
+        }
+    }
+
+    /**
+     *根据必巡点id 和来源表名 删除公安机关要素
+     *
+     * @param dto
+     * @return
+     */
+    public void delEntity(TbYsGajgDto dto) {
+        ResponseResult<Void> responseResult = tbYszxFeignService.delEntity(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用删除公安机关要素失败  responseResult = {}", JSON.toJSONString(responseResult));
+        }
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglAbfcService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglAbfcService.java
new file mode 100644
index 0000000..0e392f0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglAbfcService.java
@@ -0,0 +1,27 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglAbfcDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglAbfcService {
+
+    @ApiOperation("添加安保风采")
+    int addEntity(TbJcglAbfcDto dto);
+
+    @ApiOperation("修改安保风采")
+    int editEntity(TbJcglAbfcDto dto);
+
+    @ApiOperation("批量删除安保风采")
+    void deleteEntity(List<String> ids);
+
+    @ApiOperation("查询安保风采列表")
+    List<TbJcglAbfc> getPageList(TbJcglAbfcQuery dto);
+
+    @ApiOperation("查询安保风采详情")
+    TbJcglAbfc getInfo(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBqService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBqService.java
new file mode 100644
index 0000000..bccdcd7
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBqService.java
@@ -0,0 +1,72 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglBqDto;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+
+import java.util.List;
+
+/**
+ * 巡防警力标签表（技能/经验）;(tb_jcgl_bq)表服务接口
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+public interface TbJcglBqService{
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TbJcglBqVo queryById(String id);
+    
+    /**
+     * 分页查询
+     *
+     * @param tbJcglBq 筛选条件
+     * @return
+     */
+    IPage<TbJcglBqVo> paginQuery(TbJcglBqQuery tbJcglBq);
+    /**
+     * 新增数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    int insert(TbJcglBqDto tbJcglBq);
+    /**
+     * 更新数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    int update(TbJcglBqDto tbJcglBq);
+    /** 
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    boolean deleteById(String id);
+
+     public boolean checkMc(String mc);
+
+     Object countBqsl(TbJcglBqVo tbJcglBqVo);
+
+    /**
+     * 批量删除
+     * @param id
+     * @return
+     */
+     boolean deleteByIds(List<String> id);
+
+    /**
+     * 注销标签
+     * @param id
+     * @return
+     */
+     boolean zcbqByIds(List<String> id);
+
+ }
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxdService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxdService.java
new file mode 100644
index 0000000..e394ade
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxdService.java
@@ -0,0 +1,31 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglBxd;
+import com.mosty.base.model.query.jcgl.TbJcglBxdQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TbJcglBxdService {
+
+    @ApiOperation("新增")
+    int addBxd(TbJcglBxd bxd);
+
+    @ApiOperation("查询必巡点")
+    IPage<TbJcglBxd> queryBxd(TbJcglBxdQuery bxdQuery);
+
+    @ApiOperation("编辑必巡点")
+    int editBxd(TbJcglBxd bxd);
+
+    @ApiOperation("删除必巡点")
+    int deleteBxd(List<String> list);
+
+    @ApiOperation("根据ID查询")
+    TbJcglBxd selectById(String id);
+
+    @ApiOperation("自动计算的必巡点添加")
+    void createdBxd(List<Map<String, Object>> list);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxxService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxxService.java
new file mode 100644
index 0000000..cc9e7b7
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglBxxService.java
@@ -0,0 +1,27 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglBxxDto;
+import com.mosty.base.model.query.jcgl.TbJcglBxxQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglBxxService {
+
+    @ApiOperation("新增")
+    int addBxx(TbJcglBxxDto bxx);
+
+    @ApiOperation("查询必巡线")
+    IPage<TbJcglBxxDto> queryBxx(TbJcglBxxQuery bxxQuery);
+
+    @ApiOperation("编辑必巡线")
+    int editBxx(TbJcglBxxDto bxx);
+
+    @ApiOperation("删除必巡线")
+    int deleteBxx(List<String> list);
+
+    @ApiOperation("根据ID查询")
+    TbJcglBxxDto selectById(String id);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglDsfService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglDsfService.java
new file mode 100644
index 0000000..cae061c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglDsfService.java
@@ -0,0 +1,39 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfDto;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfJudgeDto;
+import com.mosty.base.model.entity.jcgl.TbJcglDsf;
+import com.mosty.base.model.query.jcgl.TbJcglDsfQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.List;
+
+public interface TbJcglDsfService {
+
+    @ApiOperation("添加第三方数据")
+    int addEntity(TbJcglDsfDto dto);
+
+    @ApiOperation("修改第三方数据")
+    int editEntity(TbJcglDsfDto dto);
+
+    @ApiOperation("批量删除第三方")
+    void deleteEntity(List<String> ids);
+
+    @ApiOperation("查询第三方列表数据")
+    IPage<TbJcglDsf> getPageList(TbJcglDsfQuery dto);
+
+    @ApiOperation("查询第三方详情")
+    TbJcglDsf getInfo(String id);
+
+    @ApiOperation("审核")
+    int judge(TbJcglDsfJudgeDto dto);
+
+    @ApiOperation("检查第三方是否过期")
+    void checkDsf();
+
+    @ApiOperation("根据Code查询第三方详情")
+    TbJcglDsfVo getDsfInfo(String code);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJwzService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJwzService.java
new file mode 100644
index 0000000..0a63aab
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJwzService.java
@@ -0,0 +1,19 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+
+import java.util.List;
+
+public interface TbJcglJwzService {
+
+    IPage<TbJcglJwz> selectJwzList(TbJcglJwz tbJcglJwz, IPage<TbJcglJwz> page);
+
+    void addJwz(TbJcglJwz tbJcglJwz);
+
+    void updateJwz(TbJcglJwz tbJcglJwz);
+
+    boolean deleteJwz(List<String> id);
+
+    Object selectByid(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJyqxService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJyqxService.java
new file mode 100644
index 0000000..15858ad
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJyqxService.java
@@ -0,0 +1,37 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import com.mosty.base.model.query.jcgl.TbJcglJyqxQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglJyqxService {
+
+    void addJyqx(TbJcglJyqx tbJcglJyqx);
+
+    void xfZnzb(TbJcglJyqx tbJcglJyqx);
+
+    void htZnzb(String id,long sl);
+
+    void bsZnzb(String id,long sl);
+
+    IPage<TbJcglJyqx> selectJyqx(TbJcglJyqx tbJcglJyqx, IPage<TbJcglJyqx> page);
+
+    void updateJyqx(TbJcglJyqx tbJcglJyqx);
+
+    void deleteJyQxzb(List<String> id);
+
+    Object selectJyqxXq(String id);
+
+    IPage<TbJcglJyqx> selectDqjyqx(TbJcglJyqxQuery tbJcglJyqx, IPage<TbJcglJyqx> page);
+
+    @ApiOperation("app查询警用器械信息")
+    IPage<TbJcglJyqx> getJyqxList(AppSearchQuery dto);
+
+
+    @ApiOperation("导入警用器械")
+    String importData(List<TbJcglJyqx> jyqxList,boolean updateSupport);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJzService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJzService.java
new file mode 100644
index 0000000..d30c73f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglJzService.java
@@ -0,0 +1,40 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJz;
+import com.mosty.base.model.query.jcgl.TbJcglJzQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglJzAllVo;
+import com.mosty.base.model.vo.jcgl.TbJcglJzVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-06-30
+ */
+public interface TbJcglJzService {
+
+    @ApiOperation("分页查询警组")
+    IPage<TbJcglJzAllVo> queryList(TbJcglJzQuery jz);
+
+    @ApiOperation("根据ID查询警组")
+    TbJcglJzAllVo selectById(String id);
+
+    @ApiOperation("添加警组")
+    int saveJz(TbJcglJzAllVo jz);
+
+    @ApiOperation("修改警组")
+    int updateJz(TbJcglJzAllVo jz);
+
+    @ApiOperation("批量删除警组")
+    boolean deleteBatch(List<String> list);
+
+    @ApiOperation("app查询警组信息")
+    Page<TbJcglJzAllVo> selectJzList(AppSearchQuery dto);
+
+    @ApiOperation("同步警组器械")
+    void tbJzQx();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKfdService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKfdService.java
new file mode 100644
index 0000000..3726031
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKfdService.java
@@ -0,0 +1,30 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import com.mosty.base.model.query.jcgl.TbJcglKfdQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglKfdService {
+
+    IPage<TbJcglKfdDto> selectKfdList(TbJcglKfdQuery dto);
+
+    int addKfd(TbJcglKfdDto tbJcglKfd);
+
+    int updateKfd(TbJcglKfdDto tbJcglKfd);
+
+    TbJcglKfdDto selectByid(String id);
+
+    void deleteKfd(List<String> id);
+
+    @ApiOperation("app获取快反点列表")
+    Page<TbJcglKfd> getKfdList(AppSearchQuery dto);
+
+    @ApiOperation("获取所有快反点")
+    List<TbJcglKfdDto> getListAll();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhbmService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhbmService.java
new file mode 100644
index 0000000..4d12a05
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhbmService.java
@@ -0,0 +1,27 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglKhbmEditPzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import com.mosty.base.model.query.jcgl.TbJcglKhbmQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhbmVo;
+
+import java.util.List;
+
+public interface TbJcglKhbmService {
+
+    // 添加绩效考核部门
+    void addKhbm(List<String> ssbmidList);
+
+    // 删除绩效考核部门
+    void delKhbm(List<String> ids);
+
+    // 查询绩效考核参与部门列表
+    IPage<TbJcglKhbmVo> getPageList(TbJcglKhbmQuery dto);
+
+    // 查询所有的已选中的部门
+    List<String> getAllKhbm();
+
+    // 修改考核部门配置
+    void editKhbm(TbJcglKhbm dto);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhmxService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhmxService.java
new file mode 100644
index 0000000..457abda
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhmxService.java
@@ -0,0 +1,61 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglKhmx;
+import com.mosty.base.model.query.jcgl.TbJcglKhmxQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhmxVo;
+
+import java.util.List;
+
+public interface TbJcglKhmxService {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TbJcglKhmxVo queryById(String id);
+
+    /**
+     * 分页查询
+     *
+     * @param tbJcglkhmx 筛选条件
+     * @return
+     */
+    IPage<TbJcglKhmx> paginQuery(TbJcglKhmxQuery tbJcglkhmx);
+
+    /**
+     * 新增数据
+     *
+     * @param tbJcglKhmx 实例对象
+     * @return 实例对象
+     */
+    int insert(TbJcglKhmx tbJcglKhmx);
+
+    /**
+     * 更新数据
+     *
+     * @param tbJcglKhmx 实例对象
+     * @return 实例对象
+     */
+    int update(TbJcglKhmx tbJcglKhmx);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    boolean deleteById(String id);
+
+    /**
+     * 批量删除
+     *
+     * @param id
+     * @return
+     */
+    boolean deleteByIds(List<String> id);
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhtjService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhtjService.java
new file mode 100644
index 0000000..b43b57b
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglKhtjService.java
@@ -0,0 +1,28 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglKhtj;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjQuery;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjStatisticsQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglKhtjVo;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbJcglKhtjService {
+
+    // 统计某一天的数据
+    void builder(String time);
+
+    // 条件查询列表信息
+    IPage<TbJcglKhtjVo> getPageList(TbJcglKhtjQuery dto);
+
+    // 统计数据
+    Map<String,Object> getStatistics(TbJcglKhtjStatisticsQuery dto);
+
+    List<TbJcglKhtj> getList(TbJcglKhtjQuery dto);
+
+    List<TbJcglKhtjVo> getFxbm(TbJcglKhtjQuery dto);
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglPzfzService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglPzfzService.java
new file mode 100644
index 0000000..65b7a8d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglPzfzService.java
@@ -0,0 +1,30 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglPzfzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglPzfz;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbJcglPzfzService {
+
+    @ApiOperation("查询配置分值列表")
+    IPage<Map<String, Object>> getPageList(TbJcglPzfzDto dto);
+
+    @ApiOperation("添加配置分值")
+    int addEntity(TbJcglPzfzDto dto);
+
+    @ApiOperation("删除配置分值")
+    int deleteEntity(String id);
+
+    @ApiOperation("修改配置分值")
+    int editEntity(TbJcglPzfzDto dto);
+
+    @ApiOperation("查询配置分值详情")
+    TbJcglPzfz getInfo(String pzlx);
+
+    @ApiOperation("查询配置分值列表(无条件)")
+    List<TbJcglPzfz> getPageListWtj();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglShabllService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglShabllService.java
new file mode 100644
index 0000000..f7cb630
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglShabllService.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglShabllInsertAndEditDto;
+import com.mosty.base.model.entity.jcgl.TbJcglShabll;
+import com.mosty.base.model.query.jcgl.TbJcglShabllQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 社会安保力量-服务类
+ **/
+public interface TbJcglShabllService {
+
+    @ApiOperation("新增社会安保力量")
+    int addEntity(TbJcglShabllInsertAndEditDto dto);
+
+    @ApiOperation("修改社会安保力量")
+    int editEntity(TbJcglShabllInsertAndEditDto dto);
+
+    @ApiOperation("查询社会安保力量-分页")
+    IPage<TbJcglShabll> getPageList(TbJcglShabllQuery dto);
+
+    @ApiOperation("删除社会安保力量-批量删除")
+    Integer delEntity(List<String> ids);
+
+    @ApiOperation("查询社会安保力量详情")
+    TbJcglShabll getInfo(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfCyryService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfCyryService.java
new file mode 100644
index 0000000..3cc4d31
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfCyryService.java
@@ -0,0 +1,24 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfCyry;
+import com.mosty.base.model.query.jcgl.TbJcglXfCyryQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+
+import java.util.List;
+
+public interface TbJcglXfCyryService {
+
+    TbJcglXfCyry queryById(String id);
+
+    IPage<TbJcglXfCyry> paginQuery(TbJcglXfCyryQuery query);
+
+    Integer insert(TbJcglXfCyry xf);
+
+    Integer update(TbJcglXfCyry xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfDwglService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfDwglService.java
new file mode 100644
index 0000000..1873015
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfDwglService.java
@@ -0,0 +1,22 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXfDwgl;
+import com.mosty.base.model.query.jcgl.TbJcglXfDwglQuery;
+
+import java.util.List;
+
+public interface TbJcglXfDwglService {
+
+    TbJcglXfDwgl queryById(String id);
+
+    IPage<TbJcglXfDwgl> paginQuery(TbJcglXfDwglQuery query);
+
+    Integer insert(TbJcglXfDwgl xf);
+
+    Integer update(TbJcglXfDwgl xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfNrmbService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfNrmbService.java
new file mode 100644
index 0000000..7cc6920
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfNrmbService.java
@@ -0,0 +1,22 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXfNrmb;
+import com.mosty.base.model.query.jcgl.TbJcglXfNrmbQuery;
+
+import java.util.List;
+
+public interface TbJcglXfNrmbService {
+
+    TbJcglXfNrmb queryById(String id);
+
+    IPage<TbJcglXfNrmb> paginQuery(TbJcglXfNrmbQuery query);
+
+    Integer insert(TbJcglXfNrmb xf);
+
+    Integer update(TbJcglXfNrmb xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfRwService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfRwService.java
new file mode 100644
index 0000000..e5ecda5
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfRwService.java
@@ -0,0 +1,22 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXfRw;
+import com.mosty.base.model.query.jcgl.TbJcglXfRwQuery;
+
+import java.util.List;
+
+public interface TbJcglXfRwService {
+
+    TbJcglXfRw queryById(String id);
+
+    IPage<TbJcglXfRw> paginQuery(TbJcglXfRwQuery query);
+
+    Integer insert(TbJcglXfRw xf);
+
+    Integer update(TbJcglXfRw xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfService.java
new file mode 100644
index 0000000..722313c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfService.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbJcglXfService {
+
+    TbJcglXf queryById(String id);
+
+    IPage<TbJcglXf> paginQuery(TbJcglXfQuery query);
+
+    Integer insert(TbJcglXf xf);
+
+    Integer update(TbJcglXf xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+
+    List<Map<String, Object>> xfbmtj(TbJcglXfQuery query);
+
+    int bacthSb(List<String> id);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfZgService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfZgService.java
new file mode 100644
index 0000000..ebed110
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfZgService.java
@@ -0,0 +1,24 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfZg;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfZgQuery;
+
+import java.util.List;
+
+public interface TbJcglXfZgService {
+
+    TbJcglXfZg queryById(String id);
+
+    IPage<TbJcglXfZg> paginQuery(TbJcglXfZgQuery query);
+
+    Integer insert(TbJcglXfZg xf);
+
+    Integer update(TbJcglXfZg xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclSbService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclSbService.java
new file mode 100644
index 0000000..e963ed4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclSbService.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglXfclSb;
+import com.mosty.base.model.query.jcgl.TbJcglXfclSbQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglXfclSbService {
+
+    @ApiOperation("新增车辆设备")
+    int addEntity(TbJcglXfclSb dto);
+
+    @ApiOperation("修改车辆设备")
+    int editEntity(TbJcglXfclSb dto);
+
+    @ApiOperation("批量删除")
+    Integer delEntity(List<String> ids);
+
+    @ApiOperation("根据id查询设备详情")
+    TbJcglXfclSb getInfo(String id);
+
+    @ApiOperation("根据id删除车辆设备")
+    Integer deleteById(String id);
+
+    @ApiOperation("分页查询车辆设备列表")
+    IPage<TbJcglXfclSb> getXfclSbPage(TbJcglXfclSbQuery dto);
+
+    @ApiOperation("查询车辆设备列表")
+    List<TbJcglXfclSb> getXfclSbList(TbJcglXfclSbQuery dto);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclService.java
new file mode 100644
index 0000000..5f9772d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfclService.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglXfcl;
+import com.mosty.base.model.query.jcgl.TbJcglXfclQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglXfclService {
+
+    IPage<TbJcglXfcl> getXfclList(TbJcglXfclQuery tbJcglXfcl);
+
+    void addXfcl(TbJcglXfcl tbJcglXfcl);
+
+    void updateXfcl(TbJcglXfcl tbJcglXfcl);
+
+    boolean deleteXfcl(List<String> id);
+
+    TbJcglXfcl selectClxq(String id);
+
+    @ApiOperation("查询车辆详情")
+    Page<TbJcglXfcl> selectXfclList(AppSearchQuery dto);
+
+    @ApiOperation("导入车辆详情")
+    String importData(List<TbJcglXfcl> xfclList, boolean updateSupport);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllBqService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllBqService.java
new file mode 100644
index 0000000..bc74600
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllBqService.java
@@ -0,0 +1,14 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllBq;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表服务接口
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+public interface TbJcglXfllBqService extends IService<TbJcglXfllBq> {
+
+    void remove(String xfll_id,String bq_id);
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllFzService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllFzService.java
new file mode 100644
index 0000000..ef2fa4f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllFzService.java
@@ -0,0 +1,8 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllFz;
+
+public interface TbJcglXfllFzService extends IService<TbJcglXfllFz> {
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllService.java
new file mode 100644
index 0000000..5577663
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfllService.java
@@ -0,0 +1,82 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllSearchQuery;
+import com.mosty.base.model.dto.jcgl.TbJcglZyjzSearchDto;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.model.vo.jcgl.TbJcglZyjz;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglXfllVo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表服务接口
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+public interface TbJcglXfllService extends IService<TbJcglXfll> {
+
+    IPage<TbJcglXfllVo> getList(TbJcglXfllQuery tbJcglXfll);
+
+    void add(TbJcglXfllDto tbJcglXfllDto);
+
+    TbJcglXfllVo queryById(String id);
+
+    void edit(TbJcglXfllDto tbJcglXfllDto);
+
+    boolean cheskXfll(String idCard);
+
+    void lzList(List<String> id);
+
+    Object deleteList(List<String> id);
+
+    @ApiOperation("查询有效身份证号码")
+    List<String> querySfzh();
+
+    @ApiOperation("大屏-勤务中心-警力情况")
+    Object selectAllPolice(TbJcglXfllDto tbJcglXfllDto);
+
+    @ApiOperation("查询部门下所有的辅警信息")
+    List<com.mosty.base.model.dto.jcgl.TbJcglXfllVo> getFjList(String deptid);
+
+    @ApiModelProperty("查询部门下的专业警种信息")
+    IPage<TbJcglZyjz> getZyjzList(TbJcglZyjzSearchDto dto);
+
+    @ApiOperation("查询部门下的巡防力量信息")
+    List<TbJcglXfllVo> getXfll(TbJcglXfllQueryAllDto dto);
+
+    @ApiOperation("查询巡防力量 民警、辅警")
+    IPage<TbJcglXfllVo> getXfllList(TbJcglXfllSearchQuery dto);
+
+    @ApiOperation("根据身份证查询巡组力量信息")
+    TbJcglXfllDto getXfllBySfz(String sfzh);
+
+    @ApiOperation("巡防力量查询--第三方接口")
+    IPage<TbJcglXfllVo> getXfllPage(TbJcglXfllQuery tbJcglXfll);
+
+
+    @ApiOperation("获取离职人员列表")
+    IPage<TbJcglXfll> getLzPage(TbJcglXfllQuery tbJcglXfll);
+
+    @ApiOperation("查询部门下面人员数量")
+     Integer getRysl(String ssbmd);
+
+    @ApiOperation("人员统计")
+    Map<String,Object> getRytj(String ssbmd);
+
+    @ApiOperation("获取部门列表")
+    List<TbJcglXfll>  getBmAll();
+
+    @ApiOperation("获取所有数据")
+    List<TbJcglXfll>  export();
+
+    @ApiOperation("导入巡防力量")
+    String importData(List<TbJcglXfll> userList,boolean updateSupport);
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfqyService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfqyService.java
new file mode 100644
index 0000000..a1985a7
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfqyService.java
@@ -0,0 +1,47 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglXfqy;
+import com.mosty.base.model.query.jcgl.TbJcglXfqyQuery;
+import com.mosty.base.model.query.jcgl.XfqyQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-07-14
+ */
+public interface TbJcglXfqyService {
+
+    @ApiOperation("新增巡防区")
+    int addXfqy(TbJcglXfqyDto tbJcglXfqy);
+
+    @ApiOperation("查询巡防区")
+    IPage<TbJcglXfqyDto> getXfqy(TbJcglXfqyQuery xfqyQuery);
+
+    @ApiOperation("编辑巡防区")
+    int editXfqy(TbJcglXfqyDto tbJcglXfqy);
+
+    @ApiOperation("删除巡防区")
+    int deleteXfqy(List<String> id);
+
+    @ApiOperation("根据ID查询")
+    TbJcglXfqyDto selectById(String id);
+
+    @ApiOperation("getXfqList")
+    Page<TbJcglXfqy> getXfqList(AppSearchQuery dto);
+
+    @ApiOperation("泸州态势统计-各区县重点区域巡防")
+    Map<String, Object> getZdxfqy(XfqyQuery dto);
+
+    @ApiOperation("泸州态势统计-警情与重点区域巡逻对比分析")
+    Map<String,Object> getJqandQyxf(XfqyQuery dto);
+
+    @ApiOperation("查询所有巡防区域数据")
+    List<TbJcglXfqyDto> getListAll();
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfwgService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfwgService.java
new file mode 100644
index 0000000..0a48033
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXfwgService.java
@@ -0,0 +1,34 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglXfwgInsertDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfwg;
+import com.mosty.base.model.query.jcgl.TbJcglXfwgQuery;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防网格 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-14
+ */
+public interface TbJcglXfwgService {
+
+    //新增巡防网格
+    int addXfwg(TbJcglXfwgInsertDto tbJcglXfqy);
+
+    //查询巡防网格
+    IPage<TbJcglXfwgInsertDto> getXfwg(TbJcglXfwgQuery xfqyQuery);
+
+    //编辑巡防网格
+    int editXfwg(TbJcglXfwgInsertDto tbJcglXfqy);
+
+    //删除巡防网格
+    int deleteXfwg(List<String> list);
+
+    //根据ID查询
+    TbJcglXfwgInsertDto selectById(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXlfaService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXlfaService.java
new file mode 100644
index 0000000..01f914a
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXlfaService.java
@@ -0,0 +1,30 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglXlfaDto;
+import com.mosty.base.model.query.jcgl.TbJcglXlfaQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ **/
+public interface TbJcglXlfaService {
+
+    @ApiOperation("新增巡逻方案")
+    int addEntity(TbJcglXlfaDto dto);
+
+    @ApiOperation("修改巡逻方案")
+    int updateEntity(TbJcglXlfaDto dto);
+
+    @ApiOperation("删除巡逻方案")
+    int delEntity(List<String> ids);
+
+    @ApiOperation("查询列表分页")
+    IPage<TbJcglXlfaDto> getPageList(TbJcglXlfaQuery dto);
+
+    @ApiOperation("查询巡逻方案详情信息")
+    TbJcglXlfaDto getInfo(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXljlService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXljlService.java
new file mode 100644
index 0000000..4553bd3
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglXljlService.java
@@ -0,0 +1,25 @@
+package com.mosty.base.manager.service;
+
+import com.mosty.base.model.dto.jcgl.TbJcglXljlDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXljl;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbJcglXljlService {
+
+    @ApiOperation("添加训练记录")
+    int addEntity(TbJcglXljlDto dto);
+
+    @ApiOperation("修改训练记录")
+    int editEntity(TbJcglXljlDto dto);
+
+    @ApiOperation("批量删除训练记录")
+    void deleteEntity(List<String> ids);
+
+    @ApiOperation("查询训练记录详情")
+    TbJcglXljl getInfo(String id);
+
+    @ApiOperation("查询训练记录详情")
+    List<TbJcglXljl> getListByXfid(String xfid);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZbjlService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZbjlService.java
new file mode 100644
index 0000000..728fa27
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZbjlService.java
@@ -0,0 +1,11 @@
+package com.mosty.base.manager.service;
+
+import com.mosty.base.model.entity.jcgl.TbJcglZbjl;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbJcglZbjlService {
+
+    @ApiOperation("添加安保风采")
+    int addEntity(TbJcglZbjl dto);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZjkService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZjkService.java
new file mode 100644
index 0000000..a06dda0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbJcglZjkService.java
@@ -0,0 +1,34 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglZjk;
+import com.mosty.base.model.query.jcgl.TbJcglZjkQuery;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 基础管理-专家库 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+public interface TbJcglZjkService {
+
+    //新增专家库
+    int insert(TbJcglZjk tbJcglZjk);
+
+    //查询专家库
+    IPage<TbJcglZjk> queryPage(TbJcglZjkQuery zjkQuery);
+
+    //编辑专家库
+    int update(TbJcglZjk tbJcglZjk);
+
+    //删除专家库
+    int deleteById(List<String> list);
+
+    //根据ID查询
+    TbJcglZjk selectById(String id);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbSbGzjrService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbSbGzjrService.java
new file mode 100644
index 0000000..2ae103b
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TbSbGzjrService.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.service;
+
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbSbGzjrService {
+
+    @ApiOperation("添加感知接入")
+    String addEntity(TbSbGzjr gzjr);
+
+    @ApiOperation("修改感知接入")
+    int editEntity(TbSbGzjr gzjr);
+
+    @ApiOperation("批量删除感知接入")
+    void deleteEntity(List<String> ids);
+
+    @ApiOperation("查询感知接入列表")
+    List<TbSbGzjr> getList(TbSbGzjr gzjr);
+
+    @ApiOperation("查询感知接入详情")
+    TbSbGzjr getInfo(String id);
+
+    @ApiOperation("取消接入")
+    int qxjr(TbSbGzjr dto);
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpJcglZbflService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpJcglZbflService.java
new file mode 100644
index 0000000..11c251d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpJcglZbflService.java
@@ -0,0 +1,20 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.jcgl.TbJcglZbfl;
+
+import java.util.List;
+
+public interface TpJcglZbflService {
+
+    //新增装备类型
+    void addZbfl(TbJcglZbfl zbfl);
+    //查询装备树
+    List<TbJcglZbfl>  zbTree(String scode);
+    //编辑装备类型
+    void editZbfl(TbJcglZbfl zbfl);
+
+    IPage<TbJcglZbfl> selectList(TbJcglZbfl zbfl, IPage<TbJcglZbfl> page);
+
+    void deleteZbfl(List<String> id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpjcglZnzbService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpjcglZnzbService.java
new file mode 100644
index 0000000..d423c64
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/TpjcglZnzbService.java
@@ -0,0 +1,65 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.jcgl.TbJcglZnzbSearchDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.query.jcgl.TbJcglZyzbQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglZnzbVo;
+import com.mosty.base.model.entity.jcgl.TbJcglZnzb;
+import com.mosty.base.model.query.jcgl.TbJcglZnzbQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TpjcglZnzbService {
+
+    @ApiOperation("新增只能设备")
+    int addZnzb(TbJcglZnzb tbJcglZnzb);
+
+    @ApiOperation("查询智能设备")
+    IPage<TbJcglZnzbVo> getZnzb(TbJcglZnzb tbJcglZnzb, IPage<TbJcglZnzb> page);
+
+    @ApiOperation("编辑智能设备")
+    void editZnzb(TbJcglZnzb tbJcglZnzb);
+
+    @ApiOperation("删除智能设备")
+    void deleteZnzb(List<String> id);
+
+    @ApiOperation("根据id查询智能装备")
+    TbJcglZnzbVo selectZbxq(String id);
+
+    @ApiOperation("查询智能设备")
+    IPage<TbJcglZnzb> znzbDqtx(TbJcglZnzbQuery tbJcglZnzb, IPage<TbJcglZnzb> page);
+
+    @ApiOperation("检查装备到期和是否故障")
+    Object checkZnzb();
+
+    @ApiOperation("查询附近的智能装备")
+    IPage<TbJcglZnzbVo> getFjzbList(TbJcglZnzbSearchDto dto);
+
+    @ApiOperation("app获取智能装备信息")
+    IPage<TbJcglZnzbVo> getZnzbList(AppSearchQuery dto);
+
+    @ApiOperation("下发智能")
+    void xfZnzb(TbJcglZnzb zb);
+
+    @ApiOperation("回退智能")
+    void htZnzb(String id);
+
+    @ApiOperation("报损")
+    void bsZnzb(String id);
+
+    @ApiOperation("查询智能设备")
+    List<TbJcglZnzb> getZyzb(TbJcglZyzbQuery tbJcglZyzbQuery);
+
+    @ApiOperation("资源装备统计")
+    Map<String, Object> zyZbtj(String ssbmdm);
+
+    @ApiOperation("设备类型统计")
+    List<Map<String, Object>> sblxTj(String type, String ssbmdm);
+
+    @ApiOperation("导入智能装备")
+    String importData(List<TbJcglZnzb> userList, boolean updateSupport);
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSydwJbxxGxService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSydwJbxxGxService.java
new file mode 100644
index 0000000..8e8496f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSydwJbxxGxService.java
@@ -0,0 +1,31 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSydwCyryPageQuery;
+import com.mosty.base.model.query.afjcsj.VwSydwJbxxGxQuery;
+import com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+public interface VwSydwJbxxGxService{
+
+    @ApiOperation("查询实有单位列表")
+    IPage<VwSydwJbxxGx> selectList(VwSydwJbxxGxQuery dto);
+
+    @ApiOperation("统计实有单位")
+    List<Map<String,Object>> getStatistics();
+
+    @ApiOperation("查询实有单位详情")
+    VwSydwJbxxGx getSydwInfo(String id);
+
+    @ApiOperation("查询实有单位从业人员列表")
+    IPage<VwSydwCyryGx> getSydwCyryPage(VwSydwCyryPageQuery dto);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSyrkJzgjGxService.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSyrkJzgjGxService.java
new file mode 100644
index 0000000..547940f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/VwSyrkJzgjGxService.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface VwSyrkJzgjGxService {
+
+    @ApiOperation("查询实有人员列表")
+    IPage<VwSyrkJzgjGx> selectPageList(VwSyrkJzgjGxQuery dto);
+
+    @ApiOperation("查询实有人口居住轨迹")
+    IPage<VwSyrkJzgjGx> selectGjList(VwSyrkJzgjGxListQuery dto);
+
+    @ApiOperation("统计实有人口")
+    List<Map<String,Object>> getStatistics();
+
+    @ApiOperation("查询实有人口从业轨迹")
+    List<VwSydwCyryGx> getSyrkCygj(String zjhm);
+
+    @ApiOperation("查询实有人口从业轨迹")
+    VwSydwCyryGx getSyrkInfo(String id);
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglAbfcServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglAbfcServiceImpl.java
new file mode 100644
index 0000000..51fa490
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglAbfcServiceImpl.java
@@ -0,0 +1,59 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglAbfcMapper;
+import com.mosty.base.manager.service.TbJcglAbfcService;
+import com.mosty.base.model.dto.jcgl.TbJcglAbfcDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.query.jcgl.TbJcglAbfcQuery;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class TbJcglAbfcServiceImpl extends ServiceImpl<TbJcglAbfcMapper, TbJcglAbfc>
+        implements TbJcglAbfcService {
+
+    @Override
+    public int addEntity(TbJcglAbfcDto dto) {
+        TbJcglAbfc item = new TbJcglAbfc();
+        UserInfo user = UserInfoManager.get();
+        BeanUtils.copyProperties(dto, item);
+        item.setCjrid(String.valueOf(user.getUserId()));
+        item.setCjrxm(user.getUserName());
+        item.setCjrsfzh(user.getIdEntityCard());
+        item.setXtSjly("1");
+        item.setTjsj(new Date());
+        return this.baseMapper.insert(item);
+    }
+
+    @Override
+    public int editEntity(TbJcglAbfcDto dto) {
+        TbJcglAbfc item = new TbJcglAbfc();
+        BeanUtils.copyProperties(dto, item);
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public void deleteEntity(List<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public List<TbJcglAbfc> getPageList(TbJcglAbfcQuery dto) {
+        return this.baseMapper.getList(dto);
+    }
+
+    @Override
+    public TbJcglAbfc getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBqServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBqServiceImpl.java
new file mode 100644
index 0000000..9707dab
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBqServiceImpl.java
@@ -0,0 +1,161 @@
+package com.mosty.base.manager.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglBqDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBq;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.utils.BeanConvertUtils;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.PingYinUtil;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+import com.mosty.base.manager.mapper.TbJcglBqMapper;
+import com.mosty.base.manager.service.TbJcglBqService;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 巡防警力标签表（技能/经验）;(tb_jcgl_bq)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2022-6-6
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglBqServiceImpl extends ServiceImpl<TbJcglBqMapper, TbJcglBq> implements TbJcglBqService {
+
+    private final TbJcglBqMapper tbJcglBqMapper;
+    
+    /** 
+     * 通过ID查询单条数据 
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    public TbJcglBqVo queryById(String id){
+        return BeanConvertUtils.copyProperties(tbJcglBqMapper.selectById(id), TbJcglBqVo.class);
+    }
+    
+    /**
+     * 分页查询
+     *
+     * @param tbJcglBq 筛选条件
+     * @return
+     */
+    public IPage<TbJcglBqVo> paginQuery(TbJcglBqQuery tbJcglBq){
+        IPage<TbJcglBq> page = PageUtils.buildPage(tbJcglBq.getPageSize(),tbJcglBq.getPageCurrent());
+        return tbJcglBqMapper.paginQuery(page, tbJcglBq);
+//        return tbJcglBqIPage.convert(TbJcglBq -> BeanConvertUtils.copyProperties(TbJcglBq, TbJcglBqVo.class));
+    }
+
+    private LambdaQueryWrapper<TbJcglBq> queryWrapper(TbJcglBqQuery tbJcglBq){
+        LambdaQueryWrapper<TbJcglBq> queryWrapper = new LambdaQueryWrapper<>();
+        if(StrUtil.isNotBlank(tbJcglBq.getBqlx())){
+            queryWrapper.eq(TbJcglBq::getBqlx, tbJcglBq.getBqlx());
+        }
+        if(StrUtil.isNotBlank(tbJcglBq.getBqmc())){
+            queryWrapper.like(TbJcglBq::getBqmc, tbJcglBq.getBqmc());
+        }
+        if(StrUtil.isNotBlank(tbJcglBq.getBqpym())){
+            queryWrapper.eq(TbJcglBq::getBqpym, tbJcglBq.getBqpym());
+        }
+        return queryWrapper;
+    }
+    
+    /**
+     * 新增数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    public int insert(TbJcglBqDto tbJcglBq){
+        try{
+            if(checkMc(tbJcglBq.getBqmc())){
+                throw new BusinessException("标签名称已存在");
+            }
+//            String bqbh = "JN0001";
+            TbJcglBq insert = BeanConvertUtils.copyProperties(tbJcglBq, TbJcglBq.class);
+            insert.setXtSjly("1");
+            insert.setBqbh(tbJcglBq.getBqbh());
+            insert.setBqpym(PingYinUtil.getFirstSpell(insert.getBqmc()).toUpperCase(Locale.ROOT));
+            return tbJcglBqMapper.insert(insert);
+        }catch (Exception e){
+            throw new BusinessException(e.getMessage());
+        }
+    }
+
+    @Override
+    public boolean checkMc(String mc){
+        LambdaQueryWrapper<TbJcglBq> queryWrapper = new LambdaQueryWrapper<>();
+        Integer integer = tbJcglBqMapper.selectCount(queryWrapper.eq(TbJcglBq::getBqmc, mc));
+        if(integer > 0 ){
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Object countBqsl(TbJcglBqVo tbJcglBqVo) {
+        List<TbJcglBqVo> tbJcglBq =null;
+        try {
+             tbJcglBq = tbJcglBqMapper.countBqsl(tbJcglBqVo);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return tbJcglBq;
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param tbJcglBq 实例对象
+     * @return 实例对象
+     */
+    public int update(TbJcglBqDto tbJcglBq){
+        TbJcglBq update = BeanConvertUtils.copyProperties(tbJcglBq, TbJcglBq.class);
+        update.setBqpym(PingYinUtil.getFirstSpell(update.getBqmc()).toUpperCase(Locale.ROOT));
+        return tbJcglBqMapper.updateById(update);
+    }
+    
+    /** 
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    public boolean deleteById(String id){
+        int total = tbJcglBqMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public boolean deleteByIds(List<String> id) {
+        return tbJcglBqMapper.deleteBatch(id) > 0 ;
+    }
+
+    @Override
+    public boolean zcbqByIds(List<String> id) {
+        return tbJcglBqMapper.zxBatch(id) > 0;
+    }
+
+    //自动生成编号暂时保留
+    //            int bqsl = tbJcglBqMapper.countBqslByBqlx(tbJcglBq.getBqlx());
+//            if(bqsl > 0) {
+//                bqsl = bqsl + 1;
+//                if(bqsl < 10) {
+//                    bqbh ="JN000" + bqsl;
+//                } else if(bqsl >= 10 && bqsl < 100) {
+//                    bqbh ="JN00" + bqsl;
+//                } else if(bqsl >= 100 && bqsl < 1000) {
+//                    bqbh ="JN0" + bqsl;
+//                } else {
+//                    bqbh ="JN" + bqsl;
+//                }
+//            }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxdServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxdServiceImpl.java
new file mode 100644
index 0000000..11f605a
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxdServiceImpl.java
@@ -0,0 +1,194 @@
+package com.mosty.base.manager.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBxd;
+import com.mosty.base.model.query.jcgl.TbJcglBxdQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.*;
+import com.mosty.base.manager.mapper.TbJcglBxdMapper;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglBxdService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@Service
+public class TbJcglBxdServiceImpl extends ServiceImpl<TbJcglBxdMapper, TbJcglBxd>
+        implements TbJcglBxdService {
+
+    private final TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    @Transactional
+    public int addBxd(TbJcglBxd bxd) {
+        bxd.setId(UUIDGenerator.getUUID());
+        if (bxd.getJd() != null && bxd.getWd() != null) {
+            bxd.setZb(JtsUtils.getPoint(bxd.getJd(), bxd.getWd()));
+            bxd.setZbhash(GeoHashKit.encode(bxd.getJd(), bxd.getWd()));
+        }
+        if (StringUtils.isNotBlank(bxd.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(bxd.getSsbmdm());
+            bxd.setSsbm(dept.getDeptname());
+            bxd.setSsbmid(dept.getDeptid());
+            bxd.setSsbmdm(dept.getDeptcode());
+            bxd.setSsxgajdm(dept.getFxjcode());
+            bxd.setSsxgajid(dept.getFxjid());
+            bxd.setSsxgaj(dept.getFxjname());
+            bxd.setSssgaj(dept.getDszname());
+            bxd.setSssgajdm(dept.getDszcode());
+            bxd.setSssgajid(dept.getDszid());
+        }
+        bxd.setXtSjly("1");
+        int ret = this.baseMapper.insertExtity(bxd);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(bxd.getId());
+        ysGajgDto.setLybm("tb_jcgl_bxd");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001011");
+        ysGajgDto.setGajgmc(bxd.getBxdMc());
+        ysGajgDto.setGajgjc(bxd.getBxdMc());
+        ysGajgDto.setWzXzqh(bxd.getXzqhdm());
+        ysGajgDto.setWzXz(bxd.getXxdz());
+        ysGajgDto.setWzBc(bxd.getXxdz());
+        ysGajgDto.setJd(bxd.getJd());
+        ysGajgDto.setWd(bxd.getWd());
+        ysGajgDto.setSsbm(bxd.getSsbm());
+        ysGajgDto.setSsbmid(bxd.getSsbmid());
+        ysGajgDto.setSsbmdm(bxd.getSsbmdm());
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    public IPage<TbJcglBxd> queryBxd(TbJcglBxdQuery dto) {
+        IPage<TbJcglBxd> page = PageUtils.buildPage(dto.getPageSize(), dto.getPageCurrent());
+        QueryWrapper<TbJcglBxd> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        qw.lambda().eq(StringUtils.isNotBlank(dto.getSsXfqyId()), TbJcglBxd::getSsXfqyId, dto.getSsXfqyId())
+                .like(StringUtils.isNotBlank(dto.getBxdMc()), TbJcglBxd::getBxdMc, dto.getBxdMc())
+                .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbJcglBxd::getSsbmdm, dto.getSsbmdm())
+                .eq(StringUtils.isNotBlank(dto.getBxdLx()), TbJcglBxd::getBxdLx, dto.getBxdLx())
+                .eq(StringUtils.isNotBlank(dto.getXtSjzt()), TbJcglBxd::getXtSjzt, dto.getXtSjzt())
+                .like(StringUtils.isNotBlank(dto.getXxdz()), TbJcglBxd::getXxdz, dto.getXxdz())
+                .like(StringUtils.isNotBlank(dto.getXzqhdm()), TbJcglBxd::getXzqhdm, dto.getXzqhdm())
+                .eq(StringUtils.isNotBlank(dto.getBxdlydm()), TbJcglBxd::getBxdlydm, dto.getBxdlydm())
+                .eq(StringUtils.isNotBlank(dto.getSsbmid()), TbJcglBxd::getSsbmid, dto.getSsbmid());
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    @Transactional
+    public int editBxd(TbJcglBxd bxd) {
+        if (bxd.getJd() != null && bxd.getWd() != null) {
+            bxd.setZb(JtsUtils.getPoint(bxd.getJd(), bxd.getWd()));
+            bxd.setZbhash(GeoHashKit.encode(bxd.getJd(), bxd.getWd()));
+        }
+        if (StringUtils.isNotBlank(bxd.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(bxd.getSsbmdm());
+            bxd.setSsbm(dept.getDeptname());
+            bxd.setSsbmid(dept.getDeptid());
+            bxd.setSsbmdm(dept.getDeptcode());
+            bxd.setSsxgajdm(dept.getFxjcode());
+            bxd.setSsxgajid(dept.getFxjid());
+            bxd.setSsxgaj(dept.getFxjname());
+            bxd.setSssgaj(dept.getDszname());
+            bxd.setSssgajdm(dept.getDszcode());
+            bxd.setSssgajid(dept.getDszid());
+        }
+        int ret = this.baseMapper.updateEntity(bxd);
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(bxd.getId());
+        ysGajgDto.setLybm("tb_jcgl_bxd");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001011");
+        ysGajgDto.setGajgmc(bxd.getBxdMc());
+        ysGajgDto.setGajgjc(bxd.getBxdMc());
+        ysGajgDto.setWzXzqh(bxd.getXzqhdm());
+        ysGajgDto.setWzXz(bxd.getXxdz());
+        ysGajgDto.setWzBc(bxd.getXxdz());
+        ysGajgDto.setJd(bxd.getJd());
+        ysGajgDto.setWd(bxd.getWd());
+        ysGajgDto.setSsbm(bxd.getSsbm());
+        ysGajgDto.setSsbmid(bxd.getSsbmid());
+        ysGajgDto.setSsbmdm(bxd.getSsbmdm());
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    @Transactional
+    public int deleteBxd(List<String> list) {
+        int ret = this.baseMapper.deleteBatch(list);
+        for (String s : list) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_bxd");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+        return ret;
+    }
+
+    @Override
+    public TbJcglBxd selectById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public void createdBxd(List<Map<String, Object>> list) {
+        // 先需要注释之前生成的所有的必巡点的信息
+        this.baseMapper.updateYesterdayBxd();
+        for (int i = 0; i < list.size(); i++) {
+            Map<String, Object> item = list.get(i);
+            TbJcglBxd bxd = new TbJcglBxd();
+            bxd.setId(UUIDGenerator.getUUID());
+            bxd.setXtSjly("1");
+            String address = this.tbBaseAdaptRemoteService.getLocation(item.get("jd").toString(), item.get("wd").toString());
+            bxd.setBxdMc(DateUtils.getQueryDateString(new Date(), "01") + "重点必巡点" + (i + 1));
+            bxd.setBxdLx("2");
+            bxd.setYxq(new Date());
+            bxd.setJd(new BigDecimal(item.get("jd").toString()));
+            bxd.setWd(new BigDecimal(item.get("wd").toString()));
+            bxd.setZb(JtsUtils.getPoint(bxd.getJd(), bxd.getWd()));
+            bxd.setZbhash(GeoHashKit.encode(bxd.getJd(), bxd.getWd()));
+            bxd.setXxdz(address);
+            bxd.setBxdlydm("03");
+            String ssbmdm = item.get("ssbmdm") == null ? "" : String.valueOf(item.get("ssbmdm"));
+            bxd.setXzqhdm(ssbmdm.substring(0, 6));
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(ssbmdm);
+            bxd.setSsbm(dept.getDeptname());
+            bxd.setSsbmid(dept.getDeptid());
+            bxd.setSsbmdm(dept.getDeptcode());
+            bxd.setSsxgajdm(dept.getFxjcode());
+            bxd.setSsxgajid(dept.getFxjid());
+            bxd.setSsxgaj(dept.getFxjname());
+            bxd.setSssgaj(dept.getDszname());
+            bxd.setSssgajdm(dept.getDszcode());
+            bxd.setSssgajid(dept.getDszid());
+            bxd.setBz(String.valueOf(item.get("bz")));
+            this.addBxd(bxd);
+        }
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxxServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxxServiceImpl.java
new file mode 100644
index 0000000..37476e8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglBxxServiceImpl.java
@@ -0,0 +1,168 @@
+package com.mosty.base.manager.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.dto.jcgl.TbJcglBxxDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBxx;
+import com.mosty.base.model.query.jcgl.TbJcglBxxQuery;
+import com.mosty.base.manager.mapper.TbJcglBxxMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglBxxService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-07-16
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglBxxServiceImpl extends ServiceImpl<TbJcglBxxMapper, TbJcglBxx>
+        implements TbJcglBxxService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+
+    @Override
+    @Transactional
+    public int addBxx(TbJcglBxxDto bxx) {
+        TbJcglBxx item = new TbJcglBxx();
+        BeanUtils.copyProperties(bxx, item);
+        if (!CollectionUtils.isEmpty(bxx.getZb())) {
+            item.setZb(JtsUtils.createLine(bxx.getZb()));
+        }
+        if (StringUtils.isNotBlank(item.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        item.setXtSjly("1");
+        int ret = this.baseMapper.insertEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(new BigDecimal(item.getId()).toPlainString());
+        ysGajgDto.setLybm("tb_jcgl_bxx");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001012");
+        ysGajgDto.setGajgmc(item.getBxxMc());
+        ysGajgDto.setGajgjc(item.getBxxMc());
+        ysGajgDto.setWzXzqh(item.getXzqhdm());
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmid(item.getSsbmid());
+        ysGajgDto.setSsbmdm(item.getSsbmdm());
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    public IPage<TbJcglBxxDto> queryBxx(TbJcglBxxQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        UserInfo userInfo = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", userInfo);
+        IPage<TbJcglBxxDto> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", useSql);
+        int count = this.baseMapper.getCount(map);
+        List<TbJcglBxx> list = this.baseMapper.getPageList(map);
+        List<TbJcglBxxDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbJcglBxxDto vo = new TbJcglBxxDto();
+            BeanUtils.copyProperties(item, vo);
+            if (item.getZb() != null) vo.setZb(JtsUtils.decodeLine(item.getZb()));
+            rList.add(vo);
+        });
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public int editBxx(TbJcglBxxDto bxx) {
+        TbJcglBxx item = new TbJcglBxx();
+        BeanUtils.copyProperties(bxx, item);
+        if (!CollectionUtils.isEmpty(bxx.getZb())) {
+            item.setZb(JtsUtils.createLine(bxx.getZb()));
+        }
+        if (StringUtils.isNotBlank(item.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        int ret = this.baseMapper.updateEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(new BigDecimal(item.getId()).toPlainString());
+        ysGajgDto.setLybm("tb_jcgl_bxx");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001012");
+        ysGajgDto.setGajgmc(item.getBxxMc());
+        ysGajgDto.setGajgjc(item.getBxxMc());
+        ysGajgDto.setWzXzqh(item.getXzqhdm());
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmid(item.getSsbmid());
+        ysGajgDto.setSsbmdm(item.getSsbmdm());
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    @Transactional
+    public int deleteBxx(List<String> list) {
+        int ret = this.baseMapper.deleteBatch(list);
+        for (String s : list) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_bxx");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+        return ret;
+    }
+
+    @Override
+    public TbJcglBxxDto selectById(String id) {
+        TbJcglBxx bxx = this.baseMapper.getById(id);
+        TbJcglBxxDto dto = new TbJcglBxxDto();
+        BeanUtils.copyProperties(bxx, dto);
+        if (bxx.getZb() != null) dto.setZb(JtsUtils.decodeLine(bxx.getZb()));
+        return dto;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglDsfServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglDsfServiceImpl.java
new file mode 100644
index 0000000..acd25b6
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglDsfServiceImpl.java
@@ -0,0 +1,110 @@
+package com.mosty.base.manager.service.impl;
+
+import com.alibaba.nacos.common.utils.UuidUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglDsfMapper;
+import com.mosty.base.manager.service.TbJcglDsfService;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfDto;
+import com.mosty.base.model.dto.jcgl.TbJcglDsfJudgeDto;
+import com.mosty.base.model.entity.jcgl.TbJcglAbfc;
+import com.mosty.base.model.entity.jcgl.TbJcglDsf;
+import com.mosty.base.model.query.jcgl.TbJcglDsfQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.jcajce.provider.symmetric.Noekeon;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class TbJcglDsfServiceImpl extends ServiceImpl<TbJcglDsfMapper, TbJcglDsf>
+        implements TbJcglDsfService {
+
+    @Override
+    public int addEntity(TbJcglDsfDto dto) {
+        TbJcglDsf item = new TbJcglDsf();
+        BeanUtils.copyProperties(dto, item);
+        item.setCode(UuidUtils.generateUuid());
+        item.setZt("01");
+        item.setXtSjly("1");
+        return this.baseMapper.insert(item);
+    }
+
+    @Override
+    public int editEntity(TbJcglDsfDto dto) {
+        TbJcglDsf item = new TbJcglDsf();
+        BeanUtils.copyProperties(dto, item);
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public void deleteEntity(List<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public IPage<TbJcglDsf> getPageList(TbJcglDsfQuery dto) {
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbJcglDsf>()
+                        .like(StringUtils.isNotBlank(dto.getXtmc()), TbJcglDsf::getXtmc, dto.getXtmc())
+                        .like(StringUtils.isNotBlank(dto.getZrrxm()), TbJcglDsf::getZrrxm, dto.getZrrxm())
+                        .eq(StringUtils.isNotBlank(dto.getZt()), TbJcglDsf::getZt, dto.getZt())
+                        .eq(StringUtils.isNotBlank(dto.getFwlx()), TbJcglDsf::getFwlx, dto.getFwlx())
+        );
+    }
+
+    @Override
+    public TbJcglDsf getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int judge(TbJcglDsfJudgeDto dto) {
+        TbJcglDsf dsf = this.baseMapper.selectById(dto.getId());
+        if (dsf == null) {
+            throw new BusinessException("第三方数据不存在");
+        }
+        dsf.setZt(dto.getZt());
+        return this.baseMapper.updateById(dsf);
+    }
+
+    @Override
+    public void checkDsf() {
+        List<TbJcglDsf> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJcglDsf>()
+                        .eq(TbJcglDsf::getXtSjzt, "1")
+                        .eq(TbJcglDsf::getZt, "2")
+        );
+        list.forEach(item -> {
+            Date time = item.getGqsj();
+            Date now = new Date();
+            if (now.getTime() >= time.getTime()) {
+                item.setZt("05");
+                this.baseMapper.updateById(item);
+            }
+        });
+    }
+
+    @Override
+    public TbJcglDsfVo getDsfInfo(String code) {
+        TbJcglDsf tbJcglDsf = this.baseMapper.selectOne(new LambdaQueryWrapper<TbJcglDsf>()
+                .eq(StringUtils.isNotBlank(code),TbJcglDsf::getCode,code)
+                .eq(TbJcglDsf::getZt,"02"));
+        TbJcglDsfVo vo = new TbJcglDsfVo();
+        if (null==tbJcglDsf){
+            return null;
+        }
+        BeanUtils.copyProperties(tbJcglDsf, vo);
+        return vo;
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJwzServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJwzServiceImpl.java
new file mode 100644
index 0000000..c9acaca
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJwzServiceImpl.java
@@ -0,0 +1,154 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.manager.mapper.TbJcglJwzMapper;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglJwzService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglJwzServiceImpl extends ServiceImpl<TbJcglJwzMapper, TbJcglJwz>
+        implements TbJcglJwzService {
+
+    private final TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbJcglJwz> selectJwzList(TbJcglJwz jwz, IPage<TbJcglJwz> page) {
+        QueryWrapper<TbJcglJwz> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        jwz.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(jwz.getSsbmdm(), null));
+        qw.lambda().likeRight(StringUtils.isNotBlank(jwz.getSsbmdm()), TbJcglJwz::getSsbmdm, jwz.getSsbmdm())
+                .eq(StringUtils.isNotBlank(jwz.getJwzLx()), TbJcglJwz::getJwzLx, jwz.getJwzLx())
+                .like(StringUtils.isNotBlank(jwz.getJwzMc()), TbJcglJwz::getJwzMc, jwz.getJwzMc())
+                .like(StringUtils.isNotBlank(jwz.getFzrXm()), TbJcglJwz::getFzrXm, jwz.getFzrXm())
+                .eq(TbJcglJwz::getXtScbz, 0);
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    @Transactional
+    public void addJwz(TbJcglJwz jwz) {
+        jwz.setJwzId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(jwz.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jwz.getSsbmdm());
+            jwz.setSsbm(dept.getDeptname());
+            jwz.setSsbmid(dept.getDeptid());
+            jwz.setSsbmdm(dept.getDeptcode());
+            jwz.setSsxgajdm(dept.getFxjcode());
+            jwz.setSsxgajid(dept.getFxjid());
+            jwz.setSsxgaj(dept.getFxjname());
+            jwz.setSssgaj(dept.getDszname());
+            jwz.setSssgajdm(dept.getDszcode());
+            jwz.setSssgajid(dept.getDszid());
+        }
+        if (jwz.getJd() != null && jwz.getWd() != null) {
+            jwz.setZb(JtsUtils.getPoint(jwz.getJd(), jwz.getWd()));
+            jwz.setZbhash(GeoHashKit.encode(jwz.getJd(), jwz.getWd()));
+        }
+        jwz.setXtSjly("1");
+        this.baseMapper.insertEntity(jwz);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(jwz.getJwzId());
+        ysGajgDto.setLybm("tb_jcgl_jwz");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001007");
+        ysGajgDto.setGajgmc(jwz.getJwzMc());
+        ysGajgDto.setGajgjc(jwz.getJwzMc());
+        ysGajgDto.setWzXzqh(jwz.getXzqhdm());
+        ysGajgDto.setWzXz(jwz.getJwzDz());
+        ysGajgDto.setWzBc(jwz.getJwzDz());
+        ysGajgDto.setJd(jwz.getJd());
+        ysGajgDto.setWd(jwz.getWd());
+        ysGajgDto.setSsbm(jwz.getSsbm());
+        ysGajgDto.setSsbmid(jwz.getSsbmid());
+        ysGajgDto.setSsbmdm(jwz.getSsbmdm());
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+    }
+
+    @Override
+    @Transactional
+    public void updateJwz(TbJcglJwz jwz) {
+        if (jwz.getJd() != null && jwz.getWd() != null) {
+            jwz.setZb(JtsUtils.getPoint(jwz.getJd(), jwz.getWd()));
+            jwz.setZbhash(GeoHashKit.encode(jwz.getJd(), jwz.getWd()));
+        }
+        if (StringUtils.isNotBlank(jwz.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jwz.getSsbmdm());
+            jwz.setSsbm(dept.getDeptname());
+            jwz.setSsbmid(dept.getDeptid());
+            jwz.setSsbmdm(dept.getDeptcode());
+            jwz.setSsxgajdm(dept.getFxjcode());
+            jwz.setSsxgajid(dept.getFxjid());
+            jwz.setSsxgaj(dept.getFxjname());
+            jwz.setSssgaj(dept.getDszname());
+            jwz.setSssgajdm(dept.getDszcode());
+            jwz.setSssgajid(dept.getDszid());
+        }
+        this.baseMapper.updateEntity(jwz);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(jwz.getJwzId());
+        ysGajgDto.setLybm("tb_jcgl_jwz");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001007");
+        ysGajgDto.setGajgmc(jwz.getJwzMc());
+        ysGajgDto.setGajgjc(jwz.getJwzMc());
+        ysGajgDto.setWzXzqh(jwz.getXzqhdm());
+        ysGajgDto.setWzXz(jwz.getJwzDz());
+        ysGajgDto.setWzBc(jwz.getJwzDz());
+        ysGajgDto.setJd(jwz.getJd());
+        ysGajgDto.setWd(jwz.getWd());
+        ysGajgDto.setSsbm(jwz.getSsbm());
+        ysGajgDto.setSsbmid(jwz.getSsbmid());
+        ysGajgDto.setSsbmdm(jwz.getSsbmdm());
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteJwz(List<String> id) {
+        if (id.size() > 0) {
+            this.baseMapper.deleteJwz(id);
+        }
+        for (String s : id) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_jwz");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+        return true;
+    }
+
+    @Override
+    public Object selectByid(String id) {
+        return this.baseMapper.selectOne(
+                new QueryWrapper<TbJcglJwz>()
+                        .eq("jwz_id", id)
+                        .eq("xt_scbz", 0)
+        );
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJyqxServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJyqxServiceImpl.java
new file mode 100644
index 0000000..5f22aaf
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJyqxServiceImpl.java
@@ -0,0 +1,383 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglJyqxMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglJyqxService;
+import com.mosty.base.manager.service.TbJcglZbjlService;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import com.mosty.base.model.entity.jcgl.TbJcglJz;
+import com.mosty.base.model.entity.jcgl.TbJcglZbjl;
+import com.mosty.base.model.entity.jcgl.TbJcglZnzb;
+import com.mosty.base.model.query.jcgl.TbJcglJyqxQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglJyqxServiceImpl extends ServiceImpl<TbJcglJyqxMapper, TbJcglJyqx>
+        implements TbJcglJyqxService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbJcglZbjlService tbJcglZbjlService;
+
+    @Override
+    public void xfZnzb(TbJcglJyqx jyqx) {
+        if (StringUtils.isNotBlank(jyqx.getId()) && StringUtils.isNotBlank(jyqx.getSsbmdm())) {
+            TbJcglJyqx tbJcglJyqx = this.baseMapper.selectById(jyqx.getId());
+            //下发修改数量
+//            tbJcglJyqx.setSl(tbJcglJyqx.getSl() - jyqx.getSl() < 0 ? 0 : tbJcglJyqx.getSl() - jyqx.getSl());
+            tbJcglJyqx.setXfs(tbJcglJyqx.getXfs() + jyqx.getSl());
+            this.baseMapper.updateById(tbJcglJyqx);
+            //保存下发数据
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jyqx.getSsbmdm());
+            if (ObjectUtils.isNotEmpty(dept)) {
+                tbJcglJyqx.setSsbm(dept.getDeptname());
+                tbJcglJyqx.setSsbmid(dept.getDeptid());
+                tbJcglJyqx.setSsbmdm(dept.getDeptcode());
+                tbJcglJyqx.setSsxgajdm(dept.getFxjcode());
+                tbJcglJyqx.setSsxgajid(dept.getFxjid());
+                tbJcglJyqx.setSsxgaj(dept.getFxjname());
+                tbJcglJyqx.setSssgaj(dept.getDszname());
+                tbJcglJyqx.setSssgajdm(dept.getDszcode());
+                tbJcglJyqx.setSssgajid(dept.getDszid());
+            }
+            tbJcglJyqx.setXtSjly("1");
+            tbJcglJyqx.setId(UUIDGenerator.getUUID());
+            tbJcglJyqx.setXfid(jyqx.getId());
+            tbJcglJyqx.setSfbs("0");
+            tbJcglJyqx.setSl(jyqx.getSl());
+            tbJcglJyqx.setXfs(0);
+            tbJcglJyqx.setBss(0);
+            tbJcglJyqx.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+            //存入装备日志
+            addZbjl(tbJcglJyqx, "2");
+            this.baseMapper.insert(tbJcglJyqx);
+        }
+    }
+
+    @Override
+    public void htZnzb(String id, long sl) {
+        if (StringUtils.isNotBlank(id)) {
+            TbJcglJyqx tbJcglJyqx = this.baseMapper.selectById(id);
+            //查询下发一起那个数据
+            TbJcglJyqx tbJcglJyqx1 = this.baseMapper.selectById(tbJcglJyqx.getXfid());
+            if (ObjectUtils.isNotEmpty(tbJcglJyqx1)) {
+//                tbJcglJyqx1.setSl(tbJcglJyqx1.getSl() + tbJcglJyqx.getSl());
+                tbJcglJyqx1.setXfs((tbJcglJyqx1.getXfs() - sl) < 0 ? 0 : tbJcglJyqx1.getXfs() - sl);
+                this.baseMapper.updateById(tbJcglJyqx1);
+            }
+            //比较当前数量  等于库存删除
+            if (sl >= tbJcglJyqx.getSl()) {
+                this.baseMapper.deleteById(id);
+            } else {
+                tbJcglJyqx.setSl(tbJcglJyqx.getSl() - sl);
+                //修改以前的数量
+                this.baseMapper.updateById(tbJcglJyqx);
+            }
+            //存入装备日志
+            addZbjl(tbJcglJyqx, "3");
+        }
+    }
+
+    @Override
+    public void bsZnzb(String id, long sl) {
+        if (StringUtils.isNotBlank(id)) {
+            TbJcglJyqx tbJcglJyqx = this.baseMapper.selectById(id);
+            //比较当前数量  等于库存删除
+            if (sl >= tbJcglJyqx.getSl()) {
+                tbJcglJyqx.setSfbs("1");
+                tbJcglJyqx.setBss(tbJcglJyqx.getSl());
+//                tbJcglJyqx.setSl(0);
+            } else {
+//                tbJcglJyqx.setSl(tbJcglJyqx.getSl() - sl);
+                tbJcglJyqx.setBss(tbJcglJyqx.getBss() + sl);
+//                tbJcglJyqx.setXtSjly("1");
+//                tbJcglJyqx.setId(UUIDGenerator.getUUID());
+//                tbJcglJyqx.setXfid(id);
+//                tbJcglJyqx.setSfbs("1");
+//                tbJcglJyqx.setSl(sl);
+//                tbJcglJyqx.setXtCjsj((new Timestamp(System.currentTimeMillis())));
+//                this.baseMapper.insert(tbJcglJyqx);
+            }
+            this.baseMapper.updateById(tbJcglJyqx);
+            //存入装备日志
+            addZbjl(tbJcglJyqx, "1");
+        }
+    }
+
+
+    public void addZbjl(TbJcglJyqx jyqx, String sjly) {
+        TbJcglZbjl dto = new TbJcglZbjl();
+        dto.setSjbm("tb_jcgl_jyqx");
+        dto.setGlid(jyqx.getId());
+        dto.setSjly(sjly);
+        dto.setZblx("2");
+        UserInfo user = UserInfoManager.get();
+        dto.setCzr(user.getUserName());
+        dto.setCzrSfz(user.getIdEntityCard());
+        dto.setCzrSsbmid(String.valueOf(user.getDeptId()));
+        dto.setCzrSsbm(user.getDeptName());
+        dto.setCzrSsbmdm(user.getDeptCode());
+        dto.setXfSsbmid(jyqx.getSsbmid());
+        dto.setXfSsbm(jyqx.getSsbm());
+        dto.setXfSsbmdm(jyqx.getSsbmdm());
+        dto.setExt(String.valueOf(jyqx.getSl()));
+        tbJcglZbjlService.addEntity(dto);
+    }
+
+
+    @Override
+    public void addJyqx(TbJcglJyqx jyqx) {
+        if (StringUtils.isNotBlank(jyqx.getScode())) {
+            //查询设备类型信息
+            List<TbJcglJyqx> jyqxList = this.baseMapper.selectList(
+                    new QueryWrapper<TbJcglJyqx>()
+                            .eq("qxbh", jyqx.getQxbh())
+                            .eq("xt_scbz", 0)
+            );
+            if (jyqxList.size() > 0) {
+                throw new BusinessException("设备编号已存在");
+            } else {
+                jyqx.setId(UUIDGenerator.getUUID());
+                if (StringUtils.isNotBlank(jyqx.getSsbmdm())) {
+                    DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jyqx.getSsbmdm());
+                    jyqx.setSsbm(dept.getDeptname());
+                    jyqx.setSsbmid(dept.getDeptid());
+                    jyqx.setSsbmdm(dept.getDeptcode());
+                    jyqx.setSsxgajdm(dept.getFxjcode());
+                    jyqx.setSsxgajid(dept.getFxjid());
+                    jyqx.setSsxgaj(dept.getFxjname());
+                    jyqx.setSssgaj(dept.getDszname());
+                    jyqx.setSssgajdm(dept.getDszcode());
+                    jyqx.setSssgajid(dept.getDszid());
+                }
+                jyqx.setXtSjly("1");
+                this.baseMapper.insert(jyqx);
+            }
+        }
+    }
+
+
+    @Override
+    public IPage<TbJcglJyqx> selectJyqx(TbJcglJyqx jyqx, IPage<TbJcglJyqx> page) {
+        QueryWrapper<TbJcglJyqx> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        jyqx.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(jyqx.getSsbmdm(), null));
+        if (jyqx != null) {
+            qw.lambda()
+//                    .eq(StringUtils.isNotBlank(jyqx.getSsbmdm()), TbJcglJyqx::getSsbmdm, jyqx.getSsbmdm())
+//                    .eq(StringUtils.isNotBlank(jyqx.getSsbmid()), TbJcglJyqx::getSsbmid, jyqx.getSsbmid())
+                    .eq(StringUtils.isNotBlank(jyqx.getScode()), TbJcglJyqx::getScode, jyqx.getScode())
+                    .like(!StringUtils.isEmpty(jyqx.getQxMc()), TbJcglJyqx::getQxMc, jyqx.getQxMc())
+                    .likeRight(!StringUtils.isEmpty(jyqx.getSsbmdm()), TbJcglJyqx::getSsbmdm, jyqx.getSsbmdm())
+                    .eq(jyqx.getCgrq() != null, TbJcglJyqx::getCgrq, jyqx.getCgrq())
+                    .eq(TbJcglJyqx::getXtScbz, 0)
+                    .orderByDesc(TbJcglJyqx::getXtCjsj);
+        }
+
+        IPage<TbJcglJyqx> tbJcglJyqxIPage = this.baseMapper.selectPage(page, qw);
+
+        List<TbJcglJyqx> records = tbJcglJyqxIPage.getRecords();
+//        if (!CollectionUtils.isEmpty(records)) {
+//            for (TbJcglJyqx qx : records) {
+//                //查询是否有下发数据
+//                List<TbJcglJyqx> tbJcglJyqxes = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglJyqx>().eq(TbJcglJyqx::getXfid, qx.getXfid()));
+//                if (!CollectionUtils.isEmpty(tbJcglJyqxes)) {
+//                    qx.setJyqxList(tbJcglJyqxes);
+//                    int bss = 0;
+//                    int xfs = 0;
+//                    for (TbJcglJyqx xfqx : tbJcglJyqxes) {
+//                        if (StringUtils.isNotBlank(xfqx.getSfbs()) || xfqx.getSfbs().equals("0")) {
+//                            //下发
+//                            xfs += xfqx.getSl();
+//                        } else {
+//                            //报损
+//                            bss += xfqx.getSl();
+//                        }
+//                    }
+//                    qx.setBss(bss);
+//                    qx.setXfs(xfs);
+//                }
+//            }
+//        }
+        return tbJcglJyqxIPage;
+    }
+
+    @Override
+    public void updateJyqx(TbJcglJyqx jyqx) {
+        if (StringUtils.isBlank(jyqx.getSsbmdm())) throw new BusinessException("请选择所属部门！！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jyqx.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            jyqx.setSsbm(dept.getDeptname());
+            jyqx.setSsbmid(dept.getDeptid());
+            jyqx.setSsbmdm(dept.getDeptcode());
+            jyqx.setSsxgajdm(dept.getFxjcode());
+            jyqx.setSsxgajid(dept.getFxjid());
+            jyqx.setSsxgaj(dept.getFxjname());
+            jyqx.setSssgaj(dept.getDszname());
+            jyqx.setSssgajdm(dept.getDszcode());
+            jyqx.setSssgajid(dept.getDszid());
+        }
+
+//        if (StringUtils.isNotBlank(jyqx.getQxbh())) {
+        //查询设备类型信息
+//            List<TbJcglJyqx> jyqxList = this.baseMapper.selectList(
+//                    new QueryWrapper<TbJcglJyqx>()
+//                            .eq("qxbh", jyqx.getQxbh())
+//                            .ne("id", jyqx.getId())
+//                            .eq("xt_scbz", 0)
+//            );
+//            if (jyqxList.size() > 0) throw new BusinessException("设备编号已存在");
+        this.baseMapper.updateById(jyqx);
+//        }
+    }
+
+    @Override
+    public void deleteJyQxzb(List<String> id) {
+        //批量注销
+        TbJcglJyqx tbJcglJyqx = new TbJcglJyqx();
+        tbJcglJyqx.setXtScbz("1");
+        if (id.size() > 0) {
+            this.baseMapper.deleteZb(id);
+        }
+    }
+
+    @Override
+    public Object selectJyqxXq(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglJyqx> selectDqjyqx(TbJcglJyqxQuery jyqx, IPage<TbJcglJyqx> page) {
+        SimpleDateFormat defaultDateFormatter = new SimpleDateFormat("yyyy-MM-dd");
+        String currentDate = DateUtils.getSystemDateString();
+        Date dqDate = DateUtils.stepMonth(new Date(), 2);
+        String dqsj = defaultDateFormatter.format(dqDate);
+        QueryWrapper<TbJcglJyqx> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+
+        jyqx.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(jyqx.getSsbmdm(), null));
+        if (jyqx != null) {
+            qw.lambda()
+//                    .eq(StringUtils.isNotBlank(jyqx.getSsbmdm()), TbJcglJyqx::getSsbmdm, jyqx.getSsbmdm())
+//                    .eq(StringUtils.isNotBlank(jyqx.getSsbmid()), TbJcglJyqx::getSsbmid, jyqx.getSsbmid())
+                    .eq(StringUtils.isNotBlank(jyqx.getScode()), TbJcglJyqx::getScode, jyqx.getScode())
+                    .eq(TbJcglJyqx::getXtScbz, 0)
+                    .eq(StringUtils.isNotBlank(jyqx.getCgrq()), TbJcglJyqx::getCgrq, jyqx.getCgrq())
+                    .likeRight(StringUtils.isNotBlank(jyqx.getSsbmdm()), TbJcglJyqx::getSsbmdm, jyqx.getSsbmdm())
+                    .ge(TbJcglJyqx::getDqsj, currentDate)
+                    .ge(TbJcglJyqx::getDqsj, currentDate)
+                    .le(TbJcglJyqx::getDqsj, dqsj);
+        }
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public String importData(List<TbJcglJyqx> jyqxList, boolean updateSupport) {
+        if (CollectionUtils.isEmpty(jyqxList)) {
+            throw new BusinessException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TbJcglJyqx jyqx : jyqxList) {
+            try {
+                if (StringUtils.isEmpty(jyqx.getQxMc())
+                        || StringUtils.isEmpty(jyqx.getQxbh())
+                        || StringUtils.isEmpty(jyqx.getScode())
+                        || StringUtils.isEmpty(jyqx.getQxPch())
+                        || ObjectUtils.isEmpty(jyqx.getDqsj())
+                        || ObjectUtils.isEmpty(jyqx.getCgrq())
+                ) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、器械名称： " + jyqx.getQxMc() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jyqx.getSsbmdm());
+                if (ObjectUtils.isNotEmpty(dept)) {
+                    jyqx.setSsbm(dept.getDeptname());
+                    jyqx.setSsbmid(dept.getDeptid());
+                    jyqx.setSsbmdm(dept.getDeptcode());
+                    jyqx.setSsxgajdm(dept.getFxjcode());
+                    jyqx.setSsxgajid(dept.getFxjid());
+                    jyqx.setSsxgaj(dept.getFxjname());
+                    jyqx.setSssgaj(dept.getDszname());
+                    jyqx.setSssgajdm(dept.getDszcode());
+                    jyqx.setSssgajid(dept.getDszid());
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、所属部门编码不存在 " + jyqx.getSsbmdm() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                jyqx.setSl(jyqx.getSl() <= 0 ? 1 : jyqx.getSl());
+                jyqx.setXtSjzt("1");
+                jyqx.setXtScbz("0");
+                jyqx.setZbzt("1");
+                jyqx.setId(UUIDGenerator.getUUID());
+                this.baseMapper.insert(jyqx);
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、器械名称 " + jyqx.getQxMc() + " 更新成功");
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、器械名称 " + jyqx.getQxMc() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    @Override
+    public IPage<TbJcglJyqx> getJyqxList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        LambdaQueryWrapper<TbJcglJyqx> wrapper = new LambdaQueryWrapper<TbJcglJyqx>()
+                .eq(TbJcglJyqx::getXtSjzt, "1");
+        //本部门
+        if ("1".equals(dto.getType())) {
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglJyqx::getQxMc, dto.getKeyword())
+                    .eq(TbJcglJyqx::getSsbmdm, String.valueOf(user.getDeptCode()))
+                    .orderByAsc(TbJcglJyqx::getXtCjsj);
+        } else {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbm), TbJcglJyqx::getSsbmdm, ssbm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbJcglJyqx::getQxMc, dto.getKeyword())
+                                    .or()
+                                    .like(TbJcglJyqx::getSsbm, dto.getKeyword())
+                    );
+        }
+        return this.baseMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJzServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJzServiceImpl.java
new file mode 100644
index 0000000..f7962e4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglJzServiceImpl.java
@@ -0,0 +1,347 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.*;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglJzService;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.*;
+import com.mosty.base.model.query.jcgl.TbJcglJzQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglJzAllVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 勤务警组服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-30
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglJzServiceImpl extends ServiceImpl<TbJcglJzMapper, TbJcglJz>
+        implements TbJcglJzService {
+
+    //警组
+    private TbJcglJzMapper tbJcglJzMapper;
+    //警组人员
+    private TbJcglJzRyMapper tbJcglJzRyMapper;
+    //警组车辆
+    private TbJcglJzClMapper TbJcglJzClMapper;
+    //通讯装备
+    private TbJcglJzZnzbMapper tbJcglJzZnzbMapper;
+    //警组警用器械
+    private TbJcglJzJyqxMapper tbJcglJzJyqxMapper;
+    // 部门feign调用
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbJcglJzAllVo> queryList(TbJcglJzQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+//        UserInfo userInfo = UserInfoManager.get();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("createSql", userInfo != null ? PermissionsUtil.createSql("a", userInfo) : "");
+        map.put("dto", dto);
+        int count = this.tbJcglJzMapper.queryCount(map);
+        List<TbJcglJz> list = this.tbJcglJzMapper.queryList(map);
+        List<TbJcglJzAllVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbJcglJzAllVo vo = new TbJcglJzAllVo();
+            BeanUtils.copyProperties(item, vo);
+            // 车辆
+            List<TbJcglJzCl> clList = this.TbJcglJzClMapper.selectList(
+                    new LambdaQueryWrapper<TbJcglJzCl>()
+                            .eq(TbJcglJzCl::getQwjzId, item.getId())
+                            .eq(TbJcglJzCl::getXtSjzt, "1")
+            );
+            vo.setClList(clList);
+            // 人员
+            List<TbJcglJzRy> ryList = this.tbJcglJzRyMapper.selectList(
+                    new LambdaQueryWrapper<TbJcglJzRy>()
+                            .eq(TbJcglJzRy::getQwjzId, item.getId())
+                            .eq(TbJcglJzRy::getXtSjzt, "1")
+            );
+            vo.setJzryList(ryList);
+            // 警用器械
+            List<TbJcglJzJyqx> jyqxList = this.tbJcglJzJyqxMapper.selectList(
+                    new LambdaQueryWrapper<TbJcglJzJyqx>()
+                            .eq(TbJcglJzJyqx::getQwjzId, item.getId())
+                            .eq(TbJcglJzJyqx::getXtSjzt, "1")
+            );
+            vo.setJyqxList(jyqxList);
+            // 智能装备
+            List<TbJcglJzZnzb> znzbList = this.tbJcglJzZnzbMapper.selectList(
+                    new LambdaQueryWrapper<TbJcglJzZnzb>()
+                            .eq(TbJcglJzZnzb::getQwjzId, item.getId())
+                            .eq(TbJcglJzZnzb::getXtSjzt, "1")
+            );
+            vo.setTxzbList(znzbList);
+            rList.add(vo);
+        });
+        IPage<TbJcglJzAllVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public TbJcglJzAllVo selectById(String id) {
+        TbJcglJz jz = this.tbJcglJzMapper.selectById(id);
+        TbJcglJzAllVo vo = new TbJcglJzAllVo();
+        BeanUtils.copyProperties(jz, vo);
+        // 车辆
+        List<TbJcglJzCl> clList = this.TbJcglJzClMapper.selectList(
+                new LambdaQueryWrapper<TbJcglJzCl>()
+                        .eq(TbJcglJzCl::getQwjzId, id)
+                        .eq(TbJcglJzCl::getXtSjzt, "1")
+        );
+        vo.setClList(clList);
+        // 人员
+        List<TbJcglJzRy> ryList = this.tbJcglJzRyMapper.selectList(
+                new LambdaQueryWrapper<TbJcglJzRy>()
+                        .eq(TbJcglJzRy::getQwjzId, id)
+                        .eq(TbJcglJzRy::getXtSjzt, "1")
+        );
+        vo.setJzryList(ryList);
+        // 警用器械
+        List<TbJcglJzJyqx> jyqxList = this.tbJcglJzJyqxMapper.selectList(
+                new LambdaQueryWrapper<TbJcglJzJyqx>()
+                        .eq(TbJcglJzJyqx::getQwjzId, id)
+                        .eq(TbJcglJzJyqx::getXtSjzt, "1")
+        );
+        vo.setJyqxList(jyqxList);
+        // 智能装备
+        List<TbJcglJzZnzb> znzbList = this.tbJcglJzZnzbMapper.selectList(
+                new LambdaQueryWrapper<TbJcglJzZnzb>()
+                        .eq(TbJcglJzZnzb::getQwjzId, id)
+                        .eq(TbJcglJzZnzb::getXtSjzt, "1")
+        );
+        vo.setTxzbList(znzbList);
+        return vo;
+    }
+
+    @Override
+    public int saveJz(TbJcglJzAllVo jzVo) {
+        TbJcglJz jz = new TbJcglJz();
+        BeanUtils.copyProperties(jzVo, jz);
+        jz.setXtSjly("1");
+        String id = UUIDGenerator.getUUID();
+        jz.setId(id);
+        jz.setJzBh(id);
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jzVo.getSsbmdm());
+        saveRelevanceData(jzVo, jz, dept);
+        if (dept != null) {
+            jz.setSsbm(dept.getDeptname());
+            jz.setSsbmid(dept.getDeptid());
+            jz.setSsbmdm(dept.getDeptcode());
+            jz.setSsxgajdm(dept.getFxjcode());
+            jz.setSsxgajid(dept.getFxjid());
+            jz.setSsxgaj(dept.getFxjname());
+            jz.setSssgaj(dept.getDszname());
+            jz.setSssgajdm(dept.getDszcode());
+            jz.setSssgajid(dept.getDszid());
+        }
+        return tbJcglJzMapper.insert(jz);
+    }
+
+    @Override
+    public int updateJz(TbJcglJzAllVo jzVo) {
+        TbJcglJz jz = new TbJcglJz();
+        BeanUtils.copyProperties(jzVo, jz);
+        deleteRelevanceData(jz.getId());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jzVo.getSsbmdm());
+        saveRelevanceData(jzVo, jz, dept);
+        if (dept != null) {
+            jz.setSsbm(dept.getDeptname());
+            jz.setSsbmid(dept.getDeptid());
+            jz.setSsbmdm(dept.getDeptcode());
+            jz.setSsxgajdm(dept.getFxjcode());
+            jz.setSsxgajid(dept.getFxjid());
+            jz.setSsxgaj(dept.getFxjname());
+            jz.setSssgaj(dept.getDszname());
+            jz.setSssgajdm(dept.getDszcode());
+            jz.setSssgajid(dept.getDszid());
+        }
+        return tbJcglJzMapper.updateById(jz);
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> list) {
+        if (list.size() > 0) {
+            for (String id : list) {
+                deleteRelevanceData(id);
+            }
+            int rs = tbJcglJzMapper.deleteBatch(list);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public Page<TbJcglJzAllVo> selectJzList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        LambdaQueryWrapper<TbJcglJz> wrapper = new LambdaQueryWrapper<TbJcglJz>()
+                .eq(TbJcglJz::getXtSjzt, "1");
+
+        if ("1".equals(dto.getType())) {
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglJz::getJzMc, dto.getKeyword())
+                    .eq(TbJcglJz::getSsbmdm, String.valueOf(user.getDeptCode()))
+                    .orderByAsc(TbJcglJz::getXtCjsj)
+            ;
+        } else {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbm), TbJcglJz::getSsbmdm, ssbm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbJcglJz::getJzMc, dto.getKeyword())
+                                    .or()
+                                    .like(TbJcglJz::getSsbm, dto.getKeyword())
+                    )
+                    .orderByAsc(TbJcglJz::getXtCjsj)
+            ;
+        }
+        Page<TbJcglJz> tbJcglJzPage = this.baseMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+        List<TbJcglJzAllVo> rList = new ArrayList<>();
+        if (ObjectUtils.isNotEmpty(tbJcglJzPage) && !CollectionUtils.isEmpty(tbJcglJzPage.getRecords())) {
+            tbJcglJzPage.getRecords().forEach(item -> {
+                TbJcglJzAllVo vo = new TbJcglJzAllVo();
+                BeanUtils.copyProperties(item, vo);
+                // 车辆
+                List<TbJcglJzCl> clList = this.TbJcglJzClMapper.selectList(
+                        new LambdaQueryWrapper<TbJcglJzCl>()
+                                .eq(TbJcglJzCl::getQwjzId, item.getId())
+                                .eq(TbJcglJzCl::getXtSjzt, "1")
+                );
+                vo.setClList(clList);
+                // 人员
+                List<TbJcglJzRy> ryList = this.tbJcglJzRyMapper.selectList(
+                        new LambdaQueryWrapper<TbJcglJzRy>()
+                                .eq(TbJcglJzRy::getQwjzId, item.getId())
+                                .eq(TbJcglJzRy::getXtSjzt, "1")
+                );
+                vo.setJzryList(ryList);
+                // 警用器械
+                List<TbJcglJzJyqx> jyqxList = this.tbJcglJzJyqxMapper.selectList(
+                        new LambdaQueryWrapper<TbJcglJzJyqx>()
+                                .eq(TbJcglJzJyqx::getQwjzId, item.getId())
+                                .eq(TbJcglJzJyqx::getXtSjzt, "1")
+                );
+                vo.setJyqxList(jyqxList);
+                // 智能装备
+                List<TbJcglJzZnzb> znzbList = this.tbJcglJzZnzbMapper.selectList(
+                        new LambdaQueryWrapper<TbJcglJzZnzb>()
+                                .eq(TbJcglJzZnzb::getQwjzId, item.getId())
+                                .eq(TbJcglJzZnzb::getXtSjzt, "1")
+                );
+                vo.setTxzbList(znzbList);
+                rList.add(vo);
+            });
+            Page<TbJcglJzAllVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+            BeanUtils.copyProperties(tbJcglJzPage, page);
+            page.setRecords(rList);
+            return page;
+        }
+        return null;
+    }
+
+    // 保存关联数据
+    public void saveRelevanceData(TbJcglJzAllVo vo, TbJcglJz jz, DeptInfoVo dept) {
+        String jzid = jz.getId();
+        if (vo != null) {
+            List<TbJcglJzCl> clList = vo.getClList();
+            List<TbJcglJzJyqx> jyqxList = vo.getJyqxList();
+            List<TbJcglJzRy> jzryList = vo.getJzryList();
+            List<TbJcglJzZnzb> txzbList = vo.getTxzbList();
+            if (!CollectionUtils.isEmpty(clList)) {
+                for (TbJcglJzCl cl : clList) {
+                    cl.setQwjzId(jzid);
+                    cl.setXtSjly("1");
+                    TbJcglJzClMapper.insert(cl);
+                }
+                jz.setJzLx("1");
+            } else {
+                jz.setJzLx("2");
+            }
+            if (!CollectionUtils.isEmpty(jyqxList)) {
+                for (TbJcglJzJyqx jyqx : jyqxList) {
+                    jyqx.setQwjzId(jzid);
+                    jyqx.setXtSjly("1");
+                    tbJcglJzJyqxMapper.insert(jyqx);
+                }
+            }
+            int mjsl = 0, fjsl = 0;
+            if (!CollectionUtils.isEmpty(jzryList)) {
+                for (TbJcglJzRy ry : jzryList) {
+                    if ("01".equals(ry.getJllx())) {
+                        mjsl++;
+                    } else if ("02".equals(ry.getJllx())) {
+                        fjsl++;
+                    }
+                    ry.setQwjzId(jzid);
+                    ry.setXtSjly("1");
+                    tbJcglJzRyMapper.insert(ry);
+                }
+                if (mjsl > 0 && fjsl == 0) {
+                    jz.setJzFl("1");
+                } else if (mjsl == 0 && fjsl > 0) {
+                    jz.setJzFl("2");
+                } else {
+                    jz.setJzFl("3");
+                }
+            }
+            if (!CollectionUtils.isEmpty(txzbList)) {
+                for (TbJcglJzZnzb txzb : txzbList) {
+                    txzb.setQwjzId(jzid);
+                    txzb.setXtSjly("1");
+                    tbJcglJzZnzbMapper.insert(txzb);
+                }
+            }
+        }
+    }
+
+    /**
+     * 删除关联表数据
+     *
+     * @param id
+     */
+    public void deleteRelevanceData(String id) {
+        tbJcglJzRyMapper.deleteByQwjzId(id);
+        TbJcglJzClMapper.deleteByQwjzId(id);
+        tbJcglJzZnzbMapper.deleteByQwjzId(id);
+        tbJcglJzJyqxMapper.deleteByQwjzId(id);
+    }
+    //同步一下警用器械
+
+    @Override
+    public void tbJzQx() {
+        List<TbJcglJz> tbJcglJzs = this.baseMapper.selectList(new LambdaQueryWrapper<>());
+        List<TbJcglJzJyqx> jzJyqxList = this.tbJcglJzJyqxMapper.selectList(new LambdaQueryWrapper<>());
+        if (!CollectionUtils.isEmpty(tbJcglJzs)) {
+            for (TbJcglJz jz : tbJcglJzs) {
+                for (TbJcglJzJyqx jzJyqx: jzJyqxList){
+                    jzJyqx.setId(null);
+                    jzJyqx.setQwjzId(jz.getId());
+                    this.tbJcglJzJyqxMapper.insert(jzJyqx);
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKfdServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKfdServiceImpl.java
new file mode 100644
index 0000000..b630ae7
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKfdServiceImpl.java
@@ -0,0 +1,304 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglKfdMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglKfdService;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import com.mosty.base.model.query.jcgl.TbJcglKfdQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@AllArgsConstructor
+@Service
+public class TbJcglKfdServiceImpl extends ServiceImpl<TbJcglKfdMapper, TbJcglKfd>
+        implements TbJcglKfdService {
+
+    private TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbJcglKfdDto> selectKfdList(TbJcglKfdQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        IPage<TbJcglKfdDto> page;
+//        UserInfo userInfo = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", userInfo);
+        page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", useSql);
+        List<String> dwlxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getDwlxs())) {
+            dwlxList = Arrays.asList(dto.getDwlxs().split(","));
+        }
+        map.put("dwlxList", dwlxList);
+        int count = this.baseMapper.getCount(map);
+        List<TbJcglKfd> list = this.baseMapper.getPageList(map);
+        List<TbJcglKfdDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbJcglKfdDto vo = new TbJcglKfdDto();
+            BeanUtils.copyProperties(item, vo);
+            if (item.getYfzfw() != null) vo.setYfzfw(JtsUtils.decodePolygon(item.getYfzfw()));
+            if (item.getSfzfw() != null) vo.setSfzfw(JtsUtils.decodePolygon(item.getSfzfw()));
+            if (item.getWfzfw() != null) vo.setWfzfw(JtsUtils.decodePolygon(item.getWfzfw()));
+            rList.add(vo);
+        });
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public int addKfd(TbJcglKfdDto dto) {
+        TbJcglKfd item = new TbJcglKfd();
+        BeanUtils.copyProperties(dto, item);
+        item.setKfdId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(item.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        if (item.getJd() != null && item.getWd() != null) {
+            item.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            item.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getYfzfw())) {
+            item.setYfzfw(JtsUtils.getPolygon(dto.getYfzfw()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getSfzfw())) {
+            item.setSfzfw(JtsUtils.getPolygon(dto.getSfzfw()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getWfzfw())) {
+            item.setWfzfw(JtsUtils.getPolygon(dto.getWfzfw()));
+        }
+        item.setXtSjly("1");
+        int ret = this.baseMapper.insertEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(item.getKfdId());
+        ysGajgDto.setLybm("tb_jcgl_kfd");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001008");
+        if (StringUtils.isNotEmpty(dto.getDwlx()) && dto.getDwlx().equals("02")) {
+            ysGajgDto.setYsdl("001001009");
+        }
+        ysGajgDto.setGajgmc(item.getKfdMc());
+        ysGajgDto.setGajgjc(item.getKfdMc());
+        ysGajgDto.setWzXzqh(item.getXzqhdm());
+        ysGajgDto.setWzXz(item.getKfdDz());
+        ysGajgDto.setWzBc(item.getKfdDz());
+        ysGajgDto.setJd(item.getJd());
+        ysGajgDto.setWd(item.getWd());
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmid(item.getSsbmid());
+        ysGajgDto.setSsbmdm(item.getSsbmdm());
+        // 一分钟圈层
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getYfzfw())) {
+            dto.getYfzfw().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        // 三分钟圈层
+        List<BigDecimal> list1 = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getSfzfw())) {
+            dto.getSfzfw().forEach(it -> {
+                list1.add(it[0]);
+                list1.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy1(list1);
+        // 五分钟圈层
+        List<BigDecimal> list2 = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getWfzfw())) {
+            dto.getWfzfw().forEach(it -> {
+                list2.add(it[0]);
+                list2.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy2(list2);
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    @Transactional
+    public int updateKfd(TbJcglKfdDto dto) {
+        TbJcglKfd item = new TbJcglKfd();
+        BeanUtils.copyProperties(dto, item);
+        if (StringUtils.isNotBlank(item.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        if (item.getJd() != null && item.getWd() != null) {
+            item.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            item.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getYfzfw())) {
+            item.setYfzfw(JtsUtils.getPolygon(dto.getYfzfw()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getSfzfw())) {
+            item.setSfzfw(JtsUtils.getPolygon(dto.getSfzfw()));
+        }
+        if (!CollectionUtils.isEmpty(dto.getWfzfw())) {
+            item.setWfzfw(JtsUtils.getPolygon(dto.getWfzfw()));
+        }
+        int ret = this.baseMapper.updateEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(item.getKfdId());
+        ysGajgDto.setLybm("tb_jcgl_kfd");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001008");
+        if (StringUtils.isNotEmpty(dto.getDwlx()) && dto.getDwlx().equals("02")) {
+            ysGajgDto.setYsdl("001001009");
+        }
+        ysGajgDto.setGajgmc(item.getKfdMc());
+        ysGajgDto.setGajgjc(item.getKfdMc());
+        ysGajgDto.setWzXzqh(item.getXzqhdm());
+        ysGajgDto.setWzXz(item.getKfdDz());
+        ysGajgDto.setWzBc(item.getKfdDz());
+        ysGajgDto.setJd(item.getJd());
+        ysGajgDto.setWd(item.getWd());
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmid(item.getSsbmid());// 一分钟圈层
+        ysGajgDto.setSsbmdm(item.getSsbmdm());// 一分钟圈层
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getYfzfw())) {
+            dto.getYfzfw().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        // 三分钟圈层
+        List<BigDecimal> list1 = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getSfzfw())) {
+            dto.getSfzfw().forEach(it -> {
+                list1.add(it[0]);
+                list1.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy1(list1);
+        // 五分钟圈层
+        List<BigDecimal> list2 = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getWfzfw())) {
+            dto.getWfzfw().forEach(it -> {
+                list2.add(it[0]);
+                list2.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy2(list2);
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    public TbJcglKfdDto selectByid(String id) {
+        TbJcglKfd kfd = this.baseMapper.getById(id);
+        if (kfd != null) {
+            TbJcglKfdDto dto = new TbJcglKfdDto();
+            BeanUtils.copyProperties(kfd, dto);
+            if (kfd.getYfzfw() != null) dto.setYfzfw(JtsUtils.decodePolygon(kfd.getYfzfw()));
+            if (kfd.getSfzfw() != null) dto.setSfzfw(JtsUtils.decodePolygon(kfd.getSfzfw()));
+            if (kfd.getWfzfw() != null) dto.setWfzfw(JtsUtils.decodePolygon(kfd.getWfzfw()));
+            return dto;
+        }
+        return null;
+    }
+
+    @Override
+    public void deleteKfd(List<String> id) {
+        this.baseMapper.deleteKfd(id);
+        for (String s : id) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_kfd");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+    }
+
+
+    @Override
+    public List<TbJcglKfdDto> getListAll() {
+        List<TbJcglKfd> list = this.baseMapper.getListAll();
+        List<TbJcglKfdDto> rList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(item -> {
+                TbJcglKfdDto vo = new TbJcglKfdDto();
+                BeanUtils.copyProperties(item, vo);
+                if (item.getYfzfw() != null) vo.setYfzfw(JtsUtils.decodePolygon(item.getYfzfw()));
+                if (item.getSfzfw() != null) vo.setSfzfw(JtsUtils.decodePolygon(item.getSfzfw()));
+                if (item.getWfzfw() != null) vo.setWfzfw(JtsUtils.decodePolygon(item.getWfzfw()));
+                rList.add(vo);
+            });
+        }
+        return rList;
+    }
+
+    @Override
+    public Page<TbJcglKfd> getKfdList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        LambdaQueryWrapper<TbJcglKfd> wrapper = new LambdaQueryWrapper<TbJcglKfd>()
+                .eq(TbJcglKfd::getXtSjzt, "1")
+                .eq(StringUtils.isNotBlank(dto.getDwlx()), TbJcglKfd::getDwlx, dto.getDwlx());
+
+        if ("1".equals(dto.getType())) {
+
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglKfd::getKfdMc, dto.getKeyword())
+                    .eq(TbJcglKfd::getSsbmdm, String.valueOf(user.getDeptCode()));
+
+        } else {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbm), TbJcglKfd::getSsbmdm, ssbm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbJcglKfd::getKfdMc, dto.getKeyword())
+                                    .or()
+                                    .like(TbJcglKfd::getSsbm, dto.getKeyword())
+                    );
+        }
+        return this.baseMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhbmServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhbmServiceImpl.java
new file mode 100644
index 0000000..c027c59
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhbmServiceImpl.java
@@ -0,0 +1,114 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglKhbmMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglKhbmService;
+import com.mosty.base.model.dto.jcgl.TbJcglKhbmEditPzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import com.mosty.base.model.query.jcgl.TbJcglKhbmQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglKhbmVo;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TbJcglKhbmServiceImpl extends ServiceImpl<TbJcglKhbmMapper, TbJcglKhbm>
+        implements TbJcglKhbmService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public void addKhbm(List<String> ssbmidList) {
+        UserInfo user = UserInfoManager.get();
+        if (!CollectionUtils.isEmpty(ssbmidList)) {
+            ssbmidList.forEach(item -> {
+                TbJcglKhbm bm = this.baseMapper.selectOne(
+                        new LambdaQueryWrapper<TbJcglKhbm>()
+                                .eq(TbJcglKhbm::getSsbmid, item)
+                );
+                if (bm == null) {
+                    bm = new TbJcglKhbm();
+                    DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(item);
+                    bm.setTjrid(String.valueOf(user.getUserId()));
+                    bm.setTjrsfzh(user.getIdEntityCard());
+                    bm.setTjrxm(user.getUserName());
+                    bm.setTjsj(new Date());
+                    bm.setSsbm(dept.getDeptname());
+                    bm.setSsbmid(dept.getDeptid());
+                    bm.setSsbmdm(dept.getDeptcode());
+                    bm.setSsxgajdm(dept.getFxjcode());
+                    bm.setSsxgajid(dept.getFxjid());
+                    bm.setSsxgaj(dept.getFxjname());
+                    bm.setSssgaj(dept.getDszname());
+                    bm.setSssgajdm(dept.getDszcode());
+                    bm.setSssgajid(dept.getDszid());
+                    bm.setXtSjly("1");
+                    this.baseMapper.insert(bm);
+                }
+            });
+        }
+    }
+
+    @Override
+    public void delKhbm(List<String> ids) {
+        if (!CollectionUtils.isEmpty(ids)) {
+            this.baseMapper.delKhbm(ids);
+        }
+    }
+
+    @Override
+    public IPage<TbJcglKhbmVo> getPageList(TbJcglKhbmQuery dto) {
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        dto.setSsbm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbm(), null));
+
+        QueryWrapper<TbJcglKhbm> qw = new QueryWrapper<>();
+        IPage<TbJcglKhbm> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                qw.lambda().likeRight(!StringUtils.isEmpty(dto.getSsbm()), TbJcglKhbm::getSsbmdm, dto.getSsbm())
+        );
+        IPage<TbJcglKhbmVo> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbJcglKhbmVo> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbJcglKhbmVo vo = new TbJcglKhbmVo();
+                BeanUtils.copyProperties(item, vo);
+                resList.add(vo);
+            });
+        }
+        resPage.setRecords(resList);
+        resPage.setTotal(page.getTotal());
+        return resPage;
+    }
+
+    @Override
+    public List<String> getAllKhbm() {
+//        UserInfo user = UserInfoManager.get();
+//        String sql = PermissionsUtil.createSql("", user);
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.baseMapper.getAllKhbm(ssbmdm);
+    }
+
+    @Override
+    public void editKhbm(TbJcglKhbm dto) {
+        TbJcglKhbm bm = this.baseMapper.selectById(dto.getId());
+        if (bm == null) throw new BusinessException("考核部门不存在，或已删除");
+        this.baseMapper.updateById(dto);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhmxServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhmxServiceImpl.java
new file mode 100644
index 0000000..256278d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhmxServiceImpl.java
@@ -0,0 +1,135 @@
+package com.mosty.base.manager.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglBqMapper;
+import com.mosty.base.manager.mapper.TbJcglKhmxMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglBqService;
+import com.mosty.base.manager.service.TbJcglKhmxService;
+import com.mosty.base.model.dto.base.SysMessageInfo;
+import com.mosty.base.model.dto.jcgl.TbJcglBqDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBq;
+import com.mosty.base.model.entity.jcgl.TbJcglKhmx;
+import com.mosty.base.model.query.jcgl.TbJcglBqQuery;
+import com.mosty.base.model.query.jcgl.TbJcglKhmxQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglBqVo;
+import com.mosty.base.model.vo.jcgl.TbJcglKhmxVo;
+import com.mosty.base.utils.BeanConvertUtils;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.PingYinUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 考核模型
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglKhmxServiceImpl extends ServiceImpl<TbJcglKhmxMapper, TbJcglKhmx> implements TbJcglKhmxService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    public TbJcglKhmxVo queryById(String id) {
+        return BeanConvertUtils.copyProperties(this.baseMapper.selectById(id), TbJcglKhmxVo.class);
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param tbJcglkhmx 筛选条件
+     * @return
+     */
+    public IPage<TbJcglKhmx> paginQuery(TbJcglKhmxQuery tbJcglkhmx) {
+        IPage<TbJcglKhmx> page = new Page<TbJcglKhmx>(tbJcglkhmx.getPageCurrent(), tbJcglkhmx.getPageSize());
+        tbJcglkhmx.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbJcglkhmx.getSsbmdm(), null));
+        LambdaQueryWrapper<TbJcglKhmx> wrapper = new LambdaQueryWrapper<>();
+        wrapper.likeRight(StringUtils.isNotBlank(tbJcglkhmx.getSsbmdm()), TbJcglKhmx::getSsbmdm, tbJcglkhmx.getSsbmdm())
+                .eq(StringUtils.isNotBlank(tbJcglkhmx.getMxmc()), TbJcglKhmx::getMxmc, tbJcglkhmx.getMxmc())
+                .orderByDesc(TbJcglKhmx::getXtCjsj);
+        return baseMapper.selectPage(page, wrapper);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param tbJcglKhmx 实例对象
+     * @return 实例对象
+     */
+    public int insert(TbJcglKhmx tbJcglKhmx) {
+
+        tbJcglKhmx.setId(UUIDGenerator.getUUID());
+        tbJcglKhmx.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(tbJcglKhmx.getSsbmdm());
+        if (dept != null) {
+            tbJcglKhmx.setSsbm(dept.getDeptname());
+            tbJcglKhmx.setSsbmid(dept.getDeptid());
+            tbJcglKhmx.setSsbmdm(dept.getDeptcode());
+            tbJcglKhmx.setSsxgajdm(dept.getFxjcode());
+            tbJcglKhmx.setSsxgajid(dept.getFxjid());
+            tbJcglKhmx.setSsxgaj(dept.getFxjname());
+            tbJcglKhmx.setSssgaj(dept.getDszname());
+            tbJcglKhmx.setSssgajdm(dept.getDszcode());
+            tbJcglKhmx.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.insert(tbJcglKhmx);
+
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param tbJcglKhmx 实例对象
+     * @return 实例对象
+     */
+    public int update(TbJcglKhmx tbJcglKhmx) {
+        if (StringUtils.isEmpty(tbJcglKhmx.getId())) throw new BusinessException("模型id为空！！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(tbJcglKhmx.getSsbmdm());
+        if (dept != null) {
+            tbJcglKhmx.setSsbm(dept.getDeptname());
+            tbJcglKhmx.setSsbmid(dept.getDeptid());
+            tbJcglKhmx.setSsbmdm(dept.getDeptcode());
+            tbJcglKhmx.setSsxgajdm(dept.getFxjcode());
+            tbJcglKhmx.setSsxgajid(dept.getFxjid());
+            tbJcglKhmx.setSsxgaj(dept.getFxjname());
+            tbJcglKhmx.setSssgaj(dept.getDszname());
+            tbJcglKhmx.setSssgajdm(dept.getDszcode());
+            tbJcglKhmx.setSssgajid(dept.getDszid());
+        }
+        return baseMapper.updateById(tbJcglKhmx);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    public boolean deleteById(String id) {
+        int total = baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public boolean deleteByIds(List<String> id) {
+        return baseMapper.deleteBatchIds(id) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhtjServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhtjServiceImpl.java
new file mode 100644
index 0000000..75326d0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglKhtjServiceImpl.java
@@ -0,0 +1,342 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglKhbmMapper;
+import com.mosty.base.manager.mapper.TbJcglKhtjMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.remote.TbHczxAdaptRemoteService;
+import com.mosty.base.manager.remote.TbQwzxAdaptRemoteService;
+import com.mosty.base.manager.remote.TbYjzlAdaptRrmoteService;
+import com.mosty.base.manager.service.TbJcglKhtjService;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import com.mosty.base.model.entity.jcgl.TbJcglKhtj;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjQuery;
+import com.mosty.base.model.query.jcgl.TbJcglKhtjStatisticsQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglKhtjVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class TbJcglKhtjServiceImpl extends ServiceImpl<TbJcglKhtjMapper, TbJcglKhtj>
+        implements TbJcglKhtjService {
+
+    private final TbJcglKhbmMapper tbJcglKhbmMapper;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbYjzlAdaptRrmoteService tbYjzlAdaptRrmoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbHczxAdaptRemoteService tbHczxAdaptRemoteService;
+
+    @Override
+    public void builder(String time) {
+        if (StringUtils.isEmpty(time)) throw new BusinessException("请输入统计日期！");
+        List<TbJcglKhbm> bmList = this.tbJcglKhbmMapper.selectList(
+                new LambdaQueryWrapper<TbJcglKhbm>()
+                        .eq(TbJcglKhbm::getXtSjzt, "1")
+        );
+        if (!CollectionUtils.isEmpty(bmList)) {
+            bmList.forEach(item -> {
+                TbJcglKhtj tj = this.baseMapper.selectOne(
+                        new LambdaQueryWrapper<TbJcglKhtj>()
+                                .eq(TbJcglKhtj::getSsbmdm, item.getSsbmdm())
+                                .eq(TbJcglKhtj::getTjrq, time)
+                );
+                if (tj == null) {
+                    tj = new TbJcglKhtj();
+                }
+                tj.setTjrq(DateUtils.strToDate(time, "01"));
+                tj.setTjsj(DateUtils.strToDate(time + " " + DateUtils.getQueryDateString(new Date(), "10"), "02"));
+
+                String ssbm = this.tbBaseAdaptRemoteService.getSsbm(item.getSsbmdm(), null);
+
+                tj.setYbb(item.getYbb());
+                tj.setZsbb(item.getZsbb());
+                tj.setSjbb(this.getSjbb(ssbm, time));
+                //规则修改 通过最少报备来计算
+                tj.setWbb(Math.max((tj.getZsbb() - tj.getSjbb()), 0));
+                tj.setBbkf(tj.getSjbb() >= item.getZsbb() ? new BigDecimal(0) : item.getBbkf());
+                tj.setBbf(new BigDecimal(item.getBbf().doubleValue() - tj.getBbkf().doubleValue()));
+
+
+                tj.setYqs(this.getYqs(ssbm, time));
+                tj.setZsqs(item.getZsqs());
+                tj.setSjqs(this.getSjqs(ssbm, time));
+                tj.setWqs(Math.max((tj.getZsqs() - tj.getSjqs()), 0));
+                tj.setQskf(tj.getSjqs() >= item.getZsqs() ? new BigDecimal(0) : item.getQskf());
+                tj.setQsf(new BigDecimal(item.getQsf().doubleValue() - tj.getQskf().doubleValue()));
+
+                tj.setYxl(this.getYxl(ssbm, time));
+                //最少巡逻 80%
+                tj.setZsxl((int) Math.ceil(tj.getYxl() * 0.8));
+                tj.setSjxl(this.getSjxl(ssbm, time));
+                tj.setWxl(Math.max((tj.getZsxl() - tj.getSjxl()), 0));
+                tj.setXlkf(tj.getSjxl() >= tj.getZsxl() ? new BigDecimal(0) : item.getXlkf());
+                tj.setXlf(new BigDecimal(item.getXlf().doubleValue() - tj.getXlkf().doubleValue()));
+
+
+                tj.setYcr(item.getYcr());
+                tj.setZscr(item.getZscr());
+                tj.setSjcr(this.getsjpcr(ssbm, time));
+                tj.setWcr(Math.max((tj.getZscr() - tj.getSjcr()), 0));
+                tj.setCrkf(tj.getSjcr() >= item.getZscr() ? new BigDecimal(0) : item.getCrkf());
+                tj.setCrf(new BigDecimal(item.getCrf().doubleValue() - tj.getCrkf().doubleValue()));
+
+
+                tj.setYcc(item.getYcc());
+                tj.setZscc(item.getZscc());
+                tj.setSjcc(this.getsjpcc(ssbm, time));
+                tj.setWcc(Math.max((tj.getZscc() - tj.getSjcc()), 0));
+                tj.setCckf(tj.getSjcc() >= item.getZscc() ? new BigDecimal(0) : item.getCckf());
+                tj.setCcf(new BigDecimal(item.getCcf().doubleValue() - tj.getCckf().doubleValue()));
+
+
+                Map<String, Integer> scLc = this.getScLc(ssbm, time);
+
+                tj.setYxllc(item.getYxllc());
+                tj.setZsxllc(item.getZsxllc());
+                tj.setSjxllc(scLc.get("xflc"));
+                tj.setWxllc(Math.max((tj.getZsxllc() - tj.getSjxllc()), 0));
+                tj.setXllckf(tj.getSjxllc() >= item.getZsxllc() ? new BigDecimal(0) : item.getXllckf());
+                tj.setXllcf(new BigDecimal(item.getXllcf().doubleValue() - tj.getXllckf().doubleValue()));
+
+
+                tj.setYxlsc(item.getYxlsc());
+                tj.setZsxlsc(item.getZsxlsc());
+                tj.setSjxlsc(scLc.get("xfsc"));
+                tj.setWxlsc(Math.max((tj.getZsxlsc() - tj.getSjxlsc()), 0));
+                tj.setXlsckf(tj.getSjxlsc() >= item.getZsxlsc() ? new BigDecimal(0) : item.getXlsckf());
+                tj.setXlscf(new BigDecimal(item.getXlscf().doubleValue() - tj.getXlsckf().doubleValue()));
+
+
+                tj.setYcw(item.getYcw());
+                tj.setZscw(item.getZscw());
+                tj.setSjcw(this.getPcWptj(ssbm, time));
+                tj.setWcw(Math.max((tj.getZscw() - tj.getSjcw()), 0));
+                tj.setCwkf(tj.getSjcw() >= item.getZscw() ? new BigDecimal(0) : item.getCwkf());
+                tj.setCwf(new BigDecimal(item.getCwf().doubleValue() - tj.getCwkf().doubleValue()));
+
+
+                //计算三项扣分 得分
+                if ((ObjectUtils.isNotEmpty(tj.getXlkf()) && tj.getXlkf().compareTo(BigDecimal.ZERO) > 0)
+                        || (ObjectUtils.isNotEmpty(tj.getXlsckf()) && tj.getXlsckf().compareTo(BigDecimal.ZERO) > 0)
+                        || (ObjectUtils.isNotEmpty(tj.getXllckf()) && tj.getXllckf().compareTo(BigDecimal.ZERO) > 0)
+                ) {
+                    tj.setSxkf(new BigDecimal(0.15));
+                }else{
+                    tj.setSxkf(new BigDecimal(0));
+                }
+                tj.setSsbm(item.getSsbm());
+                tj.setSsbmdm(item.getSsbmdm());
+                tj.setSsxgaj(item.getSsxgaj());
+                tj.setSsxgajdm(item.getSsxgajdm());
+                tj.setSssgaj(item.getSssgaj());
+                tj.setSssgajdm(item.getSssgajdm());
+                tj.setSsbmid(item.getSsbmid());
+                tj.setSsxgajid(item.getSsxgajid());
+                tj.setSssgajid(item.getSssgajid());
+                tj.setXtSjly("1");
+
+                if (StringUtils.isEmpty(tj.getId())) {
+                    this.baseMapper.insert(tj);
+                } else {
+                    this.baseMapper.updateById(tj);
+                }
+
+
+            });
+        }
+    }
+
+    public double jsfz(int wx, double zf, double kf) {
+        if (wx < 1) return zf;
+        double kfs = zf - (kf * wx);
+        return kfs < 0 ? 0 : kfs;
+    }
+
+    @Override
+    public List<TbJcglKhtj> getList(TbJcglKhtjQuery dto) {
+        Map<String, String> map = this.analysisTime(dto);
+        String kssj = map.get("kssj");
+        String jssj = map.get("jssj");
+        if (StringUtils.isEmpty(kssj) || StringUtils.isEmpty(jssj))
+            throw new BusinessException("时间查询参数异常！！");
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        List<TbJcglKhtj> tbJcglKhtjs = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglKhtj>()
+                .likeRight(!StringUtils.isEmpty(dto.getSsbmdm()), TbJcglKhtj::getSsbmdm, dto.getSsbmdm())
+                .ge(!StringUtils.isEmpty(kssj), TbJcglKhtj::getTjrq, kssj)
+                .le(!StringUtils.isEmpty(jssj), TbJcglKhtj::getTjrq, jssj)
+                .orderByAsc(TbJcglKhtj::getSsbmdm, TbJcglKhtj::getTjrq)
+        );
+        return tbJcglKhtjs;
+    }
+
+    @Override
+    public List<TbJcglKhtjVo> getFxbm(TbJcglKhtjQuery dto) {
+        Map<String, String> map = this.analysisTime(dto);
+        String kssj = map.get("kssj");
+        String jssj = map.get("jssj");
+        if (StringUtils.isEmpty(kssj) || StringUtils.isEmpty(jssj))
+            throw new BusinessException("时间查询参数异常！！");
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), "");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(org.apache.commons.lang3.StringUtils.rightPad(ssbm, 12, "0"));
+        String orglevel = "4";
+        if ("20".equals(dept.getOrgLevel()) || "30".equals(dept.getOrgLevel()) || "10".equals(dept.getOrgLevel())) {
+            orglevel = "3";
+        }
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("kssj", kssj);
+        mp.put("jssj", jssj);
+        mp.put("bmdmList", ssbm);
+        mp.put("orglevel", orglevel);
+        List<TbJcglKhtjVo> fxbm = this.baseMapper.getFxbm(mp);
+        return fxbm;
+    }
+
+    @Override
+    public IPage<TbJcglKhtjVo> getPageList(TbJcglKhtjQuery dto) {
+//        UserInfo user = UserInfoManager.get();
+        Map<String, String> map = this.analysisTime(dto);
+        String kssj = map.get("kssj");
+        String jssj = map.get("jssj");
+        if (StringUtils.isEmpty(kssj) || StringUtils.isEmpty(jssj))
+            throw new BusinessException("时间查询参数异常！！");
+//        if (StringUtils.isEmpty(dto.getSsbmdm())) {
+//            dto.setSsbmdm(user.getDeptCode());
+//        }
+        Map<String, Object> mp = new HashMap<>();
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), "");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(org.apache.commons.lang3.StringUtils.rightPad(ssbm, 12, "0"));
+        if (!StringUtils.isEmpty(dept.getOrgLevel())) {
+            if ("20".equals(dept.getOrgLevel()) || "10".equals(dept.getOrgLevel())) {
+                if ("01".equals(dto.getCxcj())) {
+                    mp.put("orglevel", "3");
+                } else {
+                    mp.put("orglevel", "4");
+                }
+            } else {
+                mp.put("orglevel", "4");
+            }
+        } else {
+            mp.put("orglevel", "4");
+        }
+        mp.put("bmdmList", ssbm);
+        mp.put("kssj", kssj);
+        mp.put("jssj", jssj);
+        mp.put("searchType", dto.getSearchType());
+        mp.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        mp.put("pageSize", dto.getPageSize());
+        int count = this.baseMapper.getCount(mp);
+        List<TbJcglKhtjVo> list = this.baseMapper.getList(mp);
+        IPage<TbJcglKhtjVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Map<String, Object> getStatistics(TbJcglKhtjStatisticsQuery dto) {
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+        Map<String, Object> map = new HashMap<>();
+        map.put("bmdmList", ssbm);
+        map.put("time", dto.getTime());
+        map.put("searchType", dto.getSearchType());
+        return this.baseMapper.getStatistics(map);
+    }
+
+    // 根据条件解析开始结束时间
+    private Map<String, String> analysisTime(TbJcglKhtjQuery dto) {
+        Map<String, String> map = new HashMap<>();
+        if ("01".equals(dto.getType())) {
+            if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj()))
+                throw new BusinessException("请选择开始时间和结束时间");
+            map.put("kssj", dto.getKssj());
+            map.put("jssj", dto.getJssj());
+        } else if ("02".equals(dto.getType())) {
+            if (StringUtils.isEmpty(dto.getMonth()))
+                throw new BusinessException("请选择月份");
+            map.put("kssj", dto.getMonth() + "-01");
+            map.put("jssj", dto.getMonth() + "-31");
+        } else if ("03".equals(dto.getType())) {
+            if (StringUtils.isEmpty(dto.getYear())) throw new BusinessException("请选择年份");
+            if (StringUtils.isEmpty(dto.getQuarter())) throw new BusinessException("请选择季度");
+            if ("01".equals(dto.getQuarter())) {
+                map.put("kssj", dto.getYear() + "-01-01");
+                map.put("jssj", dto.getYear() + "-03-31");
+            } else if ("02".equals(dto.getQuarter())) {
+                map.put("kssj", dto.getYear() + "-04-01");
+                map.put("jssj", dto.getYear() + "-06-31");
+            } else if ("03".equals(dto.getQuarter())) {
+                map.put("kssj", dto.getYear() + "-07-01");
+                map.put("jssj", dto.getYear() + "-09-31");
+            } else if ("04".equals(dto.getQuarter())) {
+                map.put("kssj", dto.getYear() + "-10-01");
+                map.put("jssj", dto.getYear() + "-12-31");
+            }
+        } else if ("04".equals(dto.getType())) {
+            if (StringUtils.isEmpty(dto.getYear())) throw new BusinessException("请选择年份");
+            map.put("kssj", dto.getYear() + "-01-01");
+            map.put("jssj", dto.getYear() + "-12-31");
+        }
+        return map;
+    }
+
+    // 计算应签收数量
+    private Integer getYqs(String ssbmdm, String time) {
+        return this.tbYjzlAdaptRrmoteService.getZlCount(ssbmdm, time, null);
+    }
+
+    // 计算应巡逻数
+    private Integer getYxl(String ssbmdm, String time) {
+        return this.tbYjzlAdaptRrmoteService.getFzyjCount(ssbmdm, time, null);
+    }
+
+    // 计算实际巡逻
+    private Integer getSjxl(String ssbmdm, String time) {
+        return this.tbYjzlAdaptRrmoteService.getFzyjCount(ssbmdm, time, "1");
+    }
+
+    // 计算实际签收
+    private Integer getSjqs(String ssbmdm, String time) {
+        return this.tbYjzlAdaptRrmoteService.getZlCount(ssbmdm, time,
+                "02,03,04,11,21,22,23,24,25,26,27,31,32,91,92,93");
+    }
+
+    // 计算实际报备
+    private Integer getSjbb(String ssbmdm, String time) {
+        return this.tbQwzxAdaptRemoteService.getBbCount(ssbmdm, time);
+    }
+
+    // 计算实际盘查人员
+    private Integer getsjpcr(String ssbmdm, String time) {
+        return this.tbHczxAdaptRemoteService.getSjpcr(ssbmdm, time);
+    }
+
+    // 计算实际盘查车辆
+    private Integer getsjpcc(String ssbmdm, String time) {
+        return this.tbHczxAdaptRemoteService.getSjpcc(ssbmdm, time);
+    }
+
+    // 计算实际盘查物品
+    private Integer getPcWptj(String ssbmdm, String time) {
+        return this.tbHczxAdaptRemoteService.getPcWptj(ssbmdm, time);
+    }
+
+    // 计算实际报备
+    private Map<String, Integer> getScLc(String ssbmdm, String time) {
+        return this.tbQwzxAdaptRemoteService.getScLc(ssbmdm, time);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglPzfzServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglPzfzServiceImpl.java
new file mode 100644
index 0000000..c51d29c
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglPzfzServiceImpl.java
@@ -0,0 +1,98 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglPzfzMapper;
+import com.mosty.base.manager.service.TbJcglPzfzService;
+import com.mosty.base.model.dto.jcgl.TbJcglPzfzDto;
+import com.mosty.base.model.entity.jcgl.TbJcglPzfz;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class TbJcglPzfzServiceImpl extends ServiceImpl<TbJcglPzfzMapper, TbJcglPzfz> implements TbJcglPzfzService {
+
+    @Override
+    public IPage<Map<String, Object>> getPageList(TbJcglPzfzDto dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        List<Map<String, Object>> list = this.baseMapper.getList(map);
+        int count = this.baseMapper.getListCount(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public List<TbJcglPzfz> getPageListWtj() {
+        return this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJcglPzfz>()
+                        .eq(TbJcglPzfz::getXtSjzt, "1") // 唯一固定的条件Sjzt为1
+        );
+    }
+
+
+    @Override
+    public int addEntity(TbJcglPzfzDto dto) {
+        // 根据Pzlx,不能添加的数据的配置类型 是和表中数据的配置类型相同
+        TbJcglPzfz item = this.baseMapper.selectOne(
+                // 1.获取到表中的其他数据的配置类型【pzlx】,与前段传来的配置类型【pzlx】
+                new LambdaQueryWrapper<TbJcglPzfz>()
+                        .eq(TbJcglPzfz::getPzlx, dto.getPzlx())
+        );
+        if (item != null) { // 2.如果前段传来的数据在数据库中有那么就抛异常。
+            throw new BusinessException("该配置类型已存在，请重新选择");
+        }
+        UserInfo user = UserInfoManager.get();
+        TbJcglPzfz pzfz = new TbJcglPzfz();
+        BeanUtils.copyProperties(dto, pzfz);
+        pzfz.setId(UUIDGenerator.getUUID());
+        pzfz.setPzrid(String.valueOf(user.getUserId()));
+        pzfz.setPzrxm(user.getUserName());
+        pzfz.setPzrsfzh(user.getIdEntityCard());
+        pzfz.setXtSjly("1");
+        return this.baseMapper.insert(pzfz);
+    }
+
+    @Override
+    public int deleteEntity(String id) {
+        return this.baseMapper.deleteByPzfzId(id);
+    }
+
+    // 修改
+    @Override
+    public int editEntity(TbJcglPzfzDto dto) {
+        // 根据Pzlx,不能修改成相同的配置类型
+        TbJcglPzfz item = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbJcglPzfz>() // LambdaQueryWrapper对比是否其他的数据有相同的类型
+                        .eq(TbJcglPzfz::getPzlx, dto.getPzlx())
+                        .ne(TbJcglPzfz::getId, dto.getId()) // LambdaQueryWrapper对比Id是否相等
+        );
+        if (item != null) { // 如果不为空 直接抛异常
+            throw new BusinessException("该配置类型已存在，请重新选择");
+        }
+        TbJcglPzfz tbJcglPzfz = new TbJcglPzfz();
+        BeanUtils.copyProperties(dto, tbJcglPzfz);
+        return this.baseMapper.updateById(tbJcglPzfz);
+    }
+
+    @Override
+    public TbJcglPzfz getInfo(String pzlx) {
+        return this.baseMapper.selectPzlx(pzlx);
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglShabllServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglShabllServiceImpl.java
new file mode 100644
index 0000000..092786e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglShabllServiceImpl.java
@@ -0,0 +1,101 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.dto.jcgl.TbJcglShabllInsertAndEditDto;
+import com.mosty.base.model.entity.jcgl.TbJcglShabll;
+import com.mosty.base.model.query.jcgl.TbJcglShabllQuery;
+import com.mosty.base.manager.mapper.TbJcglShabllMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglShabllService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/1
+ * 社会安保力量服务-实现类
+ **/
+@Service
+public class TbJcglShabllServiceImpl extends ServiceImpl<TbJcglShabllMapper, TbJcglShabll>
+        implements TbJcglShabllService {
+
+    @Resource
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int addEntity(TbJcglShabllInsertAndEditDto dto) {
+        TbJcglShabll shabll = new TbJcglShabll();
+        BeanUtils.copyProperties(dto, shabll);
+        shabll.setId(UUIDGenerator.getUUID());
+        shabll.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            shabll.setSsbm(dept.getDeptname());
+            shabll.setSsbmid(dept.getDeptid());
+            shabll.setSsbmdm(dept.getDeptcode());
+            shabll.setSsxgajdm(dept.getFxjcode());
+            shabll.setSsxgajid(dept.getFxjid());
+            shabll.setSsxgaj(dept.getFxjname());
+            shabll.setSssgaj(dept.getDszname());
+            shabll.setSssgajdm(dept.getDszcode());
+            shabll.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.insert(shabll);
+    }
+
+    @Override
+    public int editEntity(TbJcglShabllInsertAndEditDto dto) {
+        TbJcglShabll shabll = new TbJcglShabll();
+        BeanUtils.copyProperties(dto, shabll);
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(shabll.getSsbmdm());
+        if (dept != null) {
+            shabll.setSsbm(dept.getDeptname());
+            shabll.setSsbmid(dept.getDeptid());
+            shabll.setSsbmdm(dept.getDeptcode());
+            shabll.setSsxgajdm(dept.getFxjcode());
+            shabll.setSsxgajid(dept.getFxjid());
+            shabll.setSsxgaj(dept.getFxjname());
+            shabll.setSssgaj(dept.getDszname());
+            shabll.setSssgajdm(dept.getDszcode());
+            shabll.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(shabll);
+    }
+
+    @Override
+    public IPage<TbJcglShabll> getPageList(TbJcglShabllQuery dto) {
+        IPage<TbJcglShabll> page = PageUtils.buildPage(dto.getPageSize(), dto.getPageCurrent());
+        QueryWrapper<TbJcglShabll> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        qw.lambda().like(StringUtils.isNotBlank(dto.getXm()), TbJcglShabll::getXm, dto.getXm())
+                .like(StringUtils.isNotBlank(dto.getSfzh()), TbJcglShabll::getSfzh, dto.getSfzh())
+                .eq(StringUtils.isNotBlank(dto.getAblllx()), TbJcglShabll::getAblllx, dto.getAblllx())
+                .eq(StringUtils.isNotBlank(dto.getXbdm()), TbJcglShabll::getXbdm, dto.getXbdm())
+                .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbJcglShabll::getSsbmdm, dto.getSsbmdm());
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public Integer delEntity(List<String> ids) {
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public TbJcglShabll getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfCyryServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfCyryServiceImpl.java
new file mode 100644
index 0000000..3ab735d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfCyryServiceImpl.java
@@ -0,0 +1,144 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfCyryMapper;
+import com.mosty.base.manager.mapper.TbJcglXfMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfCyryService;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfCyry;
+import com.mosty.base.model.query.jcgl.TbJcglXfCyryQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.IDCardUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.Excel.DictUtils;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfCyryServiceImpl extends ServiceImpl<TbJcglXfCyryMapper, TbJcglXfCyry>
+        implements TbJcglXfCyryService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXfCyry queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfCyry> paginQuery(TbJcglXfCyryQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXfCyry> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXfCyry>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXfCyry::getSsbmdm, query.getSsbmdm())
+                .like(StringUtils.isNotBlank(query.getXm()), TbJcglXfCyry::getXm, query.getXm())
+                .eq(StringUtils.isNotBlank(query.getSfzh()), TbJcglXfCyry::getSfzh, query.getSfzh())
+                .eq(StringUtils.isNotBlank(query.getJg()), TbJcglXfCyry::getJg, query.getJg())
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXfCyry xf) {
+        if (StringUtils.isEmpty(xf.getSfzh())) {
+            throw new BusinessException("身份证不能为空");
+        }
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        //计算籍贯
+        String item = DictUtils.getDictLabelByTypeAndValue(xf.getSfzh().substring(0, 6), "D_BZ_XZQHDM", null);
+        xf.setJg(item);
+        //计算出生日期
+        xf.setCsrq(IDCardUtil.getBirthday(xf.getSfzh()));
+        //性别
+        int gender = Integer.parseInt(xf.getSfzh().substring(16, 17));
+        if (gender % 2 == 1) {
+            xf.setXb("1");
+        } else {
+            xf.setXb("2");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXfCyry xf) {
+        if (StringUtils.isEmpty(xf.getSfzh())) {
+            throw new BusinessException("身份证不能为空");
+        }
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+
+        //计算籍贯
+        String item = DictUtils.getDictLabelByTypeAndValue(xf.getSfzh().substring(0, 6), "D_BZ_XZQHDM", null);
+        xf.setJg(item);
+        //计算出生日期
+        xf.setCsrq(IDCardUtil.getBirthday(xf.getSfzh()));
+        //性别
+        int gender = Integer.parseInt(xf.getSfzh().substring(16, 17));
+        if (gender % 2 == 1) {
+            xf.setXb("1");
+        } else {
+            xf.setXb("2");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(xf);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfDwglServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfDwglServiceImpl.java
new file mode 100644
index 0000000..70249db
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfDwglServiceImpl.java
@@ -0,0 +1,110 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfDwglMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfDwglService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfDwgl;
+import com.mosty.base.model.entity.jcgl.TbJcglXfZg;
+import com.mosty.base.model.query.jcgl.TbJcglXfDwglQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfDwglServiceImpl extends ServiceImpl<TbJcglXfDwglMapper, TbJcglXfDwgl>
+        implements TbJcglXfDwglService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXfDwgl queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfDwgl> paginQuery(TbJcglXfDwglQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXfDwgl> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXfDwgl>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXfDwgl::getSsbmdm, query.getSsbmdm())
+                .like(StringUtils.isNotBlank(query.getDwmc()), TbJcglXfDwgl::getDwmc, query.getDwmc())
+                .eq(StringUtils.isNotBlank(query.getDwfl()), TbJcglXfDwgl::getDwfl, query.getDwfl())
+                .eq(StringUtils.isNotBlank(query.getDwlx()), TbJcglXfDwgl::getDwlx, query.getDwlx())
+                .orderByDesc(TbJcglXfDwgl::getXtCjsj)
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXfDwgl xf) {
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXfDwgl xf) {
+
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(xf);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfNrmbServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfNrmbServiceImpl.java
new file mode 100644
index 0000000..991627d
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfNrmbServiceImpl.java
@@ -0,0 +1,93 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfNrmbMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfNrmbService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfNrmb;
+import com.mosty.base.model.query.jcgl.TbJcglXfNrmbQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfNrmbServiceImpl extends ServiceImpl<TbJcglXfNrmbMapper, TbJcglXfNrmb>
+        implements TbJcglXfNrmbService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXfNrmb queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfNrmb> paginQuery(TbJcglXfNrmbQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXfNrmb> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXfNrmb>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXfNrmb::getSsbmdm, query.getSsbmdm())
+                .like(StringUtils.isNotBlank(query.getNr()), TbJcglXfNrmb::getNr, query.getNr())
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXfNrmb xf) {
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXfNrmb xf) {
+        TbJcglXfNrmb tbJcglXfNrmb = this.baseMapper.selectById(xf.getId());
+        if (ObjectUtils.isNotEmpty(tbJcglXfNrmb)) {
+            tbJcglXfNrmb.setNr(xf.getNr());
+            return this.baseMapper.updateById(xf);
+        }
+        return 0;
+
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfRwServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfRwServiceImpl.java
new file mode 100644
index 0000000..ca156a8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfRwServiceImpl.java
@@ -0,0 +1,111 @@
+package com.mosty.base.manager.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfRwMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfRwService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfRw;
+import com.mosty.base.model.query.jcgl.TbJcglXfRwQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfRwServiceImpl extends ServiceImpl<TbJcglXfRwMapper, TbJcglXfRw>
+        implements TbJcglXfRwService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXfRw queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfRw> paginQuery(TbJcglXfRwQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXfRw> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXfRw>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXfRw::getSsbmdm, query.getSsbmdm())
+                .orderByDesc(TbJcglXfRw::getXtCjsj)
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXfRw xf) {
+        if (StringUtils.isEmpty(xf.getXfids())) {
+            throw new BusinessException("巡访ids 不能为空！");
+        }
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXfRw xf) {
+        if (StringUtils.isEmpty(xf.getXfids())) {
+            throw new BusinessException("巡访ids 不能为空！");
+        }
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(xf);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int i = this.baseMapper.deleteById(id);
+        return i > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (CollectionUtil.isNotEmpty(id)) {
+            int i = this.baseMapper.deleteBatchIds(id);
+            return i > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfServiceImpl.java
new file mode 100644
index 0000000..7f5b8c8
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfServiceImpl.java
@@ -0,0 +1,130 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfServiceImpl extends ServiceImpl<TbJcglXfMapper, TbJcglXf>
+        implements TbJcglXfService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXf queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXf> paginQuery(TbJcglXfQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXf> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXf>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXf::getSsbmdm, query.getSsbmdm())
+                .eq(StringUtils.isNotBlank(query.getXflx()), TbJcglXf::getXflx, query.getXflx())
+                .like(StringUtils.isNotBlank(query.getXfdw()), TbJcglXf::getXfdw, query.getXfdw())
+                .like(StringUtils.isNotBlank(query.getXfmj()), TbJcglXf::getXfzzXm, query.getXfmj())
+                .eq(StringUtils.isNotBlank(query.getRwzt()), TbJcglXf::getRwzt, query.getRwzt())
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbJcglXf::getXfsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbJcglXf::getXfsj, query.getJssj())
+                .orderByDesc(TbJcglXf::getXtCjsj)
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXf xf) {
+
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        xf.setRwzt("1");
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXf xf) {
+
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(xf);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+
+    @Override
+    public List<Map<String, Object>> xfbmtj(TbJcglXfQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        return this.baseMapper.xfbmtj(query);
+    }
+
+
+    @Override
+    public int bacthSb(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            return this.baseMapper.bacthSb(id);
+        }
+        return 0;
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfZgServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfZgServiceImpl.java
new file mode 100644
index 0000000..787fe10
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfZgServiceImpl.java
@@ -0,0 +1,112 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfMapper;
+import com.mosty.base.manager.mapper.TbJcglXfZgMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfService;
+import com.mosty.base.manager.service.TbJcglXfZgService;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.jcgl.TbJcglXfRw;
+import com.mosty.base.model.entity.jcgl.TbJcglXfZg;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.query.jcgl.TbJcglXfZgQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfZgServiceImpl extends ServiceImpl<TbJcglXfZgMapper, TbJcglXfZg>
+        implements TbJcglXfZgService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbJcglXfZg queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfZg> paginQuery(TbJcglXfZgQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbJcglXfZg> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbJcglXfZg>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbJcglXfZg::getSsbmdm, query.getSsbmdm())
+                .eq(StringUtils.isNotBlank(query.getSblx()), TbJcglXfZg::getSblx, query.getSblx())
+                .like(StringUtils.isNotBlank(query.getSbzt()), TbJcglXfZg::getSbzt, query.getSbzt())
+                .ge(StringUtils.isNotBlank(query.getKssj()), TbJcglXfZg::getSbsj, query.getKssj())
+                .le(StringUtils.isNotBlank(query.getJssj()), TbJcglXfZg::getSbsj, query.getJssj())
+                .orderByDesc(TbJcglXfZg::getXtCjsj)
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbJcglXfZg xf) {
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        xf.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(xf);
+    }
+
+    @Override
+    public Integer update(TbJcglXfZg xf) {
+        if (StringUtils.isEmpty(xf.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            xf.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xf.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            xf.setSsbm(dept.getDeptname());
+            xf.setSsbmid(dept.getDeptid());
+            xf.setSsbmdm(dept.getDeptcode());
+            xf.setSsxgajdm(dept.getFxjcode());
+            xf.setSsxgajid(dept.getFxjid());
+            xf.setSsxgaj(dept.getFxjname());
+            xf.setSssgaj(dept.getDszname());
+            xf.setSssgajdm(dept.getDszcode());
+            xf.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(xf);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclSbServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclSbServiceImpl.java
new file mode 100644
index 0000000..a03b003
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclSbServiceImpl.java
@@ -0,0 +1,77 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfclSbMapper;
+import com.mosty.base.manager.service.TbJcglXfclSbService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfclSb;
+import com.mosty.base.model.query.jcgl.TbJcglXfclSbQuery;
+import com.mosty.base.utils.UUIDGenerator;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TbJcglXfclSbServiceImpl extends ServiceImpl<TbJcglXfclSbMapper, TbJcglXfclSb>
+        implements TbJcglXfclSbService {
+    @Override
+    public int addEntity(TbJcglXfclSb dto) {
+        dto.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(dto);
+    }
+
+    @Override
+    public int editEntity(TbJcglXfclSb dto) {
+        return this.baseMapper.updateById(dto);
+    }
+
+    @Override
+    public Integer delEntity(List<String> ids) {
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public TbJcglXfclSb getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public Integer deleteById(String id) {
+        return this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public IPage<TbJcglXfclSb> getXfclSbPage(TbJcglXfclSbQuery dto) {
+        IPage<TbJcglXfclSb> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        return this.baseMapper.selectPage(page, new LambdaQueryWrapper<TbJcglXfclSb>()
+                .like(StringUtils.isNoneBlank(dto.getSbbh()), TbJcglXfclSb::getSbbh, dto.getSbbh())
+                .like(StringUtils.isNoneBlank(dto.getSbmc()), TbJcglXfclSb::getSbmc, dto.getSbmc())
+                .eq(StringUtils.isNoneBlank(dto.getSbFl()), TbJcglXfclSb::getSbFl, dto.getSbFl())
+                .eq(StringUtils.isNoneBlank(dto.getSbPp()), TbJcglXfclSb::getSbPp, dto.getSbPp())
+                .eq(StringUtils.isNoneBlank(dto.getAzwz()), TbJcglXfclSb::getAzwz, dto.getAzwz())
+                .like(StringUtils.isNoneBlank(dto.getSbIpv4()), TbJcglXfclSb::getSbIpv4, dto.getSbIpv4())
+                .like(StringUtils.isNoneBlank(dto.getSbIpv6()), TbJcglXfclSb::getSbIpv6, dto.getSbIpv6())
+                .eq(StringUtils.isNoneBlank(dto.getSfsp()), TbJcglXfclSb::getSfsp, dto.getSfsp())
+                .eq(StringUtils.isNoneBlank(dto.getCId()), TbJcglXfclSb::getCId, dto.getCId())
+        );
+    }
+
+    @Override
+    public List<TbJcglXfclSb> getXfclSbList(TbJcglXfclSbQuery dto) {
+        return this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglXfclSb>()
+                .like(StringUtils.isNoneBlank(dto.getSbbh()), TbJcglXfclSb::getSbbh, dto.getSbbh())
+                .like(StringUtils.isNoneBlank(dto.getSbmc()), TbJcglXfclSb::getSbmc, dto.getSbmc())
+                .eq(StringUtils.isNoneBlank(dto.getSbFl()), TbJcglXfclSb::getSbFl, dto.getSbFl())
+                .eq(StringUtils.isNoneBlank(dto.getSbPp()), TbJcglXfclSb::getSbPp, dto.getSbPp())
+                .eq(StringUtils.isNoneBlank(dto.getAzwz()), TbJcglXfclSb::getAzwz, dto.getAzwz())
+                .like(StringUtils.isNoneBlank(dto.getSbIpv4()), TbJcglXfclSb::getSbIpv4, dto.getSbIpv4())
+                .like(StringUtils.isNoneBlank(dto.getSbIpv6()), TbJcglXfclSb::getSbIpv6, dto.getSbIpv6())
+                .eq(StringUtils.isNoneBlank(dto.getSfsp()), TbJcglXfclSb::getSfsp, dto.getSfsp())
+                .eq(StringUtils.isNoneBlank(dto.getCId()), TbJcglXfclSb::getCId, dto.getCId())
+        );
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclServiceImpl.java
new file mode 100644
index 0000000..979921e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfclServiceImpl.java
@@ -0,0 +1,264 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.TbJcglJyqx;
+import com.mosty.base.model.entity.jcgl.TbJcglXfcl;
+import com.mosty.base.model.query.jcgl.TbJcglXfclQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglSbdwVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.manager.mapper.TbJcglXfclMapper;
+import com.mosty.base.manager.service.TbJcglXfclService;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Collections;
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfclServiceImpl extends ServiceImpl<TbJcglXfclMapper, TbJcglXfcl>
+        implements TbJcglXfclService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final RedisService redisService;
+
+    @Override
+    public IPage<TbJcglXfcl> getXfclList(TbJcglXfclQuery dto) {
+        IPage<TbJcglXfcl> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        QueryWrapper<TbJcglXfcl> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        qw.lambda().likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbJcglXfcl::getSsbmdm, dto.getSsbmdm())
+                .like(StringUtils.isNotBlank(dto.getCph()), TbJcglXfcl::getCph, dto.getCph())
+                .like(StringUtils.isNotBlank(dto.getClpp()), TbJcglXfcl::getClpp, dto.getClpp())
+                .orderByDesc(TbJcglXfcl::getXtCjsj)
+        ;
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public void addXfcl(TbJcglXfcl cl) {
+        List<TbJcglXfcl> tbJcglXfcls = this.baseMapper.selectList(
+                new QueryWrapper<TbJcglXfcl>()
+                        .eq("cph", cl.getCph())
+                        .eq("xt_scbz", 0)
+        );
+        if (tbJcglXfcls.size() > 0) {
+            throw new BusinessException("车牌号重复");
+        } else {
+            cl.setCId(UUIDGenerator.getUUID());
+            if (StringUtils.isNotBlank(cl.getSsbmdm())) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(cl.getSsbmdm());
+                cl.setSsbm(dept.getDeptname());
+                cl.setSsbmid(dept.getDeptid());
+                cl.setSsbmdm(dept.getDeptcode());
+                cl.setSsxgajdm(dept.getFxjcode());
+                cl.setSsxgajid(dept.getFxjid());
+                cl.setSsxgaj(dept.getFxjname());
+                cl.setSssgaj(dept.getDszname());
+                cl.setSssgajdm(dept.getDszcode());
+                cl.setSssgajid(dept.getDszid());
+            }
+            this.baseMapper.insert(cl);
+            if(StringUtils.isNotEmpty(cl.getGpsId())){
+                TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                BeanUtils.copyProperties(cl, vo);
+                vo.setSbbh(cl.getGpsId());
+                vo.setSbmc(cl.getCph());
+                vo.setScode("05");
+                redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+            }
+        }
+    }
+
+    @Override
+    public void updateXfcl(TbJcglXfcl cl) {
+        if (StringUtils.isEmpty(cl.getSsbmdm())) throw new BusinessException("请选择所属部门！！");
+        List<TbJcglXfcl> tbJcglXfcls = this.baseMapper.selectList(
+                new QueryWrapper<TbJcglXfcl>()
+                        .eq("cph", cl.getCph())
+                        .eq("xt_scbz", 0)
+                        .ne("c_id", cl.getCId())
+        );
+        if (tbJcglXfcls.size() > 0) throw new BusinessException("车牌号重复");
+        if (StringUtils.isNotBlank(cl.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(cl.getSsbmdm());
+            cl.setSsbm(dept.getDeptname());
+            cl.setSsbmid(dept.getDeptid());
+            cl.setSsbmdm(dept.getDeptcode());
+            cl.setSsxgajdm(dept.getFxjcode());
+            cl.setSsxgajid(dept.getFxjid());
+            cl.setSsxgaj(dept.getFxjname());
+            cl.setSssgaj(dept.getDszname());
+            cl.setSssgajdm(dept.getDszcode());
+            cl.setSssgajid(dept.getDszid());
+        }
+        cl.setXtSjly("1");
+        this.baseMapper.updateById(cl);
+        if(StringUtils.isNotEmpty(cl.getGpsId())){
+            cl.setJyqx(null);
+            TbJcglSbdwVo vo = new TbJcglSbdwVo();
+            BeanUtils.copyProperties(cl, vo);
+            vo.setSbbh(cl.getGpsId());
+            vo.setSbmc(cl.getCph());
+            vo.setScode("05");
+            redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+        }
+    }
+
+    @Override
+    public boolean deleteXfcl(List<String> id) {
+        //批量注销
+        TbJcglXfcl tbJcglXfcl = new TbJcglXfcl();
+        tbJcglXfcl.setXtScbz("1");
+        if (id.size() > 0) {
+            this.baseMapper.deleteZb(id);
+        }
+        return true;
+    }
+
+    @Override
+    public TbJcglXfcl selectClxq(String id) {
+        return this.baseMapper.selectOne(new QueryWrapper<TbJcglXfcl>().eq("c_id", id));
+    }
+
+    @Override
+    public String importData(List<TbJcglXfcl> xfclList, boolean updateSupport) {
+        if (CollectionUtils.isEmpty(xfclList)) {
+            throw new BusinessException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TbJcglXfcl xfcl : xfclList) {
+            try {
+                if (StringUtils.isEmpty(xfcl.getSsbmdm())
+                        || StringUtils.isEmpty(xfcl.getCph())
+                        || StringUtils.isEmpty(xfcl.getCplx())
+                        || ObjectUtils.isEmpty(xfcl.getGmrq())
+                        || ObjectUtils.isEmpty(xfcl.getBfrq())
+                ) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、车辆: " + xfcl.getCph() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                TbJcglXfcl cl = this.baseMapper.selectOne(
+                        new QueryWrapper<TbJcglXfcl>()
+                                .eq("cph", xfcl.getCph())
+                                .eq("cplx", xfcl.getCplx())
+                                .last(" limit 1")
+                );
+
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfcl.getSsbmdm());
+                if (ObjectUtils.isNotEmpty(dept)) {
+                    xfcl.setSsbm(dept.getDeptname());
+                    xfcl.setSsbmid(dept.getDeptid());
+                    xfcl.setSsbmdm(dept.getDeptcode());
+                    xfcl.setSsxgajdm(dept.getFxjcode());
+                    xfcl.setSsxgajid(dept.getFxjid());
+                    xfcl.setSsxgaj(dept.getFxjname());
+                    xfcl.setSssgaj(dept.getDszname());
+                    xfcl.setSssgajdm(dept.getDszcode());
+                    xfcl.setSssgajid(dept.getDszid());
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、所属部门编码不存在 " + xfcl.getSsbmdm() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                xfcl.setXtSjzt("1");
+                xfcl.setXtScbz("0");
+                xfcl.setZbzt("1");
+            if (ObjectUtils.isEmpty(cl)) {
+                if (StringUtils.isEmpty(xfcl.getClnk())) {
+                    xfcl.setClnk(DateUtils.getSystemYearString());
+                }
+                xfcl.setCId(UUIDGenerator.getUUID());
+                this.baseMapper.insert(xfcl);
+                if(StringUtils.isNotEmpty(xfcl.getGpsId())){
+                    TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                    BeanUtils.copyProperties(xfcl, vo);
+                    vo.setSbbh(xfcl.getGpsId());
+                    vo.setSbmc(xfcl.getCph());
+                    vo.setScode("05");
+                    redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                }
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、车辆 " + xfcl.getCph() + " 导入成功");
+            }else if (updateSupport) {
+                xfcl.setCId(cl.getCId());
+                this.baseMapper.updateById(xfcl);
+                if(StringUtils.isNotEmpty(xfcl.getGpsId())){
+                    xfcl.setJyqx(null);
+                    TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                    BeanUtils.copyProperties(xfcl, vo);
+                    vo.setSbbh(xfcl.getGpsId());
+                    vo.setSbmc(xfcl.getCph());
+                    vo.setScode("05");
+                    redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                }
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、车辆 " + xfcl.getCph() + " 更新成功");
+            }else {
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、车辆 " + xfcl.getCph() + " 已存在");
+            }
+        } catch (Exception e) {
+            failureNum++;
+            String msg = "<br/>" + failureNum + "、车辆 " + xfcl.getCph() + " 导入失败：";
+            failureMsg.append(msg + e.getMessage());
+            log.error(msg, e);
+        }
+
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    @Override
+    public Page<TbJcglXfcl> selectXfclList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        LambdaQueryWrapper<TbJcglXfcl> wrapper = new LambdaQueryWrapper<TbJcglXfcl>().eq(TbJcglXfcl::getXtSjzt, "1");
+        //本部门
+        if ("1".equals(dto.getType())) {
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglXfcl::getCph, dto.getKeyword())
+                    .eq(TbJcglXfcl::getSsbmdm, user.getDeptCode())
+            ;
+        } else {
+            String ssbmdm = tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglXfcl::getSsbmdm, ssbmdm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbJcglXfcl::getCph, dto.getKeyword())
+                                    .or()
+                                    .like(TbJcglXfcl::getSsbm, dto.getKeyword())
+                    );
+        }
+        return this.baseMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+    }
+}
+
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllBqServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllBqServiceImpl.java
new file mode 100644
index 0000000..c3b8853
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllBqServiceImpl.java
@@ -0,0 +1,29 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllBq;
+import com.mosty.base.manager.mapper.TbJcglXfllbqMapper;
+import com.mosty.base.manager.service.TbJcglXfllBqService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表服务接口
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglXfllBqServiceImpl extends ServiceImpl<TbJcglXfllbqMapper, TbJcglXfllBq> implements TbJcglXfllBqService {
+
+    private final TbJcglXfllbqMapper tbJcglXfllbqMapper;
+
+    public void remove(String xfll_id, String bq_id) {
+        LambdaUpdateWrapper<TbJcglXfllBq> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(TbJcglXfllBq::getXfllId, xfll_id);
+        updateWrapper.eq(TbJcglXfllBq::getBqId, bq_id);
+        tbJcglXfllbqMapper.delete(updateWrapper);
+    }
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllFzServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllFzServiceImpl.java
new file mode 100644
index 0000000..e2df7fb
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllFzServiceImpl.java
@@ -0,0 +1,15 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfllFzMapper;
+import com.mosty.base.manager.service.TbJcglXfllFzService;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllFz;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@AllArgsConstructor
+@Service
+public class TbJcglXfllFzServiceImpl extends ServiceImpl<TbJcglXfllFzMapper, TbJcglXfllFz> implements TbJcglXfllFzService {
+
+
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllServiceImpl.java
new file mode 100644
index 0000000..7e74d36
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfllServiceImpl.java
@@ -0,0 +1,549 @@
+package com.mosty.base.manager.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllSearchQuery;
+import com.mosty.base.model.dto.jcgl.TbJcglZyjzSearchDto;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.qwzx.TbQwZbbb;
+import com.mosty.base.model.entity.rzzx.TbRzSpbf;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.IDCardUtil;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglXfllBqVo;
+import com.mosty.base.model.vo.jcgl.TbJcglZyjz;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBq;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.jcgl.TbJcglXfllBq;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQuery;
+import com.mosty.base.model.vo.jcgl.TbJcglXfllVo;
+import com.mosty.base.manager.mapper.TbJcglBqMapper;
+import com.mosty.base.manager.mapper.TbJcglXfllMapper;
+import com.mosty.base.manager.mapper.TbJcglXfllbqMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfllService;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 巡防力量表;(tb_jcgl_xfll)表服务实现类
+ *
+ * @author : Lhh
+ * @date : 2022-6-4
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglXfllServiceImpl extends ServiceImpl<TbJcglXfllMapper, TbJcglXfll> implements TbJcglXfllService {
+
+    private final TbJcglXfllMapper tbJcglXfllMapper;
+    private final TbJcglBqMapper tbJcglBqMapper;
+    private final TbJcglXfllbqMapper tbJcglXfllbqMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final SysRoleService sysRoleService;
+
+
+    @Override
+    public IPage<TbJcglXfllVo> getList(TbJcglXfllQuery tbJcglXfll) {
+//        UserInfo userInfo = UserInfoManager.get();
+        tbJcglXfll.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbJcglXfll.getSsbmdm(), null));
+        IPage<TbJcglXfll> page = PageUtils.buildPage(tbJcglXfll.getPageSize(), tbJcglXfll.getPageCurrent());
+        if (StringUtils.isEmpty(tbJcglXfll.getXtSjzt())) {
+            tbJcglXfll.setXtSjzt("1");
+        }
+        return tbJcglXfllMapper.getList(page, tbJcglXfll);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(TbJcglXfllDto dto) {
+        if (this.cheskXfll(dto.getSfzh())) {
+            throw new BusinessException("身份证号已存在" + dto.getSfzh());
+        }
+        TbJcglXfll tbJcglXfll = new TbJcglXfll();
+        BeanUtil.copyProperties(dto, tbJcglXfll);
+        tbJcglXfll.setXtSjly("1");
+        if (!StringUtils.isEmpty(dto.getSsbmdm())) {
+            perfectDept(tbJcglXfll);
+        }
+        tbJcglXfllMapper.insert(tbJcglXfll);
+        if (Objects.nonNull(dto.getBqId()) && dto.getBqId().size() > 0) {
+            dto.getBqId().forEach(e -> {
+                TbJcglXfllBq tbJcglXfllbq = new TbJcglXfllBq();
+                tbJcglXfllbq.setXfllId(tbJcglXfll.getId());
+                tbJcglXfllbq.setXtSjly("1");
+                tbJcglXfllbq.setBqlx("SKL");
+                tbJcglXfllbq.setBqId(e);
+                tbJcglXfllbqMapper.insert(tbJcglXfllbq);
+            });
+        }
+    }
+
+    private void deleteSklbq(String id) {
+        LambdaUpdateWrapper<TbJcglXfllBq> deleteWrapper = new LambdaUpdateWrapper<>();
+        deleteWrapper.eq(TbJcglXfllBq::getBqlx, "SKL");
+        deleteWrapper.eq(TbJcglXfllBq::getXfllId, id);
+        tbJcglXfllbqMapper.delete(deleteWrapper);
+    }
+
+    /**
+     * 验证巡防力量人员是否重复
+     *
+     * @param idCard
+     * @return
+     */
+    @Override
+    public boolean cheskXfll(String idCard) {
+        LambdaQueryWrapper<TbJcglXfll> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TbJcglXfll::getSfzh, idCard);
+        Integer integer = tbJcglXfllMapper.selectCount(lambdaQueryWrapper);
+        if (integer > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void lzList(List<String> list) {
+        if (!CollectionUtils.isEmpty(list)) {
+            for (String item : list) {
+                TbJcglXfll tbJcglXfll = this.baseMapper.selectById(item);
+                if (ObjectUtils.isNotEmpty(tbJcglXfll)) {
+                    tbJcglXfll.setXtSjzt("0");
+                    this.baseMapper.updateById(tbJcglXfll);
+                }
+            }
+        }
+    }
+
+
+    @Override
+    public Object deleteList(List<String> list) {
+        if (list.size() > 0) {
+            tbJcglXfllMapper.deleteList(list);
+            for (String id : list) {
+                LambdaQueryWrapper<TbJcglXfllBq> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(TbJcglXfllBq::getXfllId, id);
+                List<TbJcglXfllBq> bqs = tbJcglXfllbqMapper.selectList(queryWrapper);
+                if (!CollectionUtils.isEmpty(bqs)) {
+                    List<Integer> ids = new ArrayList<>();
+                    for (TbJcglXfllBq bq : bqs) {
+                        ids.add(bq.getId());
+                    }
+                    tbJcglXfllbqMapper.deleteBatchIds(ids);
+                }
+            }
+
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> querySfzh() {
+        LambdaQueryWrapper<TbJcglXfll> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TbJcglXfll::getXtScbz, "0");
+        List<TbJcglXfll> list = tbJcglXfllMapper.selectList(queryWrapper);
+        return list.stream().map(TbJcglXfll::getSfzh).collect(Collectors.toList());
+    }
+
+    @Override
+    public Object selectAllPolice(TbJcglXfllDto tbJcglXfllDto) {
+        tbJcglXfllDto.setSsbm(this.tbBaseAdaptRemoteService.getSsbm(tbJcglXfllDto.getSsbm(), null));
+
+//        UserInfo userInfo = UserInfoManager.get();
+        //所有警力
+        Map<String, Integer> integerMap = tbJcglXfllMapper.selectAllPolice(tbJcglXfllDto);
+        //民警所有警力,在岗警力
+        Map<String, Integer> police = tbJcglXfllMapper.selectPolice(tbJcglXfllDto);
+        //辅警所有警力,在岗警力
+        Map<String, Integer> auxPolice = tbJcglXfllMapper.selectAuxPolice(tbJcglXfllDto);
+        //可抽调-所有警力-(报备的警力+值班警力+请假警力)
+
+        //街面警力
+
+        //请休假
+
+        integerMap.put("allPoilce", police.get("allPoilce"));
+        integerMap.put("onAllPoilce", police.get("onAllPoilce"));
+        integerMap.put("allAuxPoilce", auxPolice.get("allAuxPoilce"));
+        integerMap.put("onAllAuxPoilce", auxPolice.get("onAllAuxPoilce"));
+        return integerMap;
+    }
+
+    @Override
+    public List<com.mosty.base.model.dto.jcgl.TbJcglXfllVo> getFjList(String deptid) {
+        List<String> deptList = this.tbBaseAdaptRemoteService.getChildDept(deptid);
+        List<TbJcglXfll> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getXtSjzt, "1")
+                        .in(TbJcglXfll::getSsbmid, deptList)
+                        .eq(TbJcglXfll::getFl, "02")
+        );
+        List<com.mosty.base.model.dto.jcgl.TbJcglXfllVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            com.mosty.base.model.dto.jcgl.TbJcglXfllVo vo =
+                    new com.mosty.base.model.dto.jcgl.TbJcglXfllVo();
+            BeanUtil.copyProperties(item, vo);
+            rList.add(vo);
+        });
+        return rList;
+    }
+
+    @Override
+    public IPage<TbJcglZyjz> getZyjzList(TbJcglZyjzSearchDto dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        List<TbJcglZyjz> list = this.baseMapper.getxfllList(map);
+        int count = this.baseMapper.getxfllCount(map);
+        list.forEach(zyjz -> {
+            // 查询标签
+            List<TbJcglXfllBq> bqList = this.tbJcglXfllbqMapper.selectList(
+                    new LambdaQueryWrapper<TbJcglXfllBq>()
+                            .eq(TbJcglXfllBq::getXtSjzt, "1")
+                            .eq(TbJcglXfllBq::getXfllId, zyjz.getId())
+            );
+            List<TbJcglXfllBqVo> voList = new ArrayList<>();
+            bqList.forEach(bq -> {
+                TbJcglXfllBqVo vo = new TbJcglXfllBqVo();
+                BeanUtils.copyProperties(bq, vo);
+                // 查询标签名称
+                TbJcglBq q = this.tbJcglBqMapper.selectById(bq.getBqId());
+                if (q != null) {
+                    vo.setBqmc(q.getBqmc());
+                }
+                voList.add(vo);
+            });
+            zyjz.setBqList(voList);
+        });
+        IPage<TbJcglZyjz> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<TbJcglXfllVo> getXfll(TbJcglXfllQueryAllDto dto) {
+//        List<String> deptList = this.tbBaseAdaptRemoteService.getChildDept(dto.getDeptid());
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+        List<TbJcglXfll> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getXtSjzt, "1")
+                        .eq(!StringUtils.isEmpty(dto.getFl()), TbJcglXfll::getFl, dto.getFl())
+                        .likeRight(!StringUtils.isEmpty(ssbm), TbJcglXfll::getSsbmdm, ssbm)
+        );
+        List<TbJcglXfllVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbJcglXfllVo vo = new TbJcglXfllVo();
+            BeanUtil.copyProperties(item, vo);
+            rList.add(vo);
+        });
+        return rList;
+    }
+
+    @Override
+    public IPage<TbJcglXfllVo> getXfllList(TbJcglXfllSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        if ("1".equals(dto.getType())) {
+            return this.getXfllByDeptId(dto, user.getDeptCode());
+        } else {
+            return this.getXfllByDeptIdAll(dto);
+        }
+    }
+
+    @Override
+    public TbJcglXfllDto getXfllBySfz(String sfzh) {
+        TbJcglXfll xfll = this.tbJcglXfllMapper.selectOne(
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getSfzh, sfzh)
+                        .eq(TbJcglXfll::getXtSjzt, "1")
+                        .last(" limit 1")
+        );
+        if (xfll != null) {
+            TbJcglXfllDto vo = new TbJcglXfllDto();
+            BeanUtils.copyProperties(xfll, vo);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public IPage<TbJcglXfllVo> getXfllPage(TbJcglXfllQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbJcglXfll> page = PageUtils.buildPage(dto.getPageSize(), dto.getPageCurrent());
+        if (StringUtils.isEmpty(dto.getXtSjzt())) {
+            dto.setXtSjzt("1");
+        }
+        return tbJcglXfllMapper.getList(page, dto);
+    }
+
+    @Override
+    public IPage<TbJcglXfll> getLzPage(TbJcglXfllQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbJcglXfll> page = this.tbJcglXfllMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getXtSjzt, "0")
+                        .eq(!StringUtils.isEmpty(dto.getRyid()), TbJcglXfll::getRyid, dto.getRyid())
+                        .eq(!StringUtils.isEmpty(dto.getFl()), TbJcglXfll::getFl, dto.getFl())
+                        .eq(!StringUtils.isEmpty(dto.getLx()), TbJcglXfll::getLx, dto.getLx())
+                        .like(!StringUtils.isEmpty(dto.getXm()), TbJcglXfll::getXm, dto.getXm())
+                        .eq(!StringUtils.isEmpty(dto.getXbdm()), TbJcglXfll::getXbdm, dto.getXbdm())
+                        .eq(!StringUtils.isEmpty(dto.getSfzh()), TbJcglXfll::getSfzh, dto.getSfzh())
+                        .eq(!StringUtils.isEmpty(dto.getJh()), TbJcglXfll::getJh, dto.getJh())
+                        .eq(!StringUtils.isEmpty(dto.getLxdh()), TbJcglXfll::getLxdh, dto.getLxdh())
+                        .likeRight(!StringUtils.isEmpty(dto.getSsbmdm()), TbJcglXfll::getSsbmdm, dto.getSsbmdm())
+
+        );
+        return page;
+    }
+
+    @Override
+    public Map<String, Object> getRytj(String ssbmdm) {
+        Map<String, Object> map = new HashMap<>();
+        ssbmdm = tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        List<TbJcglXfll> xfllList = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglXfll>()
+                .likeRight(TbJcglXfll::getSsbmdm, ssbmdm)
+        );
+        int mj = 0;
+        int fj = 0;
+        if (!CollectionUtils.isEmpty(xfllList)) {
+            mj = xfllList.stream().filter(s -> s.getFl().equals("01")).collect(Collectors.toList()).size();
+            fj = xfllList.stream().filter(s -> s.getFl().equals("02")).collect(Collectors.toList()).size();
+        }
+        map.put("mj", mj);
+        map.put("fj", fj);
+        return map;
+    }
+
+
+    @Override
+    public List<TbJcglXfll> getBmAll() {
+        List<TbJcglXfll> tbJcglXflls = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglXfll>().first("SELECT DISTINCT ssbmdm from ( ").last(" ) a "));
+        return tbJcglXflls;
+    }
+
+    @Override
+    public List<TbJcglXfll> export() {
+        List<TbJcglXfll> tbJcglXflls = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglXfll>().last(" limit 10 "));
+        return tbJcglXflls;
+    }
+
+
+    @Override
+    public String importData(List<TbJcglXfll> userList, boolean updateSupport) {
+        if (CollectionUtils.isEmpty(userList)) {
+            throw new BusinessException("导入用户数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TbJcglXfll xfll : userList) {
+            try {
+                if (StringUtils.isEmpty(xfll.getLxdh())
+                        || StringUtils.isEmpty(xfll.getXm())
+                        || StringUtils.isEmpty(xfll.getSsbmdm())
+                        || StringUtils.isEmpty(xfll.getJh())
+                        || StringUtils.isEmpty(xfll.getSfzh())
+                ) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、账号 " + xfll.getXm() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                //验证是否存在这个用户
+                TbJcglXfll u = this.baseMapper.selectOne(new LambdaQueryWrapper<TbJcglXfll>().eq(TbJcglXfll::getSfzh, xfll.getSfzh()).last(" limit 1"));
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfll.getSsbmdm());
+                if (ObjectUtils.isNotEmpty(dept)) {
+                    xfll.setSsbm(dept.getDeptname());
+                    xfll.setSsbmid(dept.getDeptid());
+                    xfll.setSsbmdm(dept.getDeptcode());
+                    xfll.setSsxgajdm(dept.getFxjcode());
+                    xfll.setSsxgajid(dept.getFxjid());
+                    xfll.setSsxgaj(dept.getFxjname());
+                    xfll.setSssgaj(dept.getDszname());
+                    xfll.setSssgajdm(dept.getDszcode());
+                    xfll.setSssgajid(dept.getDszid());
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、所属部门编码不存在 " + xfll.getSsbmdm() + " ,请仔细核查！");
+                    continue;
+                }
+                xfll.setXtSjzt("1");
+                xfll.setXtScbz("0");
+                xfll.setFl("02");
+                xfll.setLx("02");
+                xfll.setXbdm(String.valueOf(IDCardUtil.getSexInteger(xfll.getSfzh())));
+
+                if (ObjectUtils.isEmpty(u)) {
+                    xfll.setCsrq(DateUtils.strToDate(IDCardUtil.getBirthday(xfll.getSfzh()), "01"));
+                    xfll.setId(UUIDGenerator.getUUID());
+                    this.baseMapper.insert(xfll);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、账号 " + xfll.getXm() + " 导入成功");
+                } else if (updateSupport) {
+                    xfll.setId(u.getId());
+                    this.baseMapper.updateById(xfll);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、账号 " + xfll.getXm() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、账号 " + xfll.getXm() + " 已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、账号 " + xfll.getXm() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    @Override
+    public Integer getRysl(String ssbmdm) {
+        QueryWrapper<TbJcglXfll> tb = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtilByDeptInfo(tb, sysDeptLevel);
+        ssbmdm = tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        tb.lambda().likeRight(TbJcglXfll::getSsbmdm, ssbmdm);
+        return this.baseMapper.selectCount(tb);
+    }
+
+    // 查询部门的所有的巡防力量
+    private IPage<TbJcglXfllVo> getXfllByDeptIdAll(TbJcglXfllSearchQuery dto) {
+
+        String ssbmdm = tbBaseAdaptRemoteService.getSsbm(null, null);
+
+        IPage<TbJcglXfll> page = this.tbJcglXfllMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getXtSjzt, "1")
+                        .eq(!StringUtils.isEmpty(dto.getJllx()), TbJcglXfll::getFl, dto.getJllx())
+                        .likeRight(!StringUtils.isEmpty(ssbmdm), TbJcglXfll::getSsbmdm, ssbmdm)
+                        .and(!StringUtils.isEmpty(dto.getKeyword()),
+                                it -> it.like(TbJcglXfll::getXm, dto.getKeyword())
+                                        .or()
+                                        .like(TbJcglXfll::getSsbm, dto.getKeyword())
+                        )
+        );
+        List<TbJcglXfllVo> voList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbJcglXfllVo vo = new TbJcglXfllVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+        }
+        IPage<TbJcglXfllVo> voPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        voPage.setRecords(voList);
+        voPage.setTotal(page.getTotal());
+        return voPage;
+    }
+
+    // 查询本部门的巡防力量
+    private IPage<TbJcglXfllVo> getXfllByDeptId(TbJcglXfllSearchQuery dto, String ssbmdm) {
+        // 查询本部门级下级部门
+//        List<String> deptIds = this.tbBaseAdaptRemoteService.getChildDept(deptId);
+        IPage<TbJcglXfll> page = this.tbJcglXfllMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbJcglXfll>()
+                        .eq(TbJcglXfll::getSsbmdm, ssbmdm)
+                        .eq(TbJcglXfll::getXtSjzt, "1")
+                        .like(!StringUtils.isEmpty(dto.getKeyword()), TbJcglXfll::getXm, dto.getKeyword())
+                        .eq(!StringUtils.isEmpty(dto.getJllx()), TbJcglXfll::getFl, dto.getJllx())
+        );
+        IPage<TbJcglXfllVo> voPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbJcglXfllVo> voList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbJcglXfllVo vo = new TbJcglXfllVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+        }
+        voPage.setTotal(page.getTotal());
+        voPage.setRecords(voList);
+        return voPage;
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(TbJcglXfllDto tbJcglXfllDto) {
+        try {
+            TbJcglXfll tbJcglXfll = new TbJcglXfll();
+            BeanUtil.copyProperties(tbJcglXfllDto, tbJcglXfll);
+            if (!StringUtils.isEmpty(tbJcglXfll.getSsbmdm())) {
+                perfectDept(tbJcglXfll);
+            }
+            tbJcglXfllMapper.updateById(tbJcglXfll);
+            deleteSklbq(tbJcglXfllDto.getId());
+            if (Objects.nonNull(tbJcglXfllDto.getBqId()) && tbJcglXfllDto.getBqId().size() > 0) {
+                tbJcglXfllDto.getBqId().forEach(e -> {
+                    TbJcglXfllBq tbJcglXfllbq = new TbJcglXfllBq();
+                    tbJcglXfllbq.setXfllId(tbJcglXfll.getId());
+                    tbJcglXfllbq.setBqlx("SKL");
+                    tbJcglXfllbq.setXtSjly("1");
+                    tbJcglXfllbq.setBqId(e);
+                    tbJcglXfllbqMapper.insert(tbJcglXfllbq);
+                });
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public TbJcglXfllVo queryById(String id) {
+        return tbJcglXfllMapper.queryById(id);
+    }
+
+    // 部门赋值
+    public void perfectDept(TbJcglXfll xfll) {
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfll.getSsbmdm());
+        if (dept != null) {
+            xfll.setSsbm(dept.getDeptname());
+            xfll.setSsbmid(dept.getDeptid());
+            xfll.setSsbmdm(dept.getDeptcode());
+            xfll.setSsxgajdm(dept.getFxjcode());
+            xfll.setSsxgajid(dept.getFxjid());
+            xfll.setSsxgaj(dept.getFxjname());
+            xfll.setSssgaj(dept.getDszname());
+            xfll.setSssgajdm(dept.getDszcode());
+            xfll.setSssgajid(dept.getDszid());
+        }
+    }
+}
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfqyServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfqyServiceImpl.java
new file mode 100644
index 0000000..691b7e0
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfqyServiceImpl.java
@@ -0,0 +1,415 @@
+package com.mosty.base.manager.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.ImmutableList;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.mosty.base.model.query.jcgl.XfqyQuery;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfqy;
+import com.mosty.base.model.query.jcgl.TbJcglXfqyQuery;
+import com.mosty.base.manager.mapper.TbJcglXfqyMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfqyService;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author zengbo
+ * @since 2022-07-14
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglXfqyServiceImpl extends ServiceImpl<TbJcglXfqyMapper, TbJcglXfqy>
+        implements TbJcglXfqyService {
+
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+
+    @Override
+    @Transactional
+    public int addXfqy(TbJcglXfqyDto xfqy) {
+        TbJcglXfqy item = new TbJcglXfqy();
+        BeanUtils.copyProperties(xfqy, item);
+        if (xfqy.getJd() != null && xfqy.getWd() != null) {
+            item.setZxd(JtsUtils.getPoint(xfqy.getJd(), xfqy.getWd()));
+            item.setZbhash(GeoHashKit.encode(xfqy.getJd(), xfqy.getWd()));
+        }
+        if (!CollectionUtils.isEmpty(xfqy.getPgis())) item.setPgis(JtsUtils.getPolygon(xfqy.getPgis()));
+        item.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(xfqy.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        item.setXtSjly("1");
+        int ret = this.baseMapper.insertEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(item.getId());
+        ysGajgDto.setLybm("tb_jcgl_xfqy");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001006");
+        ysGajgDto.setGajgmc(item.getXfqMc());
+        ysGajgDto.setGajgjc(item.getXfqMc());
+        ysGajgDto.setJd(item.getJd());
+        ysGajgDto.setWd(item.getWd());
+        // 设置巡防区域面积
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(xfqy.getPgis())) {
+            xfqy.getPgis().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmdm(item.getSsbmdm());
+        ysGajgDto.setSsbmid(item.getSsbmid());
+        ysGajgDto.setBz(xfqy.getXfbmlx());
+        ysGajgDto.setColor(xfqy.getColor());
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    public IPage<TbJcglXfqyDto> getXfqy(TbJcglXfqyQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        UserInfo userInfo = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", userInfo);
+        IPage<TbJcglXfqyDto> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", useSql);
+        int count = this.baseMapper.getCount(map);
+        List<TbJcglXfqy> list = this.baseMapper.getPageList(map);
+        List<TbJcglXfqyDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbJcglXfqyDto vo = new TbJcglXfqyDto();
+            BeanUtils.copyProperties(item, vo);
+            if (item.getPgis() != null) vo.setPgis(JtsUtils.decodePolygon(item.getPgis()));
+            rList.add(vo);
+        });
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public int editXfqy(TbJcglXfqyDto xfqy) {
+        TbJcglXfqy item = new TbJcglXfqy();
+        BeanUtils.copyProperties(xfqy, item);
+        if (xfqy.getJd() != null && xfqy.getWd() != null) {
+            item.setZxd(JtsUtils.getPoint(xfqy.getJd(), xfqy.getWd()));
+            item.setZbhash(GeoHashKit.encode(xfqy.getJd(), xfqy.getWd()));
+        }
+        if (!CollectionUtils.isEmpty(xfqy.getPgis())) item.setPgis(JtsUtils.getPolygon(xfqy.getPgis()));
+        if (StringUtils.isNotBlank(xfqy.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            item.setSsbm(dept.getDeptname());
+            item.setSsbmid(dept.getDeptid());
+            item.setSsbmdm(dept.getDeptcode());
+            item.setSsxgajdm(dept.getFxjcode());
+            item.setSsxgajid(dept.getFxjid());
+            item.setSsxgaj(dept.getFxjname());
+            item.setSssgaj(dept.getDszname());
+            item.setSssgajdm(dept.getDszcode());
+            item.setSssgajid(dept.getDszid());
+        }
+        int ret = this.baseMapper.updateEntity(item);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(item.getId());
+        ysGajgDto.setLybm("tb_jcgl_xfqy");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001006");
+        ysGajgDto.setGajgmc(item.getXfqMc());
+        ysGajgDto.setGajgjc(item.getXfqMc());
+        ysGajgDto.setJd(item.getJd());
+        ysGajgDto.setWd(item.getWd());// 设置巡防区域面积
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(xfqy.getPgis())) {
+            xfqy.getPgis().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        ysGajgDto.setSsbm(item.getSsbm());
+        ysGajgDto.setSsbmdm(item.getSsbmdm());
+        ysGajgDto.setSsbmid(item.getSsbmid());
+        ysGajgDto.setBz(xfqy.getXfbmlx());
+        ysGajgDto.setColor(xfqy.getColor());
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    @Transactional
+    public int deleteXfqy(List<String> list) {
+        int ret = this.baseMapper.deleteBatch(list);
+        for (String s : list) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_xfqy");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+        return ret;
+    }
+
+    @Override
+    public TbJcglXfqyDto selectById(String id) {
+        TbJcglXfqy item = this.baseMapper.getById(id);
+        if (item != null) {
+            TbJcglXfqyDto vo = new TbJcglXfqyDto();
+            BeanUtils.copyProperties(item, vo);
+            if (item.getPgis() != null) vo.setPgis(JtsUtils.decodePolygon(item.getPgis()));
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public Page<TbJcglXfqy> getXfqList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        LambdaQueryWrapper<TbJcglXfqy> wrapper = new LambdaQueryWrapper<TbJcglXfqy>()
+                .eq(TbJcglXfqy::getXtSjzt, "1");
+        if ("1".equals(dto.getType())) {
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglXfqy::getXfqMc, dto.getKeyword())
+                    .eq(TbJcglXfqy::getSsbmdm, String.valueOf(user.getDeptCode()));
+        } else {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbm), TbJcglXfqy::getSsbmdm, ssbm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbJcglXfqy::getXfqMc, dto.getKeyword())
+                                    .or()
+                                    .like(TbJcglXfqy::getSsbm, dto.getKeyword())
+                    );
+        }
+        Page<TbJcglXfqy> tbJcglXfqyPage = this.baseMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+        if (ObjectUtils.isNotEmpty(tbJcglXfqyPage) && !CollectionUtils.isEmpty(tbJcglXfqyPage.getRecords())) {
+            tbJcglXfqyPage.getRecords().forEach(item -> {
+                item.setZxd(null);
+                item.setPgis(null);
+            });
+        }
+        return tbJcglXfqyPage;
+    }
+
+    /**
+     * 泸州态势统计-各区县重点巡防区域
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, Object> getZdxfqy(XfqyQuery dto) {
+        HashMap<Object, Object> ssxgajxx = new HashMap<>();
+        ssxgajxx.put("10111", "泸州机场");
+        ssxgajxx.put("10929", "江阳区");
+        ssxgajxx.put("11336", "龙马潭区");
+        ssxgajxx.put("11379", "纳溪区");
+        ssxgajxx.put("11382", "泸县");
+        ssxgajxx.put("11436", "合江县");
+        ssxgajxx.put("11503", "叙永县");
+        ssxgajxx.put("11531", "古蔺县");
+
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) { // 为空的提示
+            throw new BusinessException("请选择您要查询时间！");
+        }
+        Map<String, Object> map = new HashMap<>();
+        // 巡防总数
+        List<Map<String, Object>> sfzs = this.baseMapper.getSfzs();
+        // 巡防重点数
+        List<Map<String, Object>> sfzd = this.baseMapper.getSfzd(dto.getKssj(), dto.getJssj());
+
+        List<Map<String, Object>> sfzsResList = new ArrayList<>();
+        List<Map<String, Object>> sfzdResList = new ArrayList<>();
+        ssxgajxx.keySet().forEach(item -> {
+            Map<String, Object> resMap = new HashMap<>();
+            // 巡防总数
+            List<Map<String, Object>> sfzsList = sfzs.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (sfzsList.size() == 1) {
+                resMap.put("count", sfzsList.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            sfzsResList.add(resMap);
+
+            // 巡防重点数
+            resMap = new HashMap<>();
+            List<Map<String, Object>> sfzdList = sfzd.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (sfzdList.size() == 1) {
+                resMap.put("count", sfzdList.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            sfzdResList.add(resMap);
+        });
+
+        map.put("sfzsResList", sfzsResList);
+        map.put("sfzdResList", sfzdResList);
+        return map;
+    }
+
+
+    @Override
+    public List<TbJcglXfqyDto> getListAll() {
+        List<TbJcglXfqy> list = this.baseMapper.getListAll();
+        List<TbJcglXfqyDto> rList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(item -> {
+                TbJcglXfqyDto vo = new TbJcglXfqyDto();
+                BeanUtils.copyProperties(item, vo);
+                if (item.getPgis() != null) vo.setPgis(JtsUtils.decodePolygon(item.getPgis()));
+                rList.add(vo);
+            });
+        }
+        return rList;
+    }
+
+    /**
+     * 泸州态势统计-警情与重点区域巡逻对比分析
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, Object> getJqandQyxf(XfqyQuery dto) {
+        if (com.mosty.common.base.util.StringUtils.isEmpty(dto.getKssj()) || com.mosty.common.base.util.StringUtils.isEmpty(dto.getJssj())) {
+            throw new BusinessException("请选择查询时间");
+        }
+        Map<String, Object> map = new HashMap<>();
+        if (dto.getKssj().equals(dto.getJssj())) {
+            // 查询警情数据
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTj(dto.getKssj());
+            // 重点区域巡防次数
+            List<Map<String, Object>> sfzdList = this.baseMapper.getSfzd(dto.getKssj(), dto.getJssj());
+            List<String> timeList = ImmutableList.of("00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
+                    "10", "11", "12", "13", "14", "15", "16", "17",
+                    "18", "19", "20", "21", "22", "23");
+            timeList.forEach(item -> {
+                boolean jqFlag = false;
+                boolean sfzdFlase = false;
+                for (Map<String, Object> jq : jqList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : sfzdList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        sfzdFlase = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!sfzdFlase) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    sfzdList.add(mp);
+                }
+            });
+            jqList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            sfzdList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("sfzdList", sfzdList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        } else {
+            // 警情
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTjByTime(dto.getKssj(), dto.getJssj());
+            // 重点区域巡防次数
+            List<Map<String, Object>> sfzdList = this.baseMapper.getXfzdByTime(dto.getKssj(), dto.getJssj());
+            Date kssj = DateUtils.strToDate(dto.getKssj(), "01");
+            Date jssj = DateUtils.strToDate(dto.getJssj(), "01");
+            while (kssj.getTime() <= jssj.getTime()) {
+                boolean jqFlag = false;
+                boolean xfzdFlag = false;
+                for (Map<String, Object> item : jqList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : sfzdList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        xfzdFlag = true;
+                    }
+                }
+                if (!xfzdFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    sfzdList.add(mp);
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                kssj = DateUtils.getNextDate(kssj, "D", 1);
+            }
+            jqList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            sfzdList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("sfzdList", sfzdList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        }
+        return map;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfwgServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfwgServiceImpl.java
new file mode 100644
index 0000000..db8a1ec
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXfwgServiceImpl.java
@@ -0,0 +1,194 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfwgInsertDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfwg;
+import com.mosty.base.model.query.jcgl.TbJcglXfwgQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.manager.mapper.TbJcglXfwgMapper;
+import com.mosty.base.manager.remote.TbYsZxAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglXfwgService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @title: TbJcglXfwgServiceImpl
+ * @projectName mosty-rzzx
+ * @date 2022/7/14 20:33
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglXfwgServiceImpl implements TbJcglXfwgService {
+
+    private TbJcglXfwgMapper tbJcglXfwgMapper;
+    private TbYsZxAdaptRemoteService tbYsZxAdaptRemoteService;
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    @Transactional
+    public int addXfwg(TbJcglXfwgInsertDto dto) {
+        TbJcglXfwg xfwg = new TbJcglXfwg();
+        BeanUtils.copyProperties(dto, xfwg);
+        if (!CollectionUtils.isEmpty(dto.getPgis())) {
+            xfwg.setPgis(JtsUtils.createLine(dto.getPgis()));
+        }
+        xfwg.setXtSjly("1");
+        xfwg.setId(UUIDGenerator.getUUID());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfwg.getSsbmdm());
+        xfwg.setSsbm(dept.getDeptname());
+        xfwg.setSsbmid(dept.getDeptid());
+        xfwg.setSsbmdm(dept.getDeptcode());
+        xfwg.setSsxgajdm(dept.getFxjcode());
+        xfwg.setSsxgajid(dept.getFxjid());
+        xfwg.setSsxgaj(dept.getFxjname());
+        xfwg.setSssgaj(dept.getDszname());
+        xfwg.setSssgajdm(dept.getDszcode());
+        xfwg.setSssgajid(dept.getDszid());
+        int ret = tbJcglXfwgMapper.insertEntity(xfwg);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(xfwg.getId());
+        ysGajgDto.setLybm("tb_jcgl_xfwg");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001010");
+        ysGajgDto.setGajgmc(xfwg.getWgMc());
+        ysGajgDto.setGajgjc(xfwg.getWgMc());
+        ysGajgDto.setWzXzqh(xfwg.getXzqhdm());
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getPgis())) {
+            dto.getPgis().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        ysGajgDto.setSsbm(xfwg.getSsbm());
+        ysGajgDto.setSsbmid(xfwg.getSsbmid());
+        ysGajgDto.setSsbmdm(xfwg.getSsbmdm());
+        tbYsZxAdaptRemoteService.addGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    public IPage<TbJcglXfwgInsertDto> getXfwg(TbJcglXfwgQuery dto) {
+        IPage<TbJcglXfwg> page = PageUtils.buildPage(dto.getPageSize(), dto.getPageCurrent());
+        QueryWrapper<TbJcglXfwg> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        qw.lambda().like(StringUtils.isNotBlank(dto.getWgMc()), TbJcglXfwg::getWgMc, dto.getWgMc())
+                .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbJcglXfwg::getSsbmdm, dto.getSsbmdm())
+                .eq(StringUtils.isNotBlank(dto.getWgBh()), TbJcglXfwg::getWgBh, dto.getWgBh())
+                .eq(StringUtils.isNotBlank(dto.getWglx()), TbJcglXfwg::getWglx, dto.getWglx())
+                .eq(StringUtils.isNotBlank(dto.getSsXfqyId()), TbJcglXfwg::getSsXfqyId, dto.getSsXfqyId())
+                .like(StringUtils.isNotBlank(dto.getPgis()), TbJcglXfwg::getPgis, dto.getPgis())
+                .like(StringUtils.isNotBlank(dto.getXzqhdm()), TbJcglXfwg::getXzqhdm, dto.getXzqhdm())
+                .eq(StringUtils.isNotBlank(dto.getSsbmdm()), TbJcglXfwg::getSsbmdm, dto.getSsbmdm())
+                .eq(StringUtils.isNotBlank(dto.getSsbmid()), TbJcglXfwg::getSsbmid, dto.getSsbmid());
+        page = tbJcglXfwgMapper.selectPage(page, qw);
+        IPage<TbJcglXfwgInsertDto> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbJcglXfwgInsertDto> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbJcglXfwgInsertDto vo = new TbJcglXfwgInsertDto();
+                BeanUtils.copyProperties(item, vo);
+                vo.setPgis(JtsUtils.decodeLineString(item.getPgis()));
+                resList.add(vo);
+            });
+        }
+        resPage.setTotal(page.getTotal());
+        resPage.setRecords(resList);
+        return resPage;
+    }
+
+    @Override
+    @Transactional
+    public int editXfwg(TbJcglXfwgInsertDto dto) {
+        TbJcglXfwg xfwg = new TbJcglXfwg();
+        BeanUtils.copyProperties(dto, xfwg);
+        if (!CollectionUtils.isEmpty(dto.getPgis())) {
+            xfwg.setPgis(JtsUtils.createLine(dto.getPgis()));
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfwg.getSsbmdm());
+        xfwg.setSsbm(dept.getDeptname());
+        xfwg.setSsbmid(dept.getDeptid());
+        xfwg.setSsbmdm(dept.getDeptcode());
+        xfwg.setSsxgajdm(dept.getFxjcode());
+        xfwg.setSsxgajid(dept.getFxjid());
+        xfwg.setSsxgaj(dept.getFxjname());
+        xfwg.setSssgaj(dept.getDszname());
+        xfwg.setSssgajdm(dept.getDszcode());
+        xfwg.setSssgajid(dept.getDszid());
+        int ret = tbJcglXfwgMapper.updateEntity(xfwg);
+        //封装数据
+        TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+        ysGajgDto.setLyid(xfwg.getId());
+        ysGajgDto.setLybm("tb_jcgl_xfwg");
+        ysGajgDto.setYsdl("001");
+        ysGajgDto.setYszl("001001");
+        ysGajgDto.setYsxl("001001010");
+        ysGajgDto.setGajgmc(xfwg.getWgMc());
+        ysGajgDto.setGajgjc(xfwg.getWgMc());
+        ysGajgDto.setWzXzqh(xfwg.getXzqhdm());
+        ysGajgDto.setSsbm(xfwg.getSsbm());
+        ysGajgDto.setSsbmid(xfwg.getSsbmid());
+        ysGajgDto.setSsbmdm(xfwg.getSsbmdm());
+        List<BigDecimal> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(dto.getPgis())) {
+            dto.getPgis().forEach(it -> {
+                list.add(it[0]);
+                list.add(it[1]);
+            });
+        }
+        ysGajgDto.setQy(list);
+        tbYsZxAdaptRemoteService.updateGajg(ysGajgDto);
+        return ret;
+    }
+
+    @Override
+    @Transactional
+    public int deleteXfwg(List<String> list) {
+        int ret = tbJcglXfwgMapper.deleteBatch(list);
+        for (String s : list) {
+            TbYsGajgDto ysGajgDto = new TbYsGajgDto();
+            ysGajgDto.setLyid(s);
+            ysGajgDto.setLybm("tb_jcgl_xfwg");
+            tbYsZxAdaptRemoteService.delEntity(ysGajgDto);
+        }
+        return ret;
+    }
+
+    @Override
+    public TbJcglXfwgInsertDto selectById(String id) {
+        TbJcglXfwg xfwg = tbJcglXfwgMapper.selectById(id);
+        if (xfwg != null) {
+            TbJcglXfwgInsertDto vo = new TbJcglXfwgInsertDto();
+            BeanUtils.copyProperties(xfwg, vo);
+            vo.setPgis(JtsUtils.decodeLineString(xfwg.getPgis()));
+            return vo;
+        }
+        return null;
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXlfaServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXlfaServiceImpl.java
new file mode 100644
index 0000000..fdc918f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXlfaServiceImpl.java
@@ -0,0 +1,175 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglXlfaDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXlfaXldwDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXlfa;
+import com.mosty.base.model.entity.jcgl.TbJcglXlfaXldw;
+import com.mosty.base.model.query.jcgl.TbJcglXlfaQuery;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.manager.mapper.TbJcglXlfaMapper;
+import com.mosty.base.manager.mapper.TbJcglXlfaXldwMapper;
+import com.mosty.base.manager.service.TbJcglXlfaService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/11
+ **/
+@Service
+@AllArgsConstructor
+public class TbJcglXlfaServiceImpl extends ServiceImpl<TbJcglXlfaMapper, TbJcglXlfa> implements TbJcglXlfaService {
+
+    private final TbJcglXlfaXldwMapper tbJcglXlfaXldwMapper;
+
+    @Override
+    @Transactional
+    public int addEntity(TbJcglXlfaDto dto) {
+        TbJcglXlfa fa = new TbJcglXlfa();
+        BeanUtils.copyProperties(dto, fa);
+        fa.setXtSjly("1");
+        UserInfo user = UserInfoManager.get();
+        fa.setId(UUIDGenerator.getUUID());
+        this.saveOther(dto, fa, user);
+        return this.baseMapper.insert(fa);
+    }
+
+    @Override
+    @Transactional
+    public int updateEntity(TbJcglXlfaDto dto) {
+        TbJcglXlfa fa = new TbJcglXlfa();
+        BeanUtils.copyProperties(dto, fa);
+        // 删除字表中的数据
+        this.deleteByFaid(dto.getId());
+        // 重新添加数据
+        this.saveOther(dto, fa, null);
+        return this.baseMapper.updateById(fa);
+    }
+
+    @Override
+    @Transactional
+    public int delEntity(List<String> ids) {
+        if (ids.size() > 0) {
+            ids.forEach(this.tbJcglXlfaXldwMapper::deleteEntity);
+        }
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public IPage<TbJcglXlfaDto> getPageList(TbJcglXlfaQuery dto) {
+        IPage<TbJcglXlfa> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page = this.baseMapper.selectPage(page,
+                new LambdaQueryWrapper<TbJcglXlfa>()
+                        .like(!StringUtils.isEmpty(dto.getFamc()), TbJcglXlfa::getFamc, dto.getFamc())
+                        .eq(!StringUtils.isEmpty(dto.getZxzq()), TbJcglXlfa::getZxzq, dto.getZxzq())
+                        .like(!StringUtils.isEmpty(dto.getZxms()), TbJcglXlfa::getZxms, dto.getZxms())
+                        .eq(dto.getZxksyr() != null, TbJcglXlfa::getZxksyr, dto.getZxksyr())
+                        .eq(dto.getZxxq() != null, TbJcglXlfa::getZxxq, dto.getZxxq())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbJcglXlfa::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbJcglXlfa::getSsbmid, dto.getSsbmid()));
+        List<TbJcglXlfa> faList = page.getRecords();
+        List<TbJcglXlfaDto> dtoList = new ArrayList<>();
+        faList.forEach(item -> {
+            TbJcglXlfaDto faDto = new TbJcglXlfaDto();
+            BeanUtils.copyProperties(item, faDto);
+            // 查询巡逻点位
+            List<TbJcglXlfaXldw> dwList = this.tbJcglXlfaXldwMapper.getListByFaId(item.getId());
+            List<TbJcglXlfaXldwDto> dwDtoList = new ArrayList<>();
+            dwList.forEach(dw -> {
+                TbJcglXlfaXldwDto xldwDto = new TbJcglXlfaXldwDto();
+                BeanUtils.copyProperties(dw, xldwDto);
+                if (dw.getQy() != null) {
+                    xldwDto.setFw(JtsUtils.decodePolygon(dw.getQy()));
+                }
+                dwDtoList.add(xldwDto);
+            });
+            faDto.setXldwList(dwDtoList);
+            dtoList.add(faDto);
+        });
+        IPage<TbJcglXlfaDto> newPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        newPage.setTotal(page.getTotal());
+        newPage.setRecords(dtoList);
+        return newPage;
+    }
+
+    @Override
+    public TbJcglXlfaDto getInfo(String id) {
+        TbJcglXlfa fa = this.baseMapper.selectById(id);
+        if (fa != null) {
+            TbJcglXlfaDto faDto = new TbJcglXlfaDto();
+            BeanUtils.copyProperties(fa, faDto);
+            // 查询巡逻点位
+            List<TbJcglXlfaXldw> dwList = this.tbJcglXlfaXldwMapper.getListByFaId(fa.getId());
+            List<TbJcglXlfaXldwDto> dwDtoList = new ArrayList<>();
+            dwList.forEach(dw -> {
+                TbJcglXlfaXldwDto xldwDto = new TbJcglXlfaXldwDto();
+                BeanUtils.copyProperties(dw, xldwDto);
+                if (dw.getQy() != null) {
+                    xldwDto.setFw(JtsUtils.decodePolygon(dw.getQy()));
+                }
+                dwDtoList.add(xldwDto);
+            });
+            faDto.setXldwList(dwDtoList);
+            return faDto;
+        }
+        return null;
+    }
+
+    // 删除
+    private void deleteByFaid(String id) {
+        this.tbJcglXlfaXldwMapper.deleteEntity(id);
+    }
+
+    // 保存巡逻方案的其他信息
+    private void saveOther(TbJcglXlfaDto dto, TbJcglXlfa fa, UserInfo user) {
+        if (user != null) {
+            fa.setFazdrId(String.valueOf(user.getUserId()));
+            fa.setFazdrXm(user.getUserName());
+            fa.setFazdrSfzh(user.getIdEntityCard());
+            fa.setFazdsj(new Date());
+            fa.setSsbm(user.getDeptName());
+            fa.setSsbmid(String.valueOf(user.getDeptId()));
+            fa.setSsbmdm(user.getDeptCode());
+            fa.setSsxgaj(user.getFxjDeptName());
+            fa.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            fa.setSsxgajdm(user.getFxjDeptCode());
+            fa.setSssgaj(user.getDszDeptName());
+            fa.setSssgajid(String.valueOf(user.getDszDeptId()));
+            fa.setSssgajdm(user.getDszDeptCode());
+        }
+        List<TbJcglXlfaXldwDto> xldwList = dto.getXldwList();
+        if (!CollectionUtils.isEmpty(xldwList)) {
+            xldwList.forEach(xldw -> {
+                TbJcglXlfaXldw item = new TbJcglXlfaXldw();
+                BeanUtils.copyProperties(xldw, item);
+                item.setFaId(fa.getId());
+                item.setXtSjly("1");
+                if (xldw.getJd() != null && xldw.getWd() != null) {
+                    item.setZbhash(GeoHashKit.encode(xldw.getJd(), xldw.getWd()));
+                    item.setZb(JtsUtils.getPoint(xldw.getJd(), xldw.getWd()));
+                }
+                if (!CollectionUtils.isEmpty(xldw.getFw())) {
+                    item.setQy(JtsUtils.getPolygon(xldw.getFw()));
+                }
+                item.setFaId(fa.getId());
+                this.tbJcglXlfaXldwMapper.insertEntity(item);
+            });
+        }
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXljlServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXljlServiceImpl.java
new file mode 100644
index 0000000..0793057
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglXljlServiceImpl.java
@@ -0,0 +1,48 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXljlMapper;
+import com.mosty.base.manager.service.TbJcglXljlService;
+import com.mosty.base.model.dto.jcgl.TbJcglXljlDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXljl;
+import com.mosty.common.util.UUIDGenerator;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TbJcglXljlServiceImpl extends ServiceImpl<TbJcglXljlMapper, TbJcglXljl>
+        implements TbJcglXljlService {
+
+    @Override
+    public int addEntity(TbJcglXljlDto dto) {
+        TbJcglXljl item = new TbJcglXljl();
+        BeanUtils.copyProperties(dto, item);
+        item.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(item);
+    }
+
+    @Override
+    public int editEntity(TbJcglXljlDto dto) {
+        TbJcglXljl item = new TbJcglXljl();
+        BeanUtils.copyProperties(dto, item);
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public void deleteEntity(List<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public TbJcglXljl getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public List<TbJcglXljl> getListByXfid(String xfid) {
+        return this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglXljl>().eq(TbJcglXljl::getXfllId,xfid));
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZbjlServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZbjlServiceImpl.java
new file mode 100644
index 0000000..fdb5259
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZbjlServiceImpl.java
@@ -0,0 +1,23 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglZbjlMapper;
+import com.mosty.base.manager.service.TbJcglZbjlService;
+import com.mosty.base.model.entity.jcgl.TbJcglZbjl;
+import com.mosty.base.utils.UUIDGenerator;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TbJcglZbjlServiceImpl extends ServiceImpl<TbJcglZbjlMapper, TbJcglZbjl>
+        implements TbJcglZbjlService {
+
+    @Override
+    public int addEntity(TbJcglZbjl dto) {
+        dto.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(dto);
+    }
+
+
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZjkServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZjkServiceImpl.java
new file mode 100644
index 0000000..d27994f
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbJcglZjkServiceImpl.java
@@ -0,0 +1,101 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.entity.jcgl.TbJcglZjk;
+import com.mosty.base.model.query.jcgl.TbJcglZjkQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.manager.mapper.TbJcglZjkMapper;
+import com.mosty.base.manager.service.TbJcglZjkService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * <p>
+ * 基础管理-专家库 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-28
+ */
+@AllArgsConstructor
+@Service
+public class TbJcglZjkServiceImpl extends ServiceImpl<TbJcglZjkMapper, TbJcglZjk>
+        implements TbJcglZjkService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int insert(TbJcglZjk zjk) {
+        zjk.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(zjk.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(zjk.getSsbmdm());
+            zjk.setSsbm(dept.getDeptname());
+            zjk.setSsbmid(dept.getDeptid());
+            zjk.setSsbmdm(dept.getDeptcode());
+            zjk.setSsxgajdm(dept.getFxjcode());
+            zjk.setSsxgajid(dept.getFxjid());
+            zjk.setSsxgaj(dept.getFxjname());
+            zjk.setSssgaj(dept.getDszname());
+            zjk.setSssgajdm(dept.getDszcode());
+            zjk.setSssgajid(dept.getDszid());
+        }
+        zjk.setXtSjly("1");
+        return this.baseMapper.insert(zjk);
+    }
+
+    @Override
+    public IPage<TbJcglZjk> queryPage(TbJcglZjkQuery item) {
+        IPage<TbJcglZjk> page = PageUtils.buildPage(item.getPageSize(), item.getPageCurrent());
+        QueryWrapper<TbJcglZjk> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        item.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(item.getSsbmdm(), null));
+        qw.lambda().eq(TbJcglZjk::getXtScbz, 0)
+                .like(StringUtils.isNotBlank(item.getZjly()), TbJcglZjk::getZjly, item.getZjly())
+                .eq(StringUtils.isNotBlank(item.getGlryId()), TbJcglZjk::getGlryId, item.getGlryId())
+                .like(StringUtils.isNotBlank(item.getZjxm()), TbJcglZjk::getZjxm, item.getZjxm())
+                .eq(StringUtils.isNotBlank(item.getZjsfzh()), TbJcglZjk::getZjsfzh, item.getZjsfzh())
+                .eq(StringUtils.isNotBlank(item.getGlbmdm()), TbJcglZjk::getGlbmdm, item.getGlbmdm())
+                .likeRight(StringUtils.isNotBlank(item.getSsbmdm()), TbJcglZjk::getSsbmdm, item.getSsbmdm());
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public int update(TbJcglZjk zjk) {
+        if (StringUtils.isNotBlank(zjk.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(zjk.getSsbmdm());
+            zjk.setSsbm(dept.getDeptname());
+            zjk.setSsbmid(dept.getDeptid());
+            zjk.setSsbmdm(dept.getDeptcode());
+            zjk.setSsxgajdm(dept.getFxjcode());
+            zjk.setSsxgajid(dept.getFxjid());
+            zjk.setSsxgaj(dept.getFxjname());
+            zjk.setSssgaj(dept.getDszname());
+            zjk.setSssgajdm(dept.getDszcode());
+            zjk.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(zjk);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        return this.baseMapper.deleteBatch(list);
+    }
+
+    @Override
+    public TbJcglZjk selectById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbSbGzjrServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbSbGzjrServiceImpl.java
new file mode 100644
index 0000000..162553b
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TbSbGzjrServiceImpl.java
@@ -0,0 +1,80 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbSbGzjrMapper;
+import com.mosty.base.manager.service.TbSbGzjrService;
+import com.mosty.base.model.entity.jcgl.TbSbGzjr;
+import com.mosty.base.utils.UUIDGenerator;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbSbGzjrServiceImpl extends ServiceImpl<TbSbGzjrMapper, TbSbGzjr>
+        implements TbSbGzjrService {
+
+    @Override
+    public String addEntity(TbSbGzjr gzjr) {
+        gzjr.setSfjr("1");
+        gzjr.setXtSjly("1");
+        gzjr.setXtSjzt("0");
+        gzjr.setId(UUIDGenerator.getUUID());
+        this.baseMapper.insert(gzjr);
+        return gzjr.getId();
+    }
+
+    @Override
+    public int editEntity(TbSbGzjr gzjr) {
+        return this.baseMapper.updateById(gzjr);
+    }
+
+    @Override
+    public void deleteEntity(List<String> ids) {
+        this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public List<TbSbGzjr> getList(TbSbGzjr gzjr) {
+        List<TbSbGzjr> tbSbGzjrs = this.baseMapper.selectList(new LambdaQueryWrapper<TbSbGzjr>()
+                .eq(StringUtils.isNotBlank(gzjr.getGlid()), TbSbGzjr::getGlid, gzjr.getGlid())
+                .eq(StringUtils.isNotBlank(gzjr.getSbbm()), TbSbGzjr::getSbbm, gzjr.getSbbm())
+                .eq(StringUtils.isNotBlank(gzjr.getJrlx()), TbSbGzjr::getJrlx, gzjr.getJrlx())
+                .eq(StringUtils.isNotBlank(gzjr.getSfjr()), TbSbGzjr::getSfjr, gzjr.getSfjr())
+        );
+        return tbSbGzjrs;
+    }
+
+    @Override
+    public TbSbGzjr getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int qxjr(TbSbGzjr dto) {
+        if (StringUtils.isNotBlank(dto.getId())) {
+            TbSbGzjr tbSbGzjr = this.baseMapper.selectById(dto.getId());
+            tbSbGzjr.setSfjr("0");
+            return this.baseMapper.updateById(tbSbGzjr);
+        } else {
+            TbSbGzjr tbSbGzjr = this.baseMapper.selectOne(new LambdaQueryWrapper<TbSbGzjr>()
+                    .eq(StringUtils.isNotBlank(dto.getGlid()), TbSbGzjr::getGlid, dto.getGlid())
+                    .eq(StringUtils.isNotBlank(dto.getSbbm()), TbSbGzjr::getSbbm, dto.getSbbm())
+                    .eq(StringUtils.isNotBlank(dto.getJrlx()), TbSbGzjr::getJrlx, dto.getJrlx())
+                    .eq( TbSbGzjr::getSfjr, "1")
+            );
+            if (tbSbGzjr != null) {
+                tbSbGzjr.setSfjr("0");
+                return this.baseMapper.updateById(tbSbGzjr);
+            }
+        }
+
+        return 0;
+    }
+
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpJcglZbflServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpJcglZbflServiceImpl.java
new file mode 100644
index 0000000..2e8843e
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpJcglZbflServiceImpl.java
@@ -0,0 +1,192 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.model.entity.jcgl.TbJcglZbfl;
+
+import com.mosty.base.manager.mapper.TpJcglZbflMapper;
+import com.mosty.base.manager.service.TpJcglZbflService;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@AllArgsConstructor
+@Service
+public class TpJcglZbflServiceImpl implements TpJcglZbflService {
+
+    private final TpJcglZbflMapper tpJcglZbflMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+
+    @Override
+    public void addZbfl(TbJcglZbfl zbfl) {
+        synchronized (zbfl.getClass()) {//同时刻不能同时新增
+            //查询是否存在当前节点
+            TbJcglZbfl tbJcglZbfl = tpJcglZbflMapper.selectOne(new QueryWrapper<TbJcglZbfl>().
+                    eq("sname", zbfl.getPname())
+                    .eq("xt_scbz", 0)
+            );
+            //子节点是否重复
+            TbJcglZbfl son = tpJcglZbflMapper.selectOne(new QueryWrapper<TbJcglZbfl>().
+                    eq("sname", zbfl.getSname())
+                    .eq("xt_scbz", 0)
+            );
+            if (son != null) {
+                throw new BusinessException("装备类型名称重复");
+            }
+            String pname = zbfl.getPname();//父副本
+            String sname = zbfl.getSname();//子副本
+            String maxCode = tpJcglZbflMapper.selectMaxCode();//查询最大编码
+            NumberFormat f = new DecimalFormat("0000");
+            String max = maxCode.substring(maxCode.lastIndexOf("0") + 1);
+            String scode = f.format(Integer.parseInt(max) + 1);//标签编号生成规则
+            if (tbJcglZbfl != null) {
+                //新增子节点
+                if (StringUtils.isNotBlank(zbfl.getSname()) && StringUtils.isNotBlank(zbfl.getPname())) {
+                    zbfl.setScode("ZB" + scode)
+                            .setId(UUID.randomUUID().toString())
+                            .setSname(zbfl.getSname())
+                            .setPname(tbJcglZbfl.getSname())
+                            .setPcode(tbJcglZbfl.getScode())
+                            .setJdcj(tbJcglZbfl.getJdcj() + 1)
+                            .setXtScbz("0")
+                    ;
+                    tpJcglZbflMapper.insert(zbfl);
+                }
+            } else {//同时新增子节点父节点
+                String code = "ZB" + scode;
+                //先新增父节点
+                zbfl.setScode(code)
+                        .setId(UUID.randomUUID().toString())
+                        .setSname(zbfl.getPname())
+                        .setPname("装备管理")
+                        .setPcode("ZB0005")
+                        .setJdcj(1)
+                        .setXtScbz("0")
+                ;
+                tpJcglZbflMapper.insert(zbfl);
+                //再新增子节点
+                zbfl.setScode("ZB" + f.format(Integer.parseInt(max) + 2))
+                        .setId(UUID.randomUUID().toString())
+                        .setSname(sname)
+                        .setPname(pname)
+                        .setPcode(code)
+                        .setJdcj(1)
+                        .setXtScbz("0")
+                ;
+                tpJcglZbflMapper.insert(zbfl);
+            }
+        }
+    }
+
+    @Override
+    public List<TbJcglZbfl> zbTree(String scode) {
+        //只查询当前能选择的设备类型
+        List<TbJcglZbfl> tbJcglZbfls = tpJcglZbflMapper.selectList(new QueryWrapper<TbJcglZbfl>().orderByAsc("jdcj")
+                .in(StringUtils.isNotBlank(scode), "scode", scode, "ZB0005")
+                .or(StringUtils.isNotBlank(scode)).in(StringUtils.isNotBlank(scode), "pcode", scode)
+        );
+        List<TbJcglZbfl> zhjmxfZbglZbsjgs1 = null;
+        if (tbJcglZbfls.size() > 0) {
+            //获取最父节点信息
+            TbJcglZbfl tbJcglZbfl = tbJcglZbfls.get(0);
+            //递归
+            zhjmxfZbglZbsjgs1 = depTree(tbJcglZbfl, tbJcglZbfls);
+        }
+        return zhjmxfZbglZbsjgs1;
+    }
+
+
+    public List<TbJcglZbfl> depTree(TbJcglZbfl zhjmxfZbglZbsjg, List<TbJcglZbfl> list) {
+        //获取子节点信息
+        String socode = zhjmxfZbglZbsjg.getScode();
+        List<TbJcglZbfl> childList = new ArrayList<TbJcglZbfl>();
+        for (int i = 0; i < list.size(); i++) {
+            if (list.get(i).getPcode().equals(socode)) {
+                //添加子节点信息
+                childList.add(list.get(i));
+                //删除已存在的节点 减少循环次数
+                list.remove(i);
+                i--;
+            }
+        }
+
+        if (list.size() > 0) {
+            for (int i = 0; i < childList.size(); i++) {
+                childList.get(i).setChildren(depTree(childList.get(i), list));
+
+            }
+        }
+        return childList;
+    }
+
+    @Override
+    public void editZbfl(TbJcglZbfl zbfl) {
+        tpJcglZbflMapper.updateById(zbfl);
+    }
+
+    @Override
+    public IPage<TbJcglZbfl> selectList(TbJcglZbfl zbfl, IPage<TbJcglZbfl> page) {
+        QueryWrapper<TbJcglZbfl> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper,userInfo);
+        zbfl.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(zbfl.getSsbmdm(), null));
+        if (zbfl != null) {
+            queryWrapper.lambda()
+                    .like(StringUtils.isNotBlank(zbfl.getSname()), TbJcglZbfl::getSname, zbfl.getSname())
+                    .likeRight(StringUtils.isNotBlank(zbfl.getSsbmdm()), TbJcglZbfl::getSsbmdm, zbfl.getSsbmdm())
+                    .eq(TbJcglZbfl::getXtScbz, 0);
+        }
+        IPage<TbJcglZbfl> page1 = tpJcglZbflMapper.selectPage(page, queryWrapper);
+        return page1;
+    }
+
+    @Override
+    public void deleteZbfl(List<String> id) {
+        if (id.size() > 0) {
+            List<TbJcglZbfl> tbJcglZbfls = tpJcglZbflMapper.selectList(new QueryWrapper<TbJcglZbfl>().eq("xt_scbz", 0));
+            id.forEach(i -> {
+                TbJcglZbfl tbJcglZbfl = tpJcglZbflMapper.selectById(i);
+                if (tbJcglZbfl != null) {
+                    if (tbJcglZbfls.size() > 0) {
+                        deleteTree(tbJcglZbfl, tbJcglZbfls);
+                    }
+                    tbJcglZbfl.setXtScbz("1");
+                    //删除子节点
+                    tpJcglZbflMapper.updateZt(tbJcglZbfl.getScode());
+                }
+            });
+        }
+    }
+
+    //递归删除树
+    public void deleteTree(TbJcglZbfl tbJcglZbfl, List<TbJcglZbfl> tbJcglZbfls) {
+        List<TbJcglZbfl> childList = new ArrayList<TbJcglZbfl>();
+        for (int i = 0; i < tbJcglZbfls.size(); i++) {
+            //当遍历到最后层级时自己和自己比较
+            if (tbJcglZbfls.get(i).getPcode().equals(tbJcglZbfl.getScode()) || tbJcglZbfls.get(i).getScode().equals(tbJcglZbfl.getScode())) {
+                tpJcglZbflMapper.updateType(tbJcglZbfls.get(i).getId());
+                childList.add(tbJcglZbfls.get(i));
+                tbJcglZbfls.remove(i);
+            }
+        }
+        if (tbJcglZbfls.size() > 0) {
+            childList.forEach(c -> {
+                deleteTree(c, tbJcglZbfls);
+            });
+        }
+
+    }
+
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpjcglZnzbServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpjcglZnzbServiceImpl.java
new file mode 100644
index 0000000..4345677
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/TpjcglZnzbServiceImpl.java
@@ -0,0 +1,711 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.TbJcglXfclMapper;
+import com.mosty.base.manager.mapper.TbSbGzjrMapper;
+import com.mosty.base.manager.mapper.TpjcglZnzbMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.TbJcglZbjlService;
+import com.mosty.base.manager.service.TpjcglZnzbService;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.model.dto.base.SysMessageItemInsertDto;
+import com.mosty.base.model.dto.jcgl.TbJcglZnzbSearchDto;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.entity.jcgl.*;
+import com.mosty.base.model.query.jcgl.TbJcglZnzbQuery;
+import com.mosty.base.model.query.jcgl.TbJcglZyzbQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglSbdwVo;
+import com.mosty.base.model.vo.jcgl.TbJcglZnzbVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.IDCardUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.constant.enums.DeletedEnum;
+import com.mosty.common.base.exception.Asserts;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.entity.SysDict;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.config.service.SysDictItemService;
+import com.mosty.common.config.service.SysDictService;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@AllArgsConstructor
+@Service
+public class TpjcglZnzbServiceImpl extends ServiceImpl<TpjcglZnzbMapper, TbJcglZnzb>
+        implements TpjcglZnzbService {
+
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbJcglZbjlService tbJcglZbjlService;
+    private final TbSbGzjrMapper tbSbGzjrMapper;
+    private final TbJcglXfclMapper tbJcglXfclMapper;
+    private final SysDictService sysDictService;
+    private final SysDictItemService sysDictItemService;
+    private final RedisService redisService;
+
+    /**
+     * 下发智能装备
+     *
+     * @param zb
+     */
+    @Override
+    public void xfZnzb(TbJcglZnzb zb) {
+        if (StringUtils.isNotBlank(zb.getId()) && StringUtils.isNotBlank(zb.getSsbmid())) {
+            TbJcglZnzb tbJcglZnzb = this.baseMapper.selectById(zb.getId());
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(zb.getSsbmdm());
+            tbJcglZnzb.setSsbm(dept.getDeptname());
+            tbJcglZnzb.setSsbmid(dept.getDeptid());
+            tbJcglZnzb.setSsbmdm(dept.getDeptcode());
+            tbJcglZnzb.setSsxgajdm(dept.getFxjcode());
+            tbJcglZnzb.setSsxgajid(dept.getFxjid());
+            tbJcglZnzb.setSsxgaj(dept.getFxjname());
+            tbJcglZnzb.setSssgaj(dept.getDszname());
+            tbJcglZnzb.setSssgajdm(dept.getDszcode());
+            tbJcglZnzb.setSssgajid(dept.getDszid());
+            tbJcglZnzb.setXtSjly("1");
+            tbJcglZnzb.setId(UUIDGenerator.getUUID());
+            tbJcglZnzb.setXfid(zb.getId());
+            tbJcglZnzb.setSfbs("0");
+            tbJcglZnzb.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+            //存入装备日志
+            addZbjl(tbJcglZnzb, "2");
+            this.baseMapper.insert(tbJcglZnzb);
+        }
+    }
+
+
+    /**
+     * 报损
+     *
+     * @param
+     */
+    @Override
+    public void bsZnzb(String id) {
+        if (StringUtils.isNotBlank(id)) {
+            TbJcglZnzb tbJcglZnzb = this.baseMapper.selectById(id);
+            //存入装备日志
+            tbJcglZnzb.setSfbs("1");
+            addZbjl(tbJcglZnzb, "1");
+            this.baseMapper.updateById(tbJcglZnzb);
+        }
+    }
+
+
+    /**
+     * 回退
+     *
+     * @param
+     */
+    @Override
+    public void htZnzb(String id) {
+        if (StringUtils.isNotBlank(id)) {
+            TbJcglZnzb tbJcglZnzb = this.baseMapper.selectById(id);
+            //存入装备日志
+            addZbjl(tbJcglZnzb, "3");
+            this.baseMapper.deleteById(tbJcglZnzb.getId());
+        }
+    }
+
+
+    public void addZbjl(TbJcglZnzb zb, String sjly) {
+        TbJcglZbjl dto = new TbJcglZbjl();
+        dto.setSjbm("tb_jcgl_znzb");
+        dto.setGlid(zb.getId());
+        dto.setSjly(sjly);
+        dto.setZblx("1");
+        UserInfo user = UserInfoManager.get();
+        dto.setCzr(user.getUserName());
+        dto.setCzrSfz(user.getIdEntityCard());
+        dto.setCzrSsbmid(String.valueOf(user.getDeptId()));
+        dto.setCzrSsbm(user.getDeptName());
+        dto.setCzrSsbmdm(user.getDeptCode());
+        dto.setXfSsbmid(zb.getSsbmid());
+        dto.setXfSsbm(zb.getSsbm());
+        dto.setXfSsbmdm(zb.getSsbmdm());
+        dto.setExt("1");
+        tbJcglZbjlService.addEntity(dto);
+    }
+
+
+    @Override
+    public int addZnzb(TbJcglZnzb zb) {
+        if (StringUtils.isNotBlank(zb.getScode())) {
+            TbJcglZnzb dto = new TbJcglZnzb();
+            BeanUtils.copyProperties(zb, dto);
+            //查询设备类型信息
+            List<TbJcglZnzb> tbJcglZnzbs = this.baseMapper.selectList(
+                    new QueryWrapper<TbJcglZnzb>().eq("sbbh", zb.getSbbh())
+                            .eq("xt_scbz", 0)
+            );
+            if (tbJcglZnzbs.size() > 0) throw new BusinessException("设备编号已存在");
+            dto.setId(UUIDGenerator.getUUID());
+            if (StringUtils.isNotBlank(dto.getSsbmdm())) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+                dto.setSsbm(dept.getDeptname());
+                dto.setSsbmid(dept.getDeptid());
+                dto.setSsbmdm(dept.getDeptcode());
+                dto.setSsxgajdm(dept.getFxjcode());
+                dto.setSsxgajid(dept.getFxjid());
+                dto.setSsxgaj(dept.getFxjname());
+                dto.setSssgaj(dept.getDszname());
+                dto.setSssgajdm(dept.getDszcode());
+                dto.setSssgajid(dept.getDszid());
+            }
+            dto.setXtSjly("1");
+            // 新增关联表数据
+            if (StringUtils.isNotEmpty(dto.getSbbh())) {
+                TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                BeanUtils.copyProperties(dto, vo);
+                redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+            }
+            return this.baseMapper.insert(dto);
+        }
+        return -1;
+    }
+
+    @Override
+    public IPage<TbJcglZnzbVo> getZnzb(TbJcglZnzb zb, IPage<TbJcglZnzb> page) {
+        zb.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(zb.getSsbmdm(), zb.getIsChild()));
+        IPage<TbJcglZnzb> resPage = this.baseMapper.selectPage(page,
+                new LambdaQueryWrapper<TbJcglZnzb>()
+                        .eq(StringUtils.isNotBlank(zb.getScode()), TbJcglZnzb::getScode, zb.getScode())
+                        .likeRight(StringUtils.isNotBlank(zb.getSsbmdm()), TbJcglZnzb::getSsbmdm, zb.getSsbmdm())
+                        .like(StringUtils.isNotBlank(zb.getSbmc()), TbJcglZnzb::getSbmc, zb.getSbmc())
+                        .eq(zb.getCgrq() != null, TbJcglZnzb::getCgrq, zb.getCgrq()));
+        IPage<TbJcglZnzbVo> resList = new Page<>(zb.getPageNo(), zb.getPageSize());
+        List<TbJcglZnzbVo> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(resPage.getRecords())) {
+            for (TbJcglZnzb record : resPage.getRecords()) {
+                TbJcglZnzbVo vo = new TbJcglZnzbVo();
+                BeanUtils.copyProperties(record, vo);
+                list.add(vo);
+            }
+        }
+        resList.setTotal(resPage.getTotal());
+        resList.setPages(resPage.getPages());
+        resList.setRecords(list);
+        return resList;
+    }
+
+    @Override
+    public void editZnzb(TbJcglZnzb zb) {
+        if (StringUtils.isNotBlank(zb.getScode())) {
+            //查询设备类型信息
+            List<TbJcglZnzb> tbJcglZnzbs = this.baseMapper.selectList(
+                    new QueryWrapper<TbJcglZnzb>().eq("sbbh", zb.getSbbh())
+                            .eq("xt_scbz", 0)
+                            .ne("id", zb.getId())
+            );
+            if (tbJcglZnzbs.size() > 0) {
+                throw new BusinessException("设备编号已存在");
+            } else if (StringUtils.isNotBlank(zb.getSsbmdm())) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(zb.getSsbmdm());
+                zb.setSsbm(dept.getDeptname());
+                zb.setSsbmid(dept.getDeptid());
+                zb.setSsbmdm(dept.getDeptcode());
+                zb.setSsxgajdm(dept.getFxjcode());
+                zb.setSsxgajid(dept.getFxjid());
+                zb.setSsxgaj(dept.getFxjname());
+                zb.setSssgaj(dept.getDszname());
+                zb.setSssgajdm(dept.getDszcode());
+                zb.setSssgajid(dept.getDszid());
+            }
+            if (StringUtils.isNotEmpty(zb.getSbbh())) {
+                TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                BeanUtils.copyProperties(zb, vo);
+                redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+            }
+            this.baseMapper.updateById(zb);
+        }
+    }
+
+    @Override
+    public void deleteZnzb(List<String> id) {
+        //批量注销
+        TbJcglZnzb tbJcglZnzb = new TbJcglZnzb();
+        tbJcglZnzb.setXtScbz("1");
+        if (id.size() > 0) {
+            this.baseMapper.deleteZb(id);
+        }
+    }
+
+    @Override
+    public TbJcglZnzbVo selectZbxq(String id) {
+        TbJcglZnzb zb = this.baseMapper.selectById(id);
+        if (zb != null) {
+            TbJcglZnzbVo vo = new TbJcglZnzbVo();
+            BeanUtils.copyProperties(zb, vo);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public IPage<TbJcglZnzb> znzbDqtx(TbJcglZnzbQuery zb, IPage<TbJcglZnzb> page) {
+        SimpleDateFormat defaultDateFormatter = new SimpleDateFormat("yyyy-MM-dd");
+        String currentDate = DateUtils.getSystemDateString();
+        Date dqDate = DateUtils.stepMonth(new Date(), 2);
+        String dqsj = defaultDateFormatter.format(dqDate);
+        QueryWrapper<TbJcglZnzb> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        zb.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(zb.getSsbmdm(), null));
+        if (zb != null) {
+            qw.lambda().eq(StringUtils.isNotBlank(zb.getScode()), TbJcglZnzb::getScode, zb.getScode())
+                    .like(StringUtils.isNotBlank(zb.getSbmc()), TbJcglZnzb::getSbmc, zb.getSbmc())
+                    .likeRight(StringUtils.isNotBlank(zb.getSsbmdm()), TbJcglZnzb::getSsbmdm, zb.getSsbmdm())
+                    .eq(StringUtils.isNotBlank(zb.getCgrq()), TbJcglZnzb::getCgrq, zb.getCgrq())
+                    .eq(TbJcglZnzb::getXtScbz, 0)
+                    .eq(StringUtils.isNotBlank(zb.getSfzy()), TbJcglZnzb::getSfzy, zb.getSfzy())
+                    .eq(StringUtils.isNotBlank(zb.getSfrh()), TbJcglZnzb::getSfrh, zb.getSfrh())
+                    .ge(TbJcglZnzb::getDqsj, currentDate)
+                    .le(TbJcglZnzb::getDqsj, dqsj);
+        }
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+
+    @Override
+    public Object checkZnzb() {
+        // 查询所有装备。判断他的状态和是否发送消息(故障不判断，故障)
+        List<TbJcglZnzb> zbList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJcglZnzb>()
+                        .eq(TbJcglZnzb::getXtSjzt, "1")
+        );
+        zbList.forEach(zb -> {
+            // 判断是否临期(提前两个月)
+            Date zbTime = zb.getDqsj();
+            Date now = new Date();
+            if ("4".equals(zb.getZbzt())) {
+                if (!"4".equals(zb.getZbzt())) {
+                    zb.setZbzt("4");
+                }
+                if (!"1".equals(zb.getSftx())) {
+                    // 发送提醒
+                    this.sendMsg(zb, "0");
+                    zb.setSftx("1");
+                }
+                this.baseMapper.updateById(zb);
+            } else {
+                if (DateUtils.getQueryDateString(zbTime, "01")
+                        .equals(DateUtils.getQueryDateString(now, "01"))
+                        || now.getTime() >= zbTime.getTime()) {
+                    if (!"3".equals(zb.getZbzt())) {
+                        zb.setZbzt("3");
+                    }
+                    if (!"1".equals(zb.getSftx())) {
+                        // 发送提醒
+                        this.sendMsg(zb, "1");
+                        zb.setSftx("1");
+                    }
+                    this.baseMapper.updateById(zb);
+                } else {
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(now);
+                    cal.add(Calendar.MONTH, +2);
+                    now = cal.getTime();
+                    System.err.println("   now:" + DateUtils.getQueryDateString(now, "02"));
+                    System.err.println("zbTime:" + DateUtils.getQueryDateString(zbTime, "02"));
+                    if (now.getTime() >= zbTime.getTime()) {
+                        if (!"2".equals(zb.getZbzt())) {
+                            zb.setZbzt("2");
+                        }
+                        if (!"1".equals(zb.getSftx())) {
+                            // 发送提醒
+                            this.sendMsg(zb, "2");
+                            zb.setSftx("1");
+                        }
+                        this.baseMapper.updateById(zb);
+                    }
+                }
+            }
+        });
+        return null;
+    }
+
+    @Override
+    public IPage<TbJcglZnzbVo> getFjzbList(TbJcglZnzbSearchDto dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        List<TbJcglZnzbVo> list = this.baseMapper.getFjzbList(map);
+        int count = this.baseMapper.getFjzbCount(map);
+        IPage<TbJcglZnzbVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<TbJcglZnzbVo> getZnzbList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        IPage<TbJcglZnzb> page;
+        //本部门
+        if ("1".equals(dto.getType())) {
+            page = this.baseMapper.selectPage(
+                    new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                    new LambdaQueryWrapper<TbJcglZnzb>()
+                            .eq(TbJcglZnzb::getXtSjzt, "1")
+                            .eq(StringUtils.isNotBlank(dto.getScode()), TbJcglZnzb::getScode, dto.getScode())
+                            .like(StringUtils.isNotBlank(dto.getKeyword()), TbJcglZnzb::getSbmc, dto.getKeyword())
+                            .eq(StringUtils.isNotBlank(user.getDeptCode()), TbJcglZnzb::getSsbmdm, user.getDeptCode())
+            );
+        } else {
+//            String ssbmdm = user.getDeptCode();
+            String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), "1");
+            page = this.baseMapper.selectPage(
+                    new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                    new LambdaQueryWrapper<TbJcglZnzb>()
+                            .eq(TbJcglZnzb::getXtSjzt, "1")
+                            .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglZnzb::getSsbmdm, ssbmdm)
+                            .eq(StringUtils.isNotBlank(dto.getScode()), TbJcglZnzb::getScode, dto.getScode())
+                            .and(StringUtils.isNotBlank(dto.getKeyword()),
+                                    it -> it.like(TbJcglZnzb::getSbmc, dto.getKeyword())
+                                            .or()
+                                            .like(TbJcglZnzb::getSsbm, dto.getKeyword())
+                            )
+            );
+        }
+        IPage<TbJcglZnzbVo> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbJcglZnzbVo> voList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbJcglZnzbVo vo = new TbJcglZnzbVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+        }
+        resPage.setTotal(page.getTotal());
+        resPage.setRecords(voList);
+        return resPage;
+    }
+
+    /**
+     * 给用户发送提醒消息
+     *
+     * @param zb
+     * @param type 0.故障 1.到期  2.临期
+     */
+    private void sendMsg(TbJcglZnzb zb, String type) {
+        System.err.println(type);
+        SysMessageInfoInsertDto dto = new SysMessageInfoInsertDto();
+        List<SysMessageItemInsertDto> itemList = new ArrayList<>();
+        if (!StringUtils.isBlank(zb.getSsbmid())) {
+            // 查询部门下的所有的人员信息列表
+            List<SysUserDeptVO> list = this.tbBaseAdaptRemoteService.getUserList(zb.getSsbmid());
+            list.forEach(item -> {
+                SysMessageItemInsertDto itemDto = new SysMessageItemInsertDto();
+                itemDto.setXxjsrXm(item.getUserName());
+                itemDto.setXxjsrSfzh(item.getIdEntityCard());
+                itemDto.setXxjsrId(String.valueOf(item.getId()));
+                itemDto.setXxjsbm(zb.getSsbm());
+                itemDto.setXxjsbmId(zb.getSsbmid());
+                itemList.add(itemDto);
+            });
+            if (itemList.size() > 0) {
+                dto.setItemList(itemList);
+                String xxnr = "智能装备《" + zb.getSbmc() + "（" + zb.getSbbh() + "）》";
+                if ("0".equals(type)) {
+                    xxnr += "发生故障，请排查。";
+                } else if ("1".equals(type)) {
+                    xxnr += "已到期，请立即维护或更换";
+                } else {
+                    xxnr += "即将到期，到期时间" + DateUtils.getQueryDateString(zb.getDqsj(), "01") + "，请立即维护或更换";
+                }
+                dto.setXxnr(xxnr);
+                dto.setXxlx("1");
+                dto.setXxzt("2");
+                this.tbBaseAdaptRemoteService.sendMsg(dto);
+            }
+        }
+    }
+
+    @Override
+    public String importData(List<TbJcglZnzb> list, boolean updateSupport) {
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TbJcglZnzb item : list) {
+            try {
+                if (org.springframework.util.StringUtils.isEmpty(item.getSbbh())
+                        || org.springframework.util.StringUtils.isEmpty(item.getSbmc())
+                        || org.springframework.util.StringUtils.isEmpty(item.getScode())
+                        || ObjectUtils.isEmpty(item.getCgrq())
+                        || ObjectUtils.isEmpty(item.getDqsj())
+                        || ObjectUtils.isEmpty(item.getSsbmdm())
+                ) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、账号 " + item.getSbmc() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                TbJcglZnzb znzb = this.baseMapper.selectOne(new LambdaQueryWrapper<TbJcglZnzb>()
+                        .eq(TbJcglZnzb::getSbbh, item.getSbbh())
+                        .eq(TbJcglZnzb::getXtSjzt, "1")
+                        .eq(TbJcglZnzb::getXtScbz, "0")
+                        .last(" limit 1")
+                );
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+                if (ObjectUtils.isNotEmpty(dept)) {
+                    item.setSsbm(dept.getDeptname());
+                    item.setSsbmid(dept.getDeptid());
+                    item.setSsbmdm(dept.getDeptcode());
+                    item.setSsxgajdm(dept.getFxjcode());
+                    item.setSsxgajid(dept.getFxjid());
+                    item.setSsxgaj(dept.getFxjname());
+                    item.setSssgaj(dept.getDszname());
+                    item.setSssgajdm(dept.getDszcode());
+                    item.setSssgajid(dept.getDszid());
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + successNum + "、所属部门编码不存在 " + item.getSsbmdm() + " 信息不全,请仔细核查！");
+                    continue;
+                }
+                item.setXtSjzt("1");
+                item.setXtScbz("0");
+                item.setZbzt("1");
+                item.setSftx("1");
+
+                if (ObjectUtils.isEmpty(znzb)) {
+                    item.setId(UUIDGenerator.getUUID());
+                    if (StringUtils.isNotEmpty(item.getSbbh())) {
+                        TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                        BeanUtils.copyProperties(item, vo);
+                        redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                    }
+                    this.baseMapper.insert(item);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "装备 " + item.getSbmc() + " 导入成功");
+                } else if (updateSupport) {
+                    item.setId(znzb.getId());
+                    if (StringUtils.isNotEmpty(item.getSbbh())) {
+                        TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                        BeanUtils.copyProperties(item, vo);
+                        redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                    }
+                    this.baseMapper.updateById(item);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、装备 " + item.getSbmc() + " 更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、装备编号： " + item.getSbbh() + " 已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、设备 " + item.getSbmc() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    @Override
+    public List<Map<String, Object>> sblxTj(String type, String ssbmdm) {
+        ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        List<Map<String, Object>> maps = new ArrayList<>();
+        if (StringUtils.isNotBlank(type) && type.equals("2")) {
+            //器械装备
+            maps = this.baseMapper.sblxTj(ssbmdm);
+            if (!CollectionUtils.isEmpty(maps)) {
+                maps.forEach(v -> {
+                    String scode = v.get("scode").toString();
+                    SysDictItem dict = this.baseMapper.selectDict("D_BZ_JYQXFL", scode);
+                    if (ObjectUtils.isNotEmpty(dict)) {
+                        v.put("name", dict.getZdmc());
+                    }
+                });
+            }
+
+        } else {
+            //智能装备
+            QueryWrapper<SysDict> dictWrapper = new QueryWrapper<>();
+            dictWrapper.and(wrapper -> wrapper.eq("zdbh", "D_BZ_ZBLX_LZ"));
+            SysDict sysDict = sysDictService.getOne(dictWrapper);
+            Asserts.check(sysDict == null, "字典编号 %s 对应的字典不存在", "D_BZ_ZBLX_LZ");
+//            SysDictItem dict = this.baseMapper.selectDict("D_BZ_ZBLX_LZ", scode);
+            List<SysDictItem> list = this.sysDictItemService.list(new QueryWrapper<SysDictItem>().lambda()
+                    .eq(SysDictItem::getZdId, sysDict.getId())
+                    .eq(SysDictItem::getXtZxbz, DeletedEnum.NATURE.code)
+            );
+            if (!CollectionUtils.isEmpty(list)) {
+                for (SysDictItem item : list) {
+                    Map<String, Object> tjMap = new HashMap<>();
+                    tjMap.put("scode", item.getDm());
+                    tjMap.put("name", item.getZdmc());
+                    int sl = this.baseMapper.selectCount(new QueryWrapper<TbJcglZnzb>().lambda()
+                            .likeRight(TbJcglZnzb::getSsbmdm, ssbmdm)
+                            .likeRight(TbJcglZnzb::getScode, item.getDm())
+                            .isNull(TbJcglZnzb::getXfid)
+                            .isNull(TbJcglZnzb::getSfbs)
+                            .eq(TbJcglZnzb::getXtScbz, DeletedEnum.NATURE.code)
+
+                    );
+                    tjMap.put("sl", sl);
+                    Integer xfs = this.baseMapper.selectCount(new LambdaQueryWrapper<TbJcglZnzb>()
+                            .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglZnzb::getSsbmdm, ssbmdm)
+                            .likeRight(TbJcglZnzb::getScode, item.getDm())
+                            .isNotNull(TbJcglZnzb::getXfid)
+                    );
+                    tjMap.put("xfs", xfs);
+                    //获取报损数量
+                    Integer bss = this.baseMapper.selectCount(new LambdaQueryWrapper<TbJcglZnzb>()
+                            .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglZnzb::getSsbmdm, ssbmdm)
+                            .likeRight(TbJcglZnzb::getScode, item.getDm())
+                            .eq(TbJcglZnzb::getSfbs, "1")
+                    );
+                    tjMap.put("bss", bss);
+                    maps.add(tjMap);
+                }
+            }
+        }
+        return maps;
+    }
+
+    @Override
+    public Map<String, Object> zyZbtj(String ssbmdm) {
+        Map<String, Object> map = new HashMap<>();
+        ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        //获取装备数量
+        List<TbJcglZnzb> tbJcglZnzbs = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglZnzb>()
+                .isNull(TbJcglZnzb::getXfid)
+                .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglZnzb::getSsbmdm, ssbmdm)
+        );
+        int zbs = 0;
+        if (!CollectionUtils.isEmpty(tbJcglZnzbs)) {
+            zbs = tbJcglZnzbs.size();
+        }
+        //获取车辆数据
+        List<TbJcglXfcl> tbJcglXfcls = this.tbJcglXfclMapper.selectList(new LambdaQueryWrapper<TbJcglXfcl>()
+                .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglXfcl::getSsbmdm, ssbmdm)
+        );
+        int cls = 0;
+        if (!CollectionUtils.isEmpty(tbJcglXfcls)) {
+            cls = tbJcglXfcls.size();
+        }
+        String currentDate = DateUtils.getSystemDateString();
+        String dqsj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", 2), "01");
+        //临期装备
+        List<TbJcglZnzb> tbJcglZnzbs1 = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglZnzb>()
+                .isNull(TbJcglZnzb::getXfid)
+                .likeRight(StringUtils.isNotBlank(ssbmdm), TbJcglZnzb::getSsbmdm, ssbmdm)
+                .ge(TbJcglZnzb::getDqsj, currentDate)
+                .le(TbJcglZnzb::getDqsj, dqsj)
+        );
+        int dqs = 0;
+        if (!CollectionUtils.isEmpty(tbJcglZnzbs1)) {
+            dqs = tbJcglZnzbs1.size();
+        }
+        map.put("dqs", dqs);
+        map.put("zbs", zbs);
+        map.put("cls", cls);
+        return map;
+    }
+
+    /**
+     * 专业装备
+     *
+     * @param
+     */
+    @Override
+    public List<TbJcglZnzb> getZyzb(TbJcglZyzbQuery tbJcglZyzbQuery) {
+
+        QueryWrapper<TbJcglZnzb> tb = new QueryWrapper<>();
+
+//        if (StringUtils.isNotBlank(tbJcglZyzbQuery.getSsbmdm())) {
+//            DeptInfo sysDeptLevel = sysRoleService.getSysDeptLevel(tbJcglZyzbQuery.getSsbmdm());
+//            PermissionsUtil.queryWrapperUtilByDeptInfo(tb, sysDeptLevel);
+//        } else if (StringUtils.isNotBlank(tbJcglZyzbQuery.getSsbmid())) {
+//            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(tbJcglZyzbQuery.getSsbmid());
+//            DeptInfo sysDeptLevel = sysRoleService.getSysDeptLevel(dept.getDeptcode());
+//            PermissionsUtil.queryWrapperUtilByDeptInfo(tb, sysDeptLevel);
+//        } else {
+//            UserInfo user = UserInfoManager.getUser();
+//            PermissionsUtil.queryWrapperUtil(tb, user);
+//        }
+//
+        tbJcglZyzbQuery.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbJcglZyzbQuery.getSsbmdm(), null));
+        tb.lambda()
+                .eq(TbJcglZnzb::getSfzy, "1")
+                .likeRight(StringUtils.isNotBlank(tbJcglZyzbQuery.getSsbmdm()), TbJcglZnzb::getSsbmdm, tbJcglZyzbQuery.getSsbmdm())
+                .eq(StringUtils.isNotBlank(tbJcglZyzbQuery.getSfrh()), TbJcglZnzb::getSfrh, tbJcglZyzbQuery.getSfrh());
+        List<TbJcglZnzb> tbJcglZnzbs = this.baseMapper.selectList(tb);
+        if (!CollectionUtils.isEmpty(tbJcglZnzbs)) {
+            //查询装备是否感知接入
+            for (TbJcglZnzb zyzb : tbJcglZnzbs) {
+                Integer integer = this.tbSbGzjrMapper.selectCount(new LambdaQueryWrapper<TbSbGzjr>()
+                        .eq(StringUtils.isNotBlank(tbJcglZyzbQuery.getGlid()), TbSbGzjr::getGlid, tbJcglZyzbQuery.getGlid())
+                        .eq(StringUtils.isNotBlank(tbJcglZyzbQuery.getJrlx()), TbSbGzjr::getJrlx, tbJcglZyzbQuery.getJrlx())
+                        .eq(StringUtils.isNotBlank(zyzb.getSbbh()), TbSbGzjr::getSbbm, zyzb.getSbbh()));
+                zyzb.setGzjr(integer);
+            }
+
+
+        }
+        return tbJcglZnzbs;
+    }
+
+    //    @Override
+    @PostConstruct
+    public void znzbToRedis() {
+        //先删除所有然后同步
+        redisService.deleteObject(redisService.keys(Constant.PGIS_SB + "*"));
+        //同步智能装备
+        List<TbJcglZnzb> tbJcglZnzbs = this.baseMapper.selectList(new LambdaQueryWrapper<TbJcglZnzb>());
+        if (!CollectionUtils.isEmpty(tbJcglZnzbs)) {
+            for (TbJcglZnzb znzb : tbJcglZnzbs) {
+                if (StringUtils.isNotEmpty(znzb.getSbbh())) {
+                    TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                    BeanUtils.copyProperties(znzb, vo);
+                    redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                }
+            }
+        }
+        //同步车辆
+        List<TbJcglXfcl> xfclList = this.tbJcglXfclMapper.selectList(new LambdaQueryWrapper<TbJcglXfcl>());
+        if (!CollectionUtils.isEmpty(xfclList)) {
+            for (TbJcglXfcl xfcl : xfclList) {
+                if (StringUtils.isNotEmpty(xfcl.getGpsId())) {
+                    TbJcglSbdwVo vo = new TbJcglSbdwVo();
+                    BeanUtils.copyProperties(xfcl, vo);
+                    vo.setSbbh(xfcl.getGpsId());
+                    vo.setSbmc(xfcl.getCph());
+                    vo.setScode("05");
+                    redisService.setCacheObject(Constant.PGIS_SB + vo.getSbbh(), vo);
+                }
+            }
+        }
+        System.out.println("PostConstruct------------》存入redis数据");
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSydwJbxxGxServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSydwJbxxGxServiceImpl.java
new file mode 100644
index 0000000..bee26f4
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSydwJbxxGxServiceImpl.java
@@ -0,0 +1,90 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.VwSydwCyryGxMapper;
+import com.mosty.base.manager.mapper.VwSydwJbxxGxMapper;
+import com.mosty.base.manager.remote.TbBaseAdaptRemoteService;
+import com.mosty.base.manager.service.VwSydwJbxxGxService;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSydwCyryPageQuery;
+import com.mosty.base.model.query.afjcsj.VwSydwJbxxGxQuery;
+import com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-27
+ */
+@AllArgsConstructor
+@Service
+public class VwSydwJbxxGxServiceImpl extends ServiceImpl<VwSydwJbxxGxMapper, VwSydwJbxxGx> implements VwSydwJbxxGxService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final VwSydwCyryGxMapper vwSydwCyryGxMapper;
+
+    @Override
+    public IPage<VwSydwJbxxGx> selectList(VwSydwJbxxGxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        int count = this.baseMapper.selectSydwCount(map);
+        List<VwSydwJbxxGx> list = this.baseMapper.selectSydwList(map);
+        IPage<VwSydwJbxxGx> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        list.forEach(item -> {
+            String sszrqdm = item.getSszrqdm();
+            if (StringUtils.isNotBlank(sszrqdm) && sszrqdm.length() >= 12) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(sszrqdm.substring(0, 12));
+                if (dept != null) {
+                    item.setSszrqmc(dept.getDeptname());
+                }
+            }
+        });
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> getStatistics() {
+        return this.baseMapper.getStatistics();
+    }
+
+    @Override
+    public VwSydwJbxxGx getSydwInfo(String id) {
+        VwSydwJbxxGx gx = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<VwSydwJbxxGx>()
+                        .eq(VwSydwJbxxGx::getId, id)
+                        .last("limit 1")
+        );
+        String sszrqdm = gx.getSszrqdm();
+        if (StringUtils.isNotBlank(sszrqdm) && sszrqdm.length() >= 12) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(sszrqdm.substring(0, 12));
+            if (dept != null) {
+                gx.setSszrqmc(dept.getDeptname());
+            }
+        }
+        return gx;
+    }
+
+    @Override
+    public IPage<VwSydwCyryGx> getSydwCyryPage(VwSydwCyryPageQuery dto) {
+        return this.vwSydwCyryGxMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<VwSydwCyryGx>()
+                        .eq(VwSydwCyryGx::getXtZxbz, "0")
+                        .eq(VwSydwCyryGx::getDwid, dto.getDwid())
+        );
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSyrkJzgjGxServiceImpl.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSyrkJzgjGxServiceImpl.java
new file mode 100644
index 0000000..638c7da
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/service/impl/VwSyrkJzgjGxServiceImpl.java
@@ -0,0 +1,76 @@
+package com.mosty.base.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.manager.mapper.VwSydwCyryGxMapper;
+import com.mosty.base.manager.mapper.VwSyrkJzgjGxMapper;
+import com.mosty.base.manager.service.VwSyrkJzgjGxService;
+import com.mosty.base.model.entity.afjcsj.VwSydwCyryGx;
+import com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxQuery;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class VwSyrkJzgjGxServiceImpl extends ServiceImpl<VwSyrkJzgjGxMapper, VwSyrkJzgjGx>
+        implements VwSyrkJzgjGxService {
+
+    private final VwSydwCyryGxMapper vwSydwCyryGxMapper;
+
+    @Override
+    public IPage<VwSyrkJzgjGx> selectPageList(VwSyrkJzgjGxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        int count = this.baseMapper.getCount(map);
+        List<VwSyrkJzgjGx> list = this.baseMapper.getList(map);
+        IPage<VwSyrkJzgjGx> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<VwSyrkJzgjGx> selectGjList(VwSyrkJzgjGxListQuery dto) {
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<VwSyrkJzgjGx>()
+                        .eq(VwSyrkJzgjGx::getXtZxbz, "0")
+                        .eq(VwSyrkJzgjGx::getJzdFxjdm, "510109000000")
+                        .eq(VwSyrkJzgjGx::getZjhm, dto.getZjhm())
+        );
+    }
+
+    @Override
+    public List<Map<String, Object>> getStatistics() {
+        return this.baseMapper.getStatistics();
+    }
+
+    @Override
+    public List<VwSydwCyryGx> getSyrkCygj(String zjhm) {
+        return this.vwSydwCyryGxMapper.selectList(
+                new LambdaQueryWrapper<VwSydwCyryGx>()
+                        .eq(VwSydwCyryGx::getXtZxbz, "0")
+                        .eq(VwSydwCyryGx::getZjhm, zjhm)
+                        .orderByDesc(VwSydwCyryGx::getBgrq)
+        );
+    }
+
+    @Override
+    public VwSydwCyryGx getSyrkInfo(String id) {
+        return this.vwSydwCyryGxMapper.selectOne(
+                new LambdaQueryWrapper<VwSydwCyryGx>()
+                        .eq(VwSydwCyryGx::getId, id)
+                        .last(" limit 1")
+        );
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglDsfTask.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglDsfTask.java
new file mode 100644
index 0000000..2263098
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglDsfTask.java
@@ -0,0 +1,30 @@
+package com.mosty.base.manager.task;
+
+import com.mosty.base.manager.service.TbJcglDsfService;
+import com.mosty.base.manager.service.TpjcglZnzbService;
+import com.mosty.base.model.entity.jcgl.TbJcglDsf;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author dw
+ * @since 2022/8/6
+ * 规则：
+ * 1.每天查询过期时间，赋值状态为过期
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbJcglDsfTask {
+
+    private final TbJcglDsfService tbJcglDsfService;
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    @Transactional
+    public void run() {
+        this.tbJcglDsfService.checkDsf();
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglJxkhTask.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglJxkhTask.java
new file mode 100644
index 0000000..92091be
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglJxkhTask.java
@@ -0,0 +1,37 @@
+package com.mosty.base.manager.task;
+
+import com.mosty.base.manager.service.TbJcglDsfService;
+import com.mosty.base.manager.service.TbJcglKhtjService;
+import com.mosty.base.utils.DateUtils;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/6
+ * 规则：
+ * 1.每天凌晨一点对昨天的绩效进行考核 (修改一小时统计一次)
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbJcglJxkhTask {
+
+    private final TbJcglKhtjService tbJcglKhtjService;
+    public static boolean jxkh = true;
+
+    //    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 59 0/1 * * ?")
+    @Transactional
+    public void run() {
+        if (jxkh) {
+            String time = DateUtils.getSystemDateString();
+            this.tbJcglKhtjService.builder(time);
+        }
+    }
+}
diff --git a/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglZnzbTxTask.java b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglZnzbTxTask.java
new file mode 100644
index 0000000..388eb50
--- /dev/null
+++ b/mosty-jcgl/src/main/java/com/mosty/base/manager/task/TbJcglZnzbTxTask.java
@@ -0,0 +1,32 @@
+package com.mosty.base.manager.task;
+
+import com.mosty.base.manager.service.TpjcglZnzbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/6
+ * 规则：
+ * 1. 每天查看到期时间  到两个月的时候改为临期，并且发消息提醒
+ * 2. 每天扫描到故障装备，直接发消息提醒
+ * 3. 两种情况都只发送一次就行了
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbJcglZnzbTxTask {
+
+    private TpjcglZnzbService tpjcglZnzbService;
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    @Transactional
+    public void run() {
+        this.tpjcglZnzbService.checkZnzb();
+    }
+}
diff --git a/mosty-jcgl/src/main/resources/application.yml b/mosty-jcgl/src/main/resources/application.yml
new file mode 100644
index 0000000..7c11d03
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/application.yml
@@ -0,0 +1,77 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 80
+  
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+      - /doc.html/**
+
+config:
+  orgCode: 510600000000
diff --git a/mosty-jcgl/src/main/resources/bootstrap.yml b/mosty-jcgl/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..ec10112
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8009
+  servlet:
+    context-path: /mosty-jcgl/
+spring:
+  application:
+    name: mosty-jcgl
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-jcgl/src/main/resources/logback-spring.xml b/mosty-jcgl/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..bac2c23
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+<!--        <appender-ref ref="CONSOLE" />-->
+<!--        <appender-ref ref="LOG_FILE_INFO" />-->
+<!--        <appender-ref ref="LOG_FILE_WARN" />-->
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/resources/mapper/SysDeptRemoteService.xml b/mosty-jcgl/src/main/resources/mapper/SysDeptRemoteService.xml
new file mode 100644
index 0000000..f2efb90
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/SysDeptRemoteService.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXfclMapper">
+
+    <update id="deleteZb">
+        update tb_jcgl_xfcl set xt_scbz = '1' where c_id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglAbfcMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglAbfcMapper.xml
new file mode 100644
index 0000000..232822b
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglAbfcMapper.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglAbfcMapper">
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglAbfc" id="tbJcglAbfc">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="bt" column="bt" jdbcType="VARCHAR"/>
+        <result property="zy" column="zy" jdbcType="VARCHAR"/>
+        <result property="fjid" column="fjid" jdbcType="VARCHAR"/>
+        <result property="cjrid" column="cjrid" jdbcType="VARCHAR"/>
+        <result property="cjrxm" column="cjrxm" jdbcType="VARCHAR"/>
+        <result property="cjrsfzh" column="cjrsfzh" jdbcType="TIMESTAMP"/>
+        <result property="tjsj" column="tjsj" jdbcType="TIMESTAMP"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id,bt,zy,fjid,cjrid,cjrxm,cjrsfzh,tjsj,
+        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <select id="getList" resultMap="tbJcglAbfc"
+            parameterType="com.mosty.base.model.query.jcgl.TbJcglAbfcQuery">
+        select
+        <include refid="base_column_list"/>
+        from tb_jcgl_abfc where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="bt != null and bt != ''">
+            and bt like concat('%',#{bt},'%')
+        </if>
+        <if test="zy != null and zy != ''">
+            and zy like concat('%',#{zy},'%')
+        </if>
+        <if test="cjrid != null and cjrid != ''">
+            and cjrid = #{cjrid}
+        </if>
+        <if test="cjrxm != null and cjrxm != ''">
+            and cjrxm like concat('%',#{cjrxm},'%')
+        </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglBqMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglBqMapper.xml
new file mode 100644
index 0000000..58e6968
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglBqMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglBqMapper">
+
+    <select id="paginQuery" resultType="com.mosty.base.model.vo.jcgl.TbJcglBqVo">
+        select b.id,b.bqlx,b.bqmc,b.bqbh,b.bqpym,b.xt_sjzt,b.bqtb,b.mx_id,b.bz,(select count(1) from tb_jcgl_xfll_bq
+        where bq_id = b.id and xt_scbz = '0' and xt_sjzt = '1') as xfll_sl
+        from tb_jcgl_bq b
+        where b.xt_scbz = '0'
+        <if test="params.bqlx != null and params.bqlx != ''">
+            and bqlx=#{params.bqlx}
+        </if>
+        <if test="params.bqmc != null and params.bqmc != ''">
+            and bqmc like concat('%',#{params.bqmc},'%')
+        </if>
+        <if test="params.bqpym != null and params.bqpym != ''">
+            and bqpym like concat('%',#{params.bqpym},'%')
+        </if>
+    </select>
+    <select id="countBqsl" resultType="com.mosty.base.model.vo.jcgl.TbJcglBqVo">
+        select bq.id,bq.bqmc,bq.bqpym,bq.tp bqtb,IfNULL(bq2.sl,0)xfllSl,bq.bqlx from (
+        (select id,bqmc,bqpym,'' tp,bqlx from tb_jcgl_bq where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="vo.bqlx !=null and vo.bqlx !=''">
+            and bqlx = #{vo.bqlx}
+        </if>
+            )bq
+        LEFT JOIN
+        (select bq_id,count(*)sl from tb_jcgl_xfll_bq  where xt_scbz = 0  GROUP BY bq_id)bq2
+        on bq.id = bq2.bq_id)
+    </select>
+
+    <select id="countBqslByBqlx" resultType="java.lang.Integer">
+        select count(1) from tb_jcgl_bq where xt_scbz = '0' and bqlx = #{bqlx}
+    </select>
+
+    <!--批量删除-->
+    <update id="deleteBatch">
+        update tb_jcgl_bq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--批量注销-->
+    <update id="zxBatch">
+        update tb_jcgl_bq set xt_sjzt = '0' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglBxdMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglBxdMapper.xml
new file mode 100644
index 0000000..ab8a7be
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglBxdMapper.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglBxdMapper">
+    <!--批量删除-->
+    <update id="deleteBatch">
+        delete from tb_jcgl_bxd where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <insert id="insertExtity">
+        insert into tb_jcgl_bxd (id, ss_xfqy_id, bxd_mc, bxd_lx, yxq, jd, wd, zb, zbhash,
+                                 xxdz, bxd_tp, xzqhdm, bxdlydm, ssbmid, ssbm, ssbmdm, ssxgajid, ssxgaj,
+                                 ssxgajdm, sssgajid, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj,
+                                 xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr,
+                                 xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{ssXfqyId}, #{bxdMc}, #{bxdLx}, #{yxq}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}), #{zbhash},
+                #{xxdz}, #{bxdTp}, #{xzqhdm}, #{bxdlydm}, #{ssbmid}, #{ssbm}, #{ssbmdm}, #{ssxgajid}, #{ssxgaj},
+                #{ssxgajdm}, #{sssgajid}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj},
+                #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr},
+                #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <update id="updateEntity">
+        update tb_jcgl_bxd
+        <set>
+            <if test="ssXfqyId != null and ssXfqyId != ''">
+                ss_xfqy_id = #{ssXfqyId},
+            </if>
+            <if test="bxdMc != null and bxdMc    != ''">
+                bxd_mc = #{bxdMc},
+            </if>
+            <if test="bxdLx != null and bxdLx != ''">
+                bxd_lx = #{bxdLx},
+            </if>
+            <if test="yxq != null">
+                yxq = #{yxq},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="xxdz != null and xxdz != ''">
+                xxdz = #{xxdz},
+            </if>
+            <if test="bxdTp != null and bxdTp != ''">
+                bxd_tp = #{bxdTp},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="bxdlydm != null and bxdlydm != ''">
+                bxdlydm = #{bxdlydm},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <update id="updateYesterdayBxd">
+        update tb_jcgl_bxd
+        set xt_sjzt = '0'
+        where bxdlydm = '03'
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglBxxMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglBxxMapper.xml
new file mode 100644
index 0000000..7164aa4
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglBxxMapper.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglBxxMapper">
+
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglBxx" id="resultMap">
+        <result property="id" column="id"/>
+        <result property="ssXfqyId" column="ss_xfqy_id" jdbcType="VARCHAR"/>
+        <result property="bxxMc" column="bxx_mc" jdbcType="VARCHAR"/>
+        <result property="bxxLx" column="bxx_lx" jdbcType="VARCHAR"/>
+        <result property="jzId" column="jz_id" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.LineStringTypeHandler"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        ,ss_xfqy_id,bxx_mc,bxx_lx,jz_id,xzqhdm,
+        ssbm,ssbmdm,ssxgaj,ssxgajdm,ssbmid,ssxgajid,sssgajid,
+            sssgaj,sssgajdm,xt_sjly,xt_sjzt,xt_scbz,xt_cjip,xt_cjsj,xt_cjr_id,xt_cjr,xt_cjbmdm,xt_cjbmmc,xt_zhgxip,
+            xt_zhgxsj,xt_zhgxrid,xt_zhgxr,xt_zhgxbmdm,xt_zhgxbm,bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <!--保存必巡线信息-->
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglBxx">
+        insert into tb_jcgl_bxx (id, ss_xfqy_id, bxx_mc, bxx_lx, jz_id, xzqhdm, zb, ssbm, ssbmdm, ssxgaj, ssxgajdm,
+                                 sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                 xt_cjbmdm, xt_cjbmmc, xt_zhgxip,ssbmid,ssxgajid,sssgajid,
+                                 xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{ssXfqyId}, #{bxxMc}, #{bxxLx}, #{jzId}, #{xzqhdm},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglKfd">
+        update tb_jcgl_bxx
+        <set>
+            <if test="ssXfqyId != null and ssXfqyId != ''">
+                ss_xfqy_id = #{ssXfqyId},
+            </if>
+            <if test="bxxMc != null and bxxMc != ''">
+                bxx_mc = #{bxxMc},
+            </if>
+            <if test="bxxLx != null and bxxLx != ''">
+                bxx_lx = #{bxxLx},
+            </if>
+            <if test="jzId != null and jzId != ''">
+                jz_id = #{jzId},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--查询分页-->
+    <select id="getPageList" parameterType="Map" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_bxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ssXfqyId != null and dto.ssXfqyId != ''">
+            and ss_xfqy_id = #{dto.ssXfqyId}
+        </if>
+        <if test="dto.bxxLx != null and dto.bxxLx != ''">
+            and bxx_lx = #{dto.bxxLx}
+        </if>
+        <if test="dto.bxxMc != null and dto.bxxMc != ''">
+            and bxx_mc like concat('%',#{dto.bxxMc},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        order by xt_cjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询分页-->
+    <select id="getCount" parameterType="Map" resultType="Integer">
+        select count(1) from tb_jcgl_bxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ssXfqyId != null and dto.ssXfqyId != ''">
+            and ss_xfqy_id = #{dto.ssXfqyId}
+        </if>
+        <if test="dto.bxxLx != null and dto.bxxLx != ''">
+            and bxx_lx = #{dto.bxxLx}
+        </if>
+        <if test="dto.bxxMc != null and dto.bxxMc != ''">
+            and bxx_mc like concat('%',#{dto.bxxMc},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+    </select>
+
+    <!--获取详情-->
+    <select id="getById" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_bxx where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <!--批量删除-->
+    <delete id="deleteBatch">
+        delete from tb_jcgl_bxx where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJwzMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJwzMapper.xml
new file mode 100644
index 0000000..5f45528
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJwzMapper.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJwzMapper">
+
+    <delete id="deleteJwz">
+        delete from tb_jcgl_jwz where jwz_id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <insert id="insertEntity">
+        insert into tb_jcgl_jwz (jwz_id, jwz_lx, jwz_mc, jwz_dz, xzqhdm, jd, wd, zbhash, zb, xj_sj, fzr_sfzh, fzr_xm,
+                                 jwz_tp,
+                                 ssbmid, ssbm, ssbmdm, ssxgajid, ssxgaj, ssxgajdm, sssgaj, sssgajid, sssgajdm, xt_sjly,
+                                 xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                 xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{jwzId}, #{jwzLx}, #{jwzMc}, #{jwzDz}, #{xzqhdm}, #{jd}, #{wd}, #{zbhash},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{xjSj}, #{fzrSfzh}, #{fzrXm}, #{jwzTp},
+                #{ssbmid}, #{ssbm}, #{ssbmdm}, #{ssxgajid}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajid}, #{sssgajdm},
+                #{xtSjly},
+                #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <update id="updateEntity">
+        update tb_jcgl_jwz
+        <set>
+            <if test="jwzLx != null and jwzLx != ''">
+                jwz_lx = #{jwzLx},
+            </if>
+            <if test="jwzMc != null and jwzMc != ''">
+                jwz_mc = #{jwzMc},
+            </if>
+            <if test="jwzDz != null and jwzDz != ''">
+                jwz_dz = #{jwzDz},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="xjSj != null">
+                xj_sj = #{xjSj},
+            </if>
+            <if test="fzrSfzh != null and fzrSfzh != ''">
+                fzr_sfzh = #{fzrSfzh},
+            </if>
+            <if test="fzrXm != null and fzrXm != ''">
+                fzr_xm = #{fzrXm},
+            </if>
+            <if test="jwzTp != null and jwzTp != ''">
+                jwz_tp = #{jwzTp},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where jwz_id = #{jwzId}
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJyqxMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJyqxMapper.xml
new file mode 100644
index 0000000..733f11c
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJyqxMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJyqxMapper">
+
+
+    <update id="deleteZb">
+        update tb_jcgl_jyqx set xt_scbz = '1' where id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJzClMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJzClMapper.xml
new file mode 100644
index 0000000..2b4b876
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJzClMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJzClMapper">
+
+    <update id="deleteBatch">
+        update tb_jcgl_jz_cl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="deleteByQwjzId">
+        delete from tb_jcgl_jz_cl where qwjz_id = #{qwjzId}
+    </update>
+<!--    update tb_jcgl_jz_cl set xt_scbz = '1' where qwjz_id = #{qwjzId}-->
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJzJyqxMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJzJyqxMapper.xml
new file mode 100644
index 0000000..7ff4fe5
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJzJyqxMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJzJyqxMapper">
+
+    <update id="deleteBatch">
+        update tb_jcgl_jz_jyqx set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="deleteByQwjzId">
+        delete from tb_jcgl_jz_jyqx where qwjz_id = #{qwjzId}
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJzMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJzMapper.xml
new file mode 100644
index 0000000..4fd976b
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJzMapper.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJzMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.vo.jcgl.TbJcglJzAllVo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="jz_mc" property="jzMc"/>
+        <result column="jz_bh" property="jzBh"/>
+        <result column="jz_fl" property="jzFl"/>
+        <result column="jz_lx" property="jzLx"/>
+        <result column="dd_mjid" property="ddMjid"/>
+        <result column="dd_mjsfzh" property="ddMjsfzh"/>
+        <result column="dd_mjxm" property="ddMjxm"/>
+        <result column="dd_mjjh" property="ddMjjh"/>
+        <result column="dd_dh" property="ddDh"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="bz" property="bz"/>
+        <collection property="clList" ofType="com.mosty.base.model.entity.jcgl.TbJcglJzCl">
+            <result column="cl_id" property="clId"/>
+            <result column="qwjz_id" property="qwjzId"/>
+            <result column="jdchphm" property="jdchphm"/>
+            <result column="jdchpzldm" property="jdchpzldm"/>
+        </collection>
+        <collection property="jyqxList" ofType="com.mosty.base.model.entity.jcgl.TbJcglJzJyqx">
+            <result column="qwjz_id" property="qwjzId"/>
+            <result column="qx_id" property="qxId"/>
+            <result column="qxmc" property="qxmc"/>
+            <result column="qxlx" property="qxlx"/>
+            <result column="qxsl" property="qxsl"/>
+        </collection>
+        <collection property="jzryList" ofType="com.mosty.base.model.entity.jcgl.TbJcglJzRy">
+            <result column="ry_id" property="ryId"/>
+            <result column="qwjz_id" property="qwjzId"/>
+            <result column="jllx" property="jllx"/>
+            <result column="jlxm" property="jlxm"/>
+            <result column="jh" property="jh"/>
+            <result column="xbdm" property="xbdm"/>
+            <result column="sfzh" property="sfzh"/>
+            <result column="lxdh" property="lxdh"/>
+            <result column="nl" property="nl"/>
+        </collection>
+        <collection property="txzbList" ofType="com.mosty.base.model.entity.jcgl.TbJcglJzZnzb">
+            <result column="zb_id" property="zbId"/>
+            <result column="qwjz_id" property="qwjzId"/>
+            <result column="sbmc" property="sbmc"/>
+            <result column="txzblx" property="txzblx"/>
+            <result column="hh" property="hh"/>
+        </collection>
+    </resultMap>
+
+    <!--查询列表-->
+    <select id="queryList" resultType="com.mosty.base.model.entity.jcgl.TbJcglJz">
+        select a.* from tb_jcgl_jz a
+        where a.xt_scbz = '0'
+        <if test="dto.jzMc != null and dto.jzMc != ''">
+            and a.jz_mc like concat('%',#{dto.jzMc,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.jzFl != null and dto.jzFl != ''">
+            and a.jz_fl = #{dto.jzFl,jdbcType=VARCHAR}
+        </if>
+        <if test="dto.ddMjsfzh != null and dto.ddMjsfzh != ''">
+            and a.dd_mjsfzh like concat('%',#{dto.ddMjsfzh,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.ddMjxm != null and dto.ddMjxm != ''">
+            and a.dd_mjxm like concat('%',#{dto.ddMjxm,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">-->
+<!--            and a.ssbmdm = #{dto.ssbmdm,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid,jdbcType=VARCHAR}-->
+<!--        </if>-->
+        <!-- 数据范围过滤 -->
+<!--        ${createSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询列表-->
+    <select id="queryCount" resultType="Integer">
+        select count(1) from tb_jcgl_jz a
+        where a.xt_scbz = '0'
+        <if test="dto.jzMc != null and dto.jzMc != ''">
+            and a.jz_mc like concat('%',#{dto.jzMc,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.jzFl != null and dto.jzFl != ''">
+            and a.jz_fl = #{dto.jzFl,jdbcType=VARCHAR}
+        </if>
+        <if test="dto.ddMjsfzh != null and dto.ddMjsfzh != ''">
+            and a.dd_mjsfzh like concat('%',#{dto.ddMjsfzh,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.ddMjxm != null and dto.ddMjxm != ''">
+            and a.dd_mjxm like concat('%',#{dto.ddMjxm,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid,jdbcType=VARCHAR}-->
+<!--        </if>-->
+        <!-- 数据范围过滤 -->
+<!--        ${createSql}-->
+    </select>
+
+    <!--id查询-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select a.*, b.*, c.*, d.*, e.*
+        from tb_jcgl_jz a
+                 left join tb_jcgl_jz_cl b on a.id = b.qwjz_id
+                 left join tb_jcgl_jz_jyqx c on a.id = c.qwjz_id
+                 left join tb_jcgl_jz_ry d on a.id = d.qwjz_id
+                 left join tb_jcgl_jz_znzb e on a.id = e.qwjz_id
+        where a.xt_scbz = '0'
+          and a.id = #{id,jdbcType=VARCHAR}
+    </select>
+
+    <!--批量删除-->
+    <update id="deleteBatch">
+        update tb_jcgl_jz set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJzRyMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJzRyMapper.xml
new file mode 100644
index 0000000..d99eada
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJzRyMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJzRyMapper">
+
+    <update id="deleteBatch">
+        update tb_jcgl_jz_ry set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="deleteByQwjzId">
+        delete from tb_jcgl_jz_ry where qwjz_id = #{qwjzId}
+    </update>
+<!--    update tb_jcgl_jz_ry set xt_scbz = '1' where qwjz_id = #{qwjzId}-->
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglJzTxzbMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglJzTxzbMapper.xml
new file mode 100644
index 0000000..b8ba183
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglJzTxzbMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglJzZnzbMapper">
+
+    <update id="deleteBatch">
+        update tb_jcgl_jz_znzb set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="deleteByQwjzId">
+        delete from tb_jcgl_jz_znzb where qwjz_id = #{qwjzId}
+    </update>
+<!--    update tb_jcgl_jz_znzb set xt_smcbz = '1' where qwjz_id = #{qwjzId}-->
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglKfdMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglKfdMapper.xml
new file mode 100644
index 0000000..1fd8ebb
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglKfdMapper.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglKfdMapper">
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglKfd" id="resultMap">
+        <result property="kfdId" column="kfd_id" jdbcType="VARCHAR"/>
+        <result property="dwlx" column="dwlx" jdbcType="VARCHAR"/>
+        <result property="kfdMc" column="kfd_mc" jdbcType="VARCHAR"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="kfdDz" column="kfd_dz" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="yfzfw" column="yfzfw" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="sfzfw" column="sfzfw" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="wfzfw" column="wfzfw" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="kfdTp" column="znsbbs" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="fzrSfzh" column="fzr_sfzh" jdbcType="VARCHAR"/>
+        <result property="fzrXm" column="fzr_xm" jdbcType="VARCHAR"/>
+        <result property="cjsj" column="cjsj" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        kfd_id,dwlx,kfd_mc,xzqhdm,kfd_dz,jd,wd,zbhash,kfd_tp,ssbm,ssbmdm,ssxgaj,ssxgajdm,ssbmid,ssxgajid,sssgajid,
+        sssgaj,sssgajdm,xt_sjly,xt_sjzt,xt_scbz,xt_cjip,xt_cjsj,xt_cjr_id,xt_cjr,xt_cjbmdm,xt_cjbmmc,xt_zhgxip,
+        xt_zhgxsj,xt_zhgxrid,xt_zhgxr,xt_zhgxbmdm,xt_zhgxbm,bz,fzr_sfzh,fzr_xm,cjsj
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb,
+        ST_ASWKT(yfzfw) as yfzfw,
+        ST_ASWKT(sfzfw) as sfzfw,
+        ST_ASWKT(wfzfw) as wfzfw
+    </sql>
+
+    <!--保存快反点信息-->
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglKfd">
+        insert into tb_jcgl_kfd (kfd_id, dwlx, kfd_mc, xzqhdm, kfd_dz, jd, wd, zb, zbhash, yfzfw, sfzfw, wfzfw, kfd_tp,
+                                 ssbm,
+                                 ssbmdm, ssxgaj, ssxgajdm, ssbmid, ssxgajid, sssgajid,
+                                 sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                 xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                 xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, fzr_sfzh, fzr_xm, cjsj)
+        values (#{kfdId}, #{dwlx}, #{kfdMc}, #{xzqhdm}, #{kfdDz}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}), #{zbhash},
+                ST_GEOMFROMTEXT(#{yfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                ST_GEOMFROMTEXT(#{sfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                ST_GEOMFROMTEXT(#{wfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{kfdTp}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{fzrSfzh}, #{fzrXm}, #{cjsj})
+    </insert>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglKfd">
+        update tb_jcgl_kfd
+        <set>
+            <if test="dwlx != null and dwlx != ''">
+                dwlx = #{dwlx},
+            </if>
+            <if test="kfdMc != null and kfdMc != ''">
+                kfd_mc = #{kfdMc},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="kfdDz != null and kfdDz != ''">
+                kfd_dz = #{kfdDz},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="yfzfw != null">
+                yfzfw = ST_GEOMFROMTEXT(#{yfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="sfzfw != null">
+                sfzfw = ST_GEOMFROMTEXT(#{sfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="wfzfw != null">
+                wfzfw = ST_GEOMFROMTEXT(#{wfzfw,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="kfdTp != null and kfdTp != ''">
+                kfd_tp = #{kfdTp},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+
+
+            <if test="fzrSfzh != null and fzrSfzh != ''">
+                fzr_sfzh = #{fzrSfzh},
+            </if>
+
+            <if test="fzrXm != null and fzrXm != ''">
+                fzr_xm = #{fzrXm},
+            </if>
+
+            <if test="cjsj != null and cjsj != ''">
+                cjsj = #{cjsj},
+            </if>
+
+
+
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where kfd_id = #{kfdId}
+    </update>
+
+
+    <!--查询不分页-->
+    <select id="getListAll" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_kfd where xt_sjzt = '1' and xt_scbz = '0'
+    </select>
+
+
+    <!--查询分页-->
+    <select id="getPageList" parameterType="Map" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_jcgl_kfd where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.kfdMc != null and dto.kfdMc != ''">
+            and kfd_mc like concat('%',#{dto.kfdMc},'%')
+        </if>
+        <if test="dto.kfdDz != null and dto.kfdDz != ''">
+            and kfd_dz like concat('%',#{dto.kfdDz},'%')
+        </if>
+        <if test="dwlxList != null and dwlxList.size() > 0">
+            and dwlx in
+            <foreach collection="dwlxList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">-->
+<!--            and ssbmdm like concat('%',#{dto.ssbmdm},'%')-->
+<!--        </if>-->
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid like concat('%',#{dto.ssbmid},'%')-->
+<!--        </if>-->
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+        order by xt_cjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询分页-->
+    <select id="getCount" parameterType="Map" resultType="Integer">
+        select count(1) from tb_jcgl_kfd where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.kfdMc != null and dto.kfdMc != ''">
+            and kfd_mc like concat('%',#{dto.kfdMc},'%')
+        </if>
+        <if test="dto.kfdDz != null and dto.kfdDz != ''">
+            and kfd_dz like concat('%',#{dto.kfdDz},'%')
+        </if>
+        <if test="dwlxList != null and dwlxList.size() > 0">
+            and dwlx in
+            <foreach collection="dwlxList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+
+<!--        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">-->
+<!--            and ssbmdm like concat('%',#{dto.ssbmdm},'%')-->
+<!--        </if>-->
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid like concat('%',#{dto.ssbmid},'%')-->
+<!--        </if>-->
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+    </select>
+
+    <!--获取详情-->
+    <select id="getById" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_kfd where xt_sjzt = '1' and xt_scbz = '0'
+        and kfd_id = #{kfdId}
+    </select>
+
+    <!--删除快反点-->
+    <update id="deleteKfd">
+        delete from tb_jcgl_kfd where kfd_id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglKhbmMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglKhbmMapper.xml
new file mode 100644
index 0000000..ecfbc15
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglKhbmMapper.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglKhbmMapper">
+    <delete id="delKhbm">
+        delete from tb_jcgl_khbm where ssbmid in
+        <foreach collection="list" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </delete>
+
+    <select id="getAllKhbm" resultType="java.lang.String">
+        select ssbmid
+        from tb_jcgl_khbm
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+
+    </select>
+
+    <update id="editKhbm">
+        update tb_jcgl_khbm
+        <set>
+            <if test="dto.ybb != null ">
+                ybb = #{dto.ybb},
+            </if>
+            <if test="dto.ycr != null ">
+                ycr = #{dto.ycr},
+            </if>
+            <if test="dto.ycc != null ">
+                ycc = #{dto.ycc},
+            </if>
+            <if test="dto.yxlsc != null ">
+                yxlsc = #{dto.yxlsc},
+            </if>
+            <if test="dto.yxllc != null ">
+                yxllc = #{dto.yxllc},
+            </if>
+            <if test="dto.crf != null ">
+                crf = #{dto.crf},
+            </if>
+            <if test="dto.ccf != null ">
+                ccf = #{dto.ccf},
+            </if>
+            <if test="dto.cwf != null ">
+                cwf = #{dto.cwf},
+            </if>
+            <if test="dto.ycw != null ">
+                ycw = #{dto.ycw},
+            </if>
+            <if test="dto.yqs != null ">
+                yqs = #{dto.yqs},
+            </if>
+            <if test="dto.qsf != null ">
+                qsf = #{dto.qsf},
+            </if>
+            <if test="dto.xlscf != null ">
+                xlscf = #{dto.xlscf},
+            </if>
+            <if test="dto.xllcf != null ">
+                xllcf = #{dto.xllcf},
+            </if>
+            <if test="dto.yxl != null ">
+                yxl = #{dto.yxl},
+            </if>
+            <if test="dto.xlf != null ">
+                xlf = #{dto.xlf},
+            </if>
+            <if test="dto.bbf != null ">
+                bbf = #{dto.bbf},
+            </if>
+            <if test="dto.mxmc != null and dto.mxmc != ''">
+                mxmc = #{dto.mxmc}
+            </if>
+        </set>
+        where id = #{dto.id}
+    </update>
+</mapper>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglKhtjMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglKhtjMapper.xml
new file mode 100644
index 0000000..d21df3c
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglKhtjMapper.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglKhtjMapper">
+    <select id="getCount" resultType="int">
+        <if test='orglevel == "3"'>
+            select count(DISTINCT(ssxgajid)) from tb_jcgl_khtj where xt_sjzt = '1'
+        </if>
+        <if test='orglevel == "4"'>
+            select count(DISTINCT(ssbmid)) from tb_jcgl_khtj where xt_sjzt = '1'
+        </if>
+        and xt_scbz = '0'
+        <if test="bmdmList != null and bmdmList != ''">
+            and ssbmdm like concat(#{bmdmList},'%')
+        </if>
+
+        <if test="kssj != null and kssj != ''">
+            and date_format(tjrq,'%Y-%m-%d') >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and date_format(tjrq,'%Y-%m-%d') &lt;= #{jssj}
+        </if>
+    </select>
+
+
+    <select id="getStatistics" resultType="java.util.Map">
+        select
+        <if test='searchType == "01"'>
+            IFNULL(sum(ybb),0) ybb,IFNULL(sum(sjbb),0) sjbb,IFNULL(sum(wbb),0) wbb,IFNULL(sum(bbf),0) bbf,IFNULL(sum(bbkf),0) bbkf,IFNULL(sum(zsbb),0) zsbb
+        </if>
+        <if test='searchType == "02"'>
+            IFNULL(sum(yxl),0) yxl,IFNULL(sum(sjxl),0) sjxl,IFNULL(sum(wxl),0) wxl,IFNULL(sum(xlf),0) xlf,IFNULL(sum(zsxl),0) zsxl,IFNULL(sum(xlkf),0) xlkf
+        </if>
+        <if test='searchType == "03"'>
+            IFNULL(sum(yqs),0) yqs,IFNULL(sum(sjqs),0) sjqs,IFNULL(sum(wqs),0) wqs,IFNULL(sum(qsf),0) qsf,IFNULL(sum(qskf),0) qskf,IFNULL(sum(qskf),0) qskf
+        </if>
+
+        <if test='searchType == "04"'>
+            IFNULL(sum(ycr),0) ycr,IFNULL(sum(sjcr),0) sjcr,IFNULL(sum(wcr),0) wcr,IFNULL(sum(crf),0) crf,IFNULL(sum(zscr),0) zscr,IFNULL(sum(crkf),0) crkf
+        </if>
+        <if test='searchType == "05"'>
+            IFNULL(sum(ycc),0) ycc,IFNULL(sum(sjcc),0) sjcc,IFNULL(sum(wcc),0) wcc,IFNULL(sum(ccf),0) ccf,IFNULL(sum(zscc),0) zscc,IFNULL(sum(cckf),0) cckf
+        </if>
+        <if test='searchType == "06"'>
+            IFNULL(sum(yxlsc),0) yxlsc,IFNULL(sum(sjxlsc),0) sjxlsc,IFNULL(sum(wxlsc),0) wxlsc,IFNULL(sum(xlscf),0) xlscf,IFNULL(sum(zsxlsc),0) zsxlsc,IFNULL(sum(xlsckf),0) xlsckf
+        </if>
+        <if test='searchType == "07"'>
+            IFNULL(sum(yxllc),0) yxllc,IFNULL(sum(sjxllc),0) sjxllc,IFNULL(sum(wxllc),0) wxllc,IFNULL(sum(xllcf),0) xllcf,IFNULL(sum(zsxllc),0) zsxllc,IFNULL(sum(xllckf),0) xllckf
+        </if>
+        <if test='searchType == "08"'>
+            IFNULL(sum(ycw),0) ycw,IFNULL(sum(sjcw),0) sjcw,IFNULL(sum(wcw),0) wcw,IFNULL(sum(cwf),0) cwf,IFNULL(sum(zscw),0) zscw,IFNULL(sum(cwkf),0) cwkf
+        </if>
+        ,IFNULL(sum(sxkf),0) sxkf
+        from tb_jcgl_khtj where xt_sjzt = '1'
+        and xt_scbz = '0'
+        <if test="bmdmList != null and bmdmList != ''">
+            and ssbmdm like concat(#{bmdmList},'%')
+        </if>
+        <if test="time != null and time != ''">
+            and date_format(tjrq,'%Y-%m-%d') = #{time}
+        </if>
+    </select>
+
+    <select id="getList" resultType="com.mosty.base.model.vo.jcgl.TbJcglKhtjVo">
+        <if test='orglevel == "3"'>
+            select ssxgajdm ssbmdm,ssxgaj ssbm, "3" orglevel,
+        </if>
+        <if test='orglevel == "4"'>
+            select ssbmdm,ssbm, "4" orglevel,
+        </if>
+        <if test='searchType == "01"'>
+            sum(ybb) ybb,sum(sjbb) sjbb,sum(wbb) wbb,sum(bbf) bbf,sum(zsbb) zsbb,sum(bbkf) bbkf
+        </if>
+        <if test='searchType == "02"'>
+            sum(yxl) yxl,sum(sjxl) sjxl,sum(wxl) wxl,sum(xlf) xlf,sum(zsxl) zsxl,sum(xlkf) xlkf
+        </if>
+        <if test='searchType == "03"'>
+            sum(yqs) yqs,sum(sjqs) sjqs,sum(wqs) wqs,sum(qsf) qsf,sum(zsqs) zsqs,sum(qskf) qskf
+        </if>
+
+        <if test='searchType == "04"'>
+            sum(ycr) ycr,sum(sjcr) sjcr,sum(wcr) wcr,sum(crf) crf,sum(zscr) zscr,sum(crkf) crkf
+        </if>
+
+        <if test='searchType == "05"'>
+            sum(ycc) ycc,sum(sjcc) sjcc,sum(wcc) wcc,sum(ccf) ccf,sum(zscc) zscc,sum(cckf) cckf
+        </if>
+
+        <if test='searchType == "06"'>
+            sum(yxlsc) yxlsc,sum(sjxlsc) sjxlsc,sum(wxlsc) wxlsc,sum(xlscf) xlscf,sum(zsxlsc) zsxlsc,sum(xlsckf) xlsckf
+        </if>
+
+        <if test='searchType == "07"'>
+            sum(yxllc) yxllc,sum(sjxllc) sjxllc,sum(wxllc) wxllc,sum(xllcf) xllcf,sum(zsxllc) zsxllc,sum(xllckf) xllckf
+        </if>
+        <if test='searchType == "08"'>
+            sum(ycw) ycw,sum(sjcw) sjcw,sum(wcw) wcw,sum(cwf) cwf,sum(zscw) zscw,sum(cwkf) cwkf
+        </if>
+
+
+        <if test='searchType != "01" and searchType != "02" and searchType != "03" and searchType != "04" and searchType != "05" and searchType != "06" and searchType != "07"  and searchType != "08"'>
+            sum(ybb) ybb,sum(sjbb) sjbb,sum(wbb) wbb,sum(bbf) bbf,sum(zsbb) zsbb,sum(bbkf) bbkf,
+            sum(yxl) yxl,sum(sjxl) sjxl,sum(wxl) wxl,sum(xlf) xlf,sum(zsxl) zsxl,sum(xlkf) xlkf,
+            sum(yqs) yqs,sum(sjqs) sjqs,sum(wqs) wqs,sum(qsf) qsf,sum(zsqs) zsqs,sum(qskf) qskf,
+            sum(ycr) ycr,sum(sjcr) sjcr,sum(wcr) wcr,sum(crf) crf,sum(zscr) zscr,sum(crkf) crkf,
+            sum(ycc) ycc,sum(sjcc) sjcc,sum(wcc) wcc,sum(ccf) ccf,sum(zscc) zscc,sum(cckf) cckf,
+            sum(yxlsc) yxlsc,sum(sjxlsc) sjxlsc,sum(wxlsc) wxlsc,sum(xlscf) xlscf,sum(zsxlsc) zsxlsc,sum(xlsckf) xlsckf,
+            sum(yxllc) yxllc,sum(sjxllc) sjxllc,sum(wxllc) wxllc,sum(xllcf) xllcf,sum(zsxllc) zsxllc,sum(xllckf) xllckf,
+            sum(ycw) ycw,sum(sjcw) sjcw,sum(wcw) wcw,sum(cwf) cwf,sum(zscw) zscw,sum(cwkf) cwkf
+        </if>
+        ,sum(sxkf) sxkf  from tb_jcgl_khtj where xt_sjzt = '1'
+        and xt_scbz = '0'
+        <if test="bmdmList != null and bmdmList != ''">
+            and ssbmdm like concat(#{bmdmList},'%')
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and date_format(tjrq,'%Y-%m-%d') >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and date_format(tjrq,'%Y-%m-%d') &lt;= #{jssj}
+        </if>
+        <if test='orglevel == "3"'>
+            group by ssxgajdm,ssxgaj order by ssxgajdm
+        </if>
+        <if test='orglevel == "4"'>
+            group by ssbmdm,ssbm order by ssbmdm
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select  id="getFxbm" resultType="com.mosty.base.model.vo.jcgl.TbJcglKhtjVo">
+            <if test='orglevel == "3"'>
+                select distinct ssxgajdm ssbmdm,ssxgaj ssbm, "3" orglevel
+            </if>
+            <if test='orglevel == "4"'>
+                select distinct ssbmdm,ssbm, "4" orglevel
+            </if>
+            from tb_jcgl_khtj where xt_sjzt = '1'
+            and xt_scbz = '0'
+            <if test="bmdmList != null and bmdmList != ''">
+                and ssbmdm like concat(#{bmdmList},'%')
+            </if>
+            <if test="kssj != null and kssj != ''">
+                and date_format(tjrq,'%Y-%m-%d') >= #{kssj}
+            </if>
+            <if test="jssj != null and jssj != ''">
+                and date_format(tjrq,'%Y-%m-%d') &lt;= #{jssj}
+            </if>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglPzfzMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglPzfzMapper.xml
new file mode 100644
index 0000000..5ba901d
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglPzfzMapper.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglPzfzMapper">
+
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglPzfz" id="tbJcglPzfz">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="pzlx" column="pzlx" jdbcType="VARCHAR"/>
+        <result property="pzfz" column="pzfz" jdbcType="INTEGER"/>
+        <result property="pzsjfw" column="pzsjfw" jdbcType="INTEGER"/>
+        <result property="pzrid" column="pzrid" jdbcType="VARCHAR"/>
+        <result property="pzrxm" column="pzrxm" jdbcType="VARCHAR"/>
+        <result property="pzrsfzh" column="pzrsfzh" jdbcType="TIMESTAMP"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, pzlx, pzfz, pzsjfw, pzrid, pzrxm, pzrsfzh, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <select id="getList" resultType="java.util.Map">
+        select
+        <include refid="base_column_list" />
+        from tb_jcgl_pzfz where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.pzlx != null and dto.pzlx !='' ">
+            and pzlx = #{dto.pzlx}
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getListCount" resultType="int">
+        select count(1) from tb_jcgl_pzfz where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.pzlx != null and dto.pzlx !='' ">
+            and pzlx = #{dto.pzlx}
+        </if>
+    </select>
+
+    <select id="getPageListWtj" resultType="java.util.Map">
+        select <include refid="base_column_list" /> from tb_jcgl_pzfz where xt_scbz = '0' and xt_sjzt = '1'
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <delete id="deleteByPzfzId">
+        delete from tb_jcgl_pzfz where id = #{id}
+    </delete>
+
+    <select id="selectPzlx" resultMap="tbJcglPzfz">
+        select * from tb_jcgl_pzfz where pzlx = #{pzlx}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglXfMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglXfMapper.xml
new file mode 100644
index 0000000..8a9b393
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglXfMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXfMapper">
+    <select id="xfbmtj" resultType="java.util.Map">
+        SELECT ssbmdm, ssbm, COUNT( 1 ) as sc FROM tb_jcgl_xf
+        WHERE xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat (#{ssbmdm},'%')
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and to_char(xfsj,'yyyy-MM-dd HH:mm:ss') >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and to_char(xfsj,'yyyy-MM-dd HH:mm:ss') &lt;= #{jssj}
+        </if>
+        GROUP BY ssbmdm, ssbm
+    </select>
+
+    <update id="bacthSb">
+        update tb_jcgl_xf set sbzt = '02' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglXfllMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglXfllMapper.xml
new file mode 100644
index 0000000..2009b02
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglXfllMapper.xml
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXfllMapper">
+    <resultMap type="com.mosty.base.model.vo.jcgl.TbJcglXfllVo" id="TbJcglXfllMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ryid" column="ryid" jdbcType="VARCHAR"/>
+        <result property="fl" column="fl" jdbcType="VARCHAR"/>
+        <result property="lx" column="lx" jdbcType="VARCHAR"/>
+        <result property="xm" column="xm" jdbcType="VARCHAR"/>
+        <result property="xbdm" column="xbdm" jdbcType="VARCHAR"/>
+        <result property="sfzh" column="sfzh" jdbcType="VARCHAR"/>
+        <result property="jh" column="jh" jdbcType="VARCHAR"/>
+        <result property="jx" column="jx" jdbcType="VARCHAR"/>
+        <result property="zzmm" column="zzmm" jdbcType="VARCHAR"/>
+        <result property="hyzk" column="hyzk" jdbcType="VARCHAR"/>
+        <result property="rzsj" column="rzsj" jdbcType="TIMESTAMP"/>
+        <result property="csrq" column="csrq" jdbcType="TIMESTAMP"/>
+        <result property="mzdm" column="mzdm" jdbcType="VARCHAR"/>
+        <result property="whcddm" column="whcddm" jdbcType="VARCHAR"/>
+        <result property="jgdm" column="jgdm" jdbcType="VARCHAR"/>
+        <result property="jtzz" column="jtzz" jdbcType="VARCHAR"/>
+        <result property="lxdh" column="lxdh" jdbcType="VARCHAR"/>
+        <result property="dzyx" column="dzyx" jdbcType="VARCHAR"/>
+        <result property="tp" column="tp" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <collection property="expList" javaType="ArrayList"
+                    ofType="com.mosty.base.model.vo.jcgl.TbJcglBqVo" select="selectExpTag"
+                    column="{xfll_id = id}"/>
+        <collection property="sklList" javaType="ArrayList"
+                    ofType="com.mosty.base.model.vo.jcgl.TbJcglBqVo" select="selectSklTag" column="{xfll_id = id}"/>
+        <collection property="xljlList" javaType="ArrayList"
+                    ofType="com.mosty.base.model.vo.jcgl.TbJcglBqVo" select="selectXljl"
+                    column="{xfll_id = id}"/>
+    </resultMap>
+
+    <resultMap type="com.mosty.base.model.vo.jcgl.TbJcglZyjz" id="tbJcglZyjz">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ryid" column="ryid" jdbcType="VARCHAR"/>
+        <result property="fl" column="fl" jdbcType="VARCHAR"/>
+        <result property="lx" column="lx" jdbcType="VARCHAR"/>
+        <result property="xm" column="xm" jdbcType="VARCHAR"/>
+        <result property="xbdm" column="xbdm" jdbcType="VARCHAR"/>
+        <result property="sfzh" column="sfzh" jdbcType="VARCHAR"/>
+        <result property="jh" column="jh" jdbcType="VARCHAR"/>
+        <result property="jx" column="jx" jdbcType="VARCHAR"/>
+        <result property="zzmm" column="zzmm" jdbcType="VARCHAR"/>
+        <result property="hyzk" column="hyzk" jdbcType="VARCHAR"/>
+        <result property="rzsj" column="rzsj" jdbcType="TIMESTAMP"/>
+        <result property="csrq" column="csrq" jdbcType="TIMESTAMP"/>
+        <result property="mzdm" column="mzdm" jdbcType="VARCHAR"/>
+        <result property="whcddm" column="whcddm" jdbcType="VARCHAR"/>
+        <result property="jgdm" column="jgdm" jdbcType="VARCHAR"/>
+        <result property="jtzz" column="jtzz" jdbcType="VARCHAR"/>
+        <result property="lxdh" column="lxdh" jdbcType="VARCHAR"/>
+        <result property="dzyx" column="dzyx" jdbcType="VARCHAR"/>
+        <result property="tp" column="tp" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="wzXz" column="wz_xz" jdbcType="VARCHAR"/>
+        <result property="wzBc" column="wz_bc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="jlzt" column="jlzt" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <resultMap type="com.mosty.base.model.vo.jcgl.TbJcglBqVo" id="TbJcglBqMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="bqlx" column="bqlx" jdbcType="VARCHAR"/>
+        <result property="bqmc" column="bqmc" jdbcType="VARCHAR"/>
+        <result property="bqpym" column="bqpym" jdbcType="VARCHAR"/>
+        <result property="bqtb" column="bqtb" jdbcType="VARCHAR"/>
+        <result property="mxId" column="mx_id" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap type="com.mosty.base.model.vo.jcgl.TbJcglXljlVo" id="TbJcglXljlMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="xfllId" column="xfll_id" jdbcType="VARCHAR"/>
+        <result property="xlrq" column="xlrq" jdbcType="VARCHAR"/>
+        <result property="xlcj" column="xlcj" jdbcType="VARCHAR"/>
+        <result property="xlsc" column="xlsc" jdbcType="VARCHAR"/>
+        <result property="xllx" column="xllx" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="selectXljl" resultMap="TbJcglXljlMap">
+
+                       SELECT
+                            id,xfll_id,xlrq,xlcj,xlsc,xllx
+                        FROM
+                            tb_jcgl_xljl
+                        WHERE
+                            xfll_id = #{xfll_id}
+                            AND xt_sjzt = '1'
+                            AND xt_scbz = '0'
+
+    </select>
+
+
+    <select id="selectExpTag" resultMap="TbJcglBqMap">
+
+
+                                select b.id, b.bqmc, b.bqpym, b.bqtb, b.mx_id, b.bz
+                                from tb_jcgl_xfll_bq q
+                                             inner join tb_jcgl_bq b on q.bq_id = b.id and q.xt_sjzt = '1' and q.xt_scbz = '0'
+                                where b.xt_sjzt = '1'
+                                  and b.xt_scbz = '0'
+                                  and q.xfll_id = #{xfll_id}
+                                  and b.bqlx = 'EXP'
+                                <![CDATA[ and DATE_FORMAT(q.yxsj, '%Y-%m-%d') >= DATE_FORMAT(now(), '%Y-%m-%d')
+
+
+
+        ]]>
+    </select>
+
+    <select id="selectSklTag" resultMap="TbJcglBqMap">
+
+
+
+                                select b.id, b.bqmc, b.bqpym, b.bqtb, b.mx_id, b.bz
+                                from tb_jcgl_xfll_bq q
+                                             inner join tb_jcgl_bq b on q.bq_id = b.id and q.xt_sjzt = '1' and q.xt_scbz = '0'
+                                where b.xt_sjzt = '1'
+                                  and b.xt_scbz = '0'
+                                  and q.xfll_id = #{xfll_id}
+                                  and b.bqlx = 'SKL'
+
+
+
+    </select>
+
+    <sql id="selectVo">
+
+
+
+                                SELECT id,
+                                       ryid,
+                                       fl,
+                                       lx,
+                                       xm,
+                                       xbdm,
+                                       sfzh,
+                                       jh,
+                                       jx,
+                                       zzmm,
+                                       hyzk,
+                                       rzsj,
+                                       csrq,
+                                       mzdm,
+                                       whcddm,
+                                       jgdm,
+                                       jtzz,
+                                       lxdh,
+                                       dzyx,
+                                       tp,
+                                       ssbm,
+                                       ssbmid,
+                                       ssbmdm,
+                                       ssxgaj,
+                                       ssxgajid,
+                                       ssxgajdm,
+                                       sssgaj,
+                                       sssgajid,
+                                       sssgajdm,
+                                       bz,
+                                       xt_sjzt,
+                                       tpid
+                                FROM tb_jcgl_xfll
+
+
+
+    </sql>
+
+    <update id="deleteList">
+        update tb_jcgl_xfll set xt_scbz = '1' where id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="getList" resultMap="TbJcglXfllMap">
+        <include refid="selectVo"/>
+        where xt_scbz = '0'
+        <if test="params.xtSjzt != null and params.xtSjzt != ''">
+            and xt_sjzt = #{params.xtSjzt}
+        </if>
+        <if test="params.fl != null and params.fl != ''">
+            and fl = #{params.fl}
+        </if>
+        <if test="params.lx != null and params.lx != ''">
+            and lx = #{params.lx}
+        </if>
+        <if test="params.xm != null and params.xm != ''">
+            and xm like concat('%',#{params.xm},'%')
+        </if>
+        <if test="params.xbdm != null and params.xbdm != ''">
+            and xbdm = #{params.xbdm}
+        </if>
+        <if test="params.sfzh != null and params.sfzh != ''">
+            and sfzh like concat('%',#{params.sfzh},'%')
+        </if>
+        <if test="params.jh != null and params.jh != ''">
+            and jh = #{params.jh}
+        </if>
+        <if test="params.lxdh != null and params.lxdh != ''">
+            and rzsj = #{params.lxdh}
+        </if>
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and ssbmdm  like concat(#{params.ssbmdm},'%')
+        </if>
+<!--        <if test="params.ssbmid != null and params.ssbmid != ''">-->
+<!--            and ssbmid = #{params.ssbmid}-->
+<!--        </if>-->
+        <if test="params.bqId != null and params.bqId != ''">
+            and id in (select xfll_id from tb_jcgl_xfll_bq where xt_sjzt = '1' and bq_id = #{params.bqId})
+        </if>
+        ORDER BY xt_cjsj DESC
+        <!-- 数据范围过滤 -->
+<!--        ${createSql}-->
+    </select>
+
+    <select id="queryById" resultMap="TbJcglXfllMap">
+        <include refid="selectVo">
+        </include>
+        where id = #{id}
+    </select>
+
+    <select id="selectAllPolice" resultType="java.util.Map">
+
+
+
+                                select count(*)                             allPoilceRoom,
+                                       (
+                                               SELECT count(*)
+                                               FROM `tb_jcgl_xfll`
+                                               where sfzh not in (select sfzh from mosty_qwgl.tb_qw_jl where xt_sjzt = 1
+                                                 and sfzh !='')
+
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        ) onAllPoilceRoom
+                                FROM `tb_jcgl_xfll`
+                                where sfzh
+                            <if test="ssbmdm != null and ssbmdm != ''">
+                                and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+                            </if>
+
+    </select>
+
+    <select id="selectPolice" resultType="java.util.Map">
+
+
+
+                                select count(*)                          allPoilce,
+                                       (
+                                               SELECT count(*)
+                                               FROM `tb_jcgl_xfll`
+                                               where sfzh not in
+                                                   (select sfzh from mosty_qwgl.tb_qw_jl where xt_sjzt = 1
+                                                 and sfzh !='')
+                                                 and fl ='1'
+                                <if test="ssbmdm != null and ssbmdm != ''">
+                                    and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+                                </if>
+                                                 ) onAllPoilce
+                                FROM `tb_jcgl_xfll`
+                                where sfzh
+                                  and fl ='1'
+                                <if test="ssbmdm != null and ssbmdm != ''">
+                                    and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+                                </if>
+
+
+
+    </select>
+    <select id="selectAuxPolice" resultType="java.util.Map">
+
+
+
+                                select count(*)                          allAuxPoilce,
+                                       (
+                                               SELECT count(*)
+                                               FROM `tb_jcgl_xfll`
+                                               where sfzh not in
+                                                   (select sfzh from mosty_qwgl.tb_qw_jl where xt_sjzt = 1
+                                                 and sfzh !='')
+                                                 and fl ='2'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        ) onAllAuxPoilce
+                                FROM `tb_jcgl_xfll`
+                                where sfzh
+                                  and fl ='2'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+
+
+    </select>
+
+    <!--条件查询巡防力量-->
+    <select id="getxfllList" parameterType="Map" resultMap="tbJcglZyjz">
+        select a.*, f.jd, f.wd,f.wz_xz,f.wz_bc,
+        (
+        select jlzt from mosty_qwgl.tb_qw_bmjlbb_jlmx g where DATE_FORMAT(now(),'%Y-%m-%d') =
+        DATE_FORMAT(g.bbrq,'%Y-%m-%d')
+        and g.xt_scbz = '0' and g.xt_sjzt = '1' and (g.jl_id = a.id or g.jl_id = a.ryid)
+        ) as jlzt
+        <if test="dto.jd != null and dto.wd != null">
+            ,st_distance_sphere(POINT(f.jd,f.wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from mosty_jcgl.tb_jcgl_xfll a,
+        (
+        select d.ssbmdm, c.jd, c.wd,c.wz_xz,c.wz_bc
+        from mosty_yszx.tb_ys_gajg c,
+        mosty_yszx.tb_ys_gajg_glbm d
+        where c.ysdl = '001'
+        and c.yszl = '001001'
+        and c.ysxl in ('001001002', '001001003', '001001004')
+        and d.xt_scbz = '0'
+        and d.xt_sjzt = '1'
+        and c.id = d.gajg_id
+        and c.xt_scbz = '0'
+        and c.xt_sjzt = '1'
+        <if test="dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(c.jd,c.wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ) f
+        where a.ssbmdm = f.ssbmdm and a.fl = '01'
+        and a.id in (
+        select b.xfll_id from mosty_jcgl.tb_jcgl_xfll_bq b where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.bqList != null and dto.bqList.size > 0">
+            and b.bq_id in
+            <foreach collection="dto.bqList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        )
+        and a.xt_scbz = '0'
+        and a.xt_sjzt = '1'
+        and (
+        a.id in (
+        select jl_id from mosty_qwgl.tb_qw_bmjlbb_jlmx g where g.xt_scbz = '0' and g.xt_sjzt = '1'
+        and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(g.bbrq,'%Y-%m-%d')
+        <if test="dto.jlzt != null and dto.jlzt != ''">
+            and g.jlzt = #{dto.jlzt}
+        </if>
+        ) or
+        a.ryid in (
+        select jl_id from mosty_qwgl.tb_qw_bmjlbb_jlmx g where g.xt_scbz = '0' and g.xt_sjzt = '1'
+        and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(g.bbrq,'%Y-%m-%d')
+        <if test="dto.jlzt != null and dto.jlzt != ''">
+            and g.jlzt = #{dto.jlzt}
+        </if>
+        )
+        )
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and a.ssbmid = #{dto.ssbmid}
+        </if>
+        <if test="dto.jd != null and dto.wd != null">
+            order by distance asc
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--条件查询巡防力量-->
+    <select id="getxfllCount" parameterType="Map" resultType="Integer">
+        select count(1)
+        from mosty_jcgl.tb_jcgl_xfll a,
+        (
+        select d.ssbmdm, c.jd, c.wd,c.wz_xz,c.wz_bc
+        from mosty_yszx.tb_ys_gajg c,
+        mosty_yszx.tb_ys_gajg_glbm d
+        where c.ysdl = '001'
+        and c.yszl = '001001'
+        and c.ysxl in ('001001002', '001001003', '001001004')
+        and d.xt_scbz = '0'
+        and d.xt_sjzt = '1'
+        and c.id = d.gajg_id
+        and c.xt_scbz = '0'
+        and c.xt_sjzt = '1'
+        <if test="dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(c.jd,c.wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ) f
+        where a.ssbmdm = f.ssbmdm and a.fl = '01'
+        and a.id in (
+        select b.xfll_id from mosty_jcgl.tb_jcgl_xfll_bq b where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.bqList != null and dto.bqList.size > 0">
+            and b.bq_id in
+            <foreach collection="dto.bqList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        )
+        and a.xt_scbz = '0'
+        and a.xt_sjzt = '1'
+        and (
+        a.id in (
+        select jl_id from mosty_qwgl.tb_qw_bmjlbb_jlmx g where g.xt_scbz = '0' and g.xt_sjzt = '1'
+        and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(g.bbrq,'%Y-%m-%d')
+        <if test="dto.jlzt != null and dto.jlzt != ''">
+            and g.jlzt = #{dto.jlzt}
+        </if>
+        ) or
+        a.ryid in (
+        select jl_id from mosty_qwgl.tb_qw_bmjlbb_jlmx g where g.xt_scbz = '0' and g.xt_sjzt = '1'
+        and DATE_FORMAT(now(),'%Y-%m-%d') = DATE_FORMAT(g.bbrq,'%Y-%m-%d')
+        <if test="dto.jlzt != null and dto.jlzt != ''">
+            and g.jlzt = #{dto.jlzt}
+        </if>
+        )
+        )
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and a.ssbmdm = #{dto.ssbmdm}
+        </if>
+    </select>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglXfqyMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglXfqyMapper.xml
new file mode 100644
index 0000000..e827950
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglXfqyMapper.xml
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXfqyMapper">
+
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglXfqy" id="resultMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="xfqLx" column="xfq_lx" jdbcType="VARCHAR"/>
+        <result property="xfqDj" column="xfq_dj" jdbcType="VARCHAR"/>
+        <result property="xfqMc" column="xfq_mc" jdbcType="VARCHAR"/>
+        <result property="xfqMj" column="xfq_mj" jdbcType="INTEGER"/>
+        <result property="xfqFzr" column="xfq_fzr" jdbcType="VARCHAR"/>
+        <result property="xfqFzrId" column="xfq_fzr_id" jdbcType="VARCHAR"/>
+        <result property="xfqFzrSfz" column="xfq_fzr_sfz" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zxd" column="zxd" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="pgis" column="pgis" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="xfbmlx" column="xfbmlx" jdbcType="VARCHAR"/>
+        <result property="color" column="color" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        , xfq_lx, xfq_dj, xfq_mc, xfq_mj, xfq_fzr, xfq_fzr_id, xfq_fzr_sfz, jd, wd,
+     zbhash, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+     xt_sjzt,ssbmid,ssxgajid,sssgajid,
+     xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+     xt_zhgxsj,
+     xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,
+     bz,xfbmlx,color
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zxd) as zxd,
+        ST_ASWKT(pgis) as pgis
+    </sql>
+
+    <!--获取详情-->
+    <select id="getById" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_xfqy where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+
+    <!--查询不分页-->
+    <select id="getListAll" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_xfqy where xt_sjzt = '1' and xt_scbz = '0'
+    </select>
+
+
+
+    <!--查询分页-->
+    <select id="getPageList" parameterType="Map" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_jcgl_xfqy where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.xfqLx != null and dto.xfqLx != ''">
+            and xfq_lx = #{dto.xfqLx}
+        </if>
+        <if test="dto.xfqDj != null and dto.xfqDj != ''">
+            and xfq_dj = #{dto.xfqDj}
+        </if>
+        <if test="dto.xfqMc != null and dto.xfqMc != ''">
+            and xfq_mc like concat('%',#{dto.xfqMc},'%')
+        </if>
+        <if test="dto.xfqFzr != null and dto.xfqFzr != ''">
+            and xfq_fzr like concat('%',#{dto.xfqFzr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">-->
+<!--            and ssbmdm = #{dto.ssbmdm}-->
+<!--        </if>-->
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+        order by xt_cjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询分页-->
+    <select id="getCount" parameterType="Map" resultType="Integer">
+        select count(1) from tb_jcgl_xfqy where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.xfqLx != null and dto.xfqLx != ''">
+            and xfq_lx = #{dto.xfqLx}
+        </if>
+        <if test="dto.xfqDj != null and dto.xfqDj != ''">
+            and xfq_dj = #{dto.xfqDj}
+        </if>
+        <if test="dto.xfqMc != null and dto.xfqMc != ''">
+            and xfq_mc like concat('%',#{dto.xfqMc},'%')
+        </if>
+        <if test="dto.xfqFzr != null and dto.xfqFzr != ''">
+            and xfq_fzr like concat('%',#{dto.xfqFzr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+    </select>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglXfqy">
+        insert into tb_jcgl_xfqy(id, xfq_lx, xfq_dj, xfq_mc, xfq_mj, xfq_fzr, xfq_fzr_id, xfq_fzr_sfz, jd, wd,
+                                 zxd, pgis, zbhash, ssbmid,ssxgajid,sssgajid,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+                                 xt_sjzt,
+                                 xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                 xt_zhgxsj,
+                                 xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,
+                                 bz,xfbmlx,color)
+        values (#{id}, #{xfqLx}, #{xfqDj}, #{xfqMc}, #{xfqMj}, #{xfqFzr}, #{xfqFzrId}, #{xfqFzrSfz}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zxd, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                ST_GEOMFROMTEXT(#{pgis,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{zbhash},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj},
+                #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{xfbmlx}, #{color})
+    </insert>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglXfqy">
+        update tb_jcgl_xfqy
+        <set>
+            <if test="xfqLx != null and xfqLx != ''">
+                xfq_lx = #{xfqLx},
+            </if>
+            <if test="xfqDj != null and xfqDj != ''">
+                xfq_dj = #{xfqDj},
+            </if>
+            <if test="xfqMc != null and xfqMc != ''">
+                xfq_mc = #{xfqMc},
+            </if>
+            <if test="xfqMj != null and xfqMj != ''">
+                xfq_mj = #{xfqMj},
+            </if>
+            <if test="xfqFzr != null and xfqFzr != ''">
+                xfq_fzr = #{xfqFzr},
+            </if>
+            <if test="xfqFzrId != null and xfqFzrId != ''">
+                xfq_fzr_id = #{xfqFzrId},
+            </if>
+            <if test="xfqFzrSfz != null and xfqFzrSfz != ''">
+                xfq_fzr_sfz = #{xfqFzrSfz},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zxd != null">
+                zxd = ST_GEOMFROMTEXT(#{zxd,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="pgis != null">
+                pgis = ST_GEOMFROMTEXT(#{pgis,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="xfbmlx != null and xfbmlx != ''">
+                xfbmlx = #{xfbmlx},
+            </if>
+            <if test="color != null and color != ''">
+                color = #{color},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--批量删除-->
+    <update id="deleteBatch">
+        delete from tb_jcgl_xfqy where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="getSfzs" resultType="java.util.Map">
+        select count(1) count,ssxgaj, ssxgajid from tb_jcgl_xfqy where xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgajid, ssxgaj
+    </select>
+
+    <select id="getSfzd" resultType="java.util.Map">
+        select
+        sum(CHAR_LENGTH(xffwid) - CHAR_LENGTH(REPLACE(xffwid,',','')) + 1) as count, date_format(xfrq,'%H') time
+        from mosty_qwgl.tb_qw_xfbb where xfrq = #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        and xffwlx = '1'
+        group by date_format(xfrq,'%H') order by date_format(xfrq,'%H')
+    </select>
+
+    <select id="getJqTj" resultType="java.util.Map">
+        select count(1) count,jqfsksxs time from mosty_sjzx.tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') = #{kssj}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="getJqTjByTime" resultType="java.util.Map">
+        select count(1) count,bjrq time from mosty_sjzx.tb_jq  where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') >= #{kssj} and date_format(bjrq,'%Y-%m-%d') &lt;= #{jssj}
+        group by bjrq order by bjrq
+    </select>
+
+<!--    xfrq -->
+    <select id="getXfzdByTime" resultType="java.util.Map">
+        select
+        sum(CHAR_LENGTH(xffwid) - CHAR_LENGTH(REPLACE(xffwid,',','')) + 1) as count, xfrq time
+        from mosty_qwgl.tb_qw_xfbb where date_format(xfrq,'%Y-%m-%d') >= #{kssj} and date_format(xfrq,'%Y-%m-%d') &lt;= #{jssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        and xffwlx = '1'
+        group by xfrq order by xfrq
+    </select>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglXfwgMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglXfwgMapper.xml
new file mode 100644
index 0000000..dd95be1
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglXfwgMapper.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXfwgMapper">
+    <!--批量删除-->
+    <delete id="deleteBatch">
+        delete from tb_jcgl_xfwg where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <insert id="insertEntity">
+        insert into tb_jcgl_xfwg(
+            id,wg_mc,wg_bh,wglx,wg_mj,ss_xfqy_id,wg_tp,
+            pgis,
+            xzqhdm,ssbm,ssbmid,ssbmdm,ssxgajid,ssxgaj,ssxgajdm,sssgajid,sssgaj,sssgajdm,
+            xt_sjly,xt_sjzt,xt_scbz,xt_cjip,xt_cjsj,xt_cjr_id,xt_cjr,xt_cjbmdm,xt_cjbmmc,
+            xt_zhgxip,xt_zhgxsj,xt_zhgxrid,xt_zhgxr,xt_zhgxbmdm,xt_zhgxbm,bz
+        )values (
+            #{id},#{wgMc},#{wgBh},#{wglx},#{wgMj},#{ssXfqyId},#{wgTp},
+            ST_GEOMFROMTEXT(#{pgis,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            #{xzqhdm},#{ssbm},#{ssbmid},#{ssbmdm},#{ssxgajid},#{ssxgaj},#{ssxgajdm},#{sssgajid},#{sssgaj},#{sssgajdm},
+            #{xtSjly},#{xtSjzt},#{xtScbz},#{xtCjip},#{xtCjsj},#{xtCjrId},#{xtCjr},#{xtCjbmdm},#{xtCjbmmc},
+            #{xtZhgxip},#{xtZhgxsj},#{xtZhgxrid},#{xtZhgxr},#{xtZhgxbmdm},#{xtZhgxbm},#{bz}
+        )
+    </insert>
+
+    <update id="updateEntity">
+        update tb_jcgl_xfwg
+        <set>
+            <if test="wgMc != null and wgMc != ''">
+                wg_mc = #{wgMc},
+            </if>
+            <if test="wgBh != null and wgBh != ''">
+                wg_bh = #{wgBh},
+            </if>
+            <if test="wglx != null and wglx != ''">
+                wglx = #{wglx},
+            </if>
+            <if test="wgMj != null">
+                wg_mj = #{wgMj},
+            </if>
+            <if test="pgis != null">
+                pgis = ST_GEOMFROMTEXT(#{pgis,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            </if>
+            <if test="ssXfqyId != null and ssXfqyId != ''">
+                ss_xfqy_id = #{ssXfqyId},
+            </if>
+            <if test="wgTp != null and wgTp != ''">
+                wg_tp = #{wgTp},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglXlfaXldwMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglXlfaXldwMapper.xml
new file mode 100644
index 0000000..b7509fa
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglXlfaXldwMapper.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglXlfaXldwMapper">
+
+    <resultMap type="com.mosty.base.model.entity.jcgl.TbJcglXlfaXldw" id="resultMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="faId" column="fa_id" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="qy" column="qy" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dwmc" column="dwmc" jdbcType="VARCHAR"/>
+        <result property="dwsj" column="dwsj" jdbcType="TIMESTAMP"/>
+        <result property="tlsc" column="tlsc" jdbcType="INTEGER"/>
+        <result property="pcrys" column="pcrys" jdbcType="INTEGER"/>
+        <result property="pccls" column="pccls" jdbcType="INTEGER"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        , fa_id, dwlx, jd, wd, zbhash, dwmc, dwsj, tlsc,
+     pcrys, pccls, xt_sjly, xt_sjzt,
+     xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+     xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb,
+        ST_ASWKT(qy) as qy
+    </sql>
+
+    <!--保存快反点信息-->
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglXlfaXldw">
+        insert into tb_jcgl_xlfa_xldw (id, fa_id, dwlx, jd, wd, zb, zbhash, qy, dwmc, dwsj, tlsc,
+                                       pcrys, pccls, xt_sjly, xt_sjzt,
+                                       xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                       xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{faId}, #{dwlx}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}), #{zbhash},
+                ST_GEOMFROMTEXT(#{qy,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{dwmc}, #{dwsj}, #{tlsc}, #{pcrys}, #{pccls}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip},
+                #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm},
+                #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.jcgl.TbJcglXlfaXldw">
+        update tb_jcgl_xlfa_xldw
+        <set>
+            <if test="faId != null and faId != ''">
+                fa_id = #{faId},
+            </if>
+            <if test="dwlx != null and dwlx != ''">
+                dwlx = #{dwlx},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="qy != null">
+                qy = ST_GEOMFROMTEXT(#{qy,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="dwmc != null and dwmc != ''">
+                dwmc = #{dwmc},
+            </if>
+            <if test="dwsj != null">
+                dwsj = #{dwsj},
+            </if>
+            <if test="tlsc != null">
+                tlsc = #{tlsc},
+            </if>
+            <if test="pcrys != null">
+                pcrys = #{pcrys},
+            </if>
+            <if test="pccls != null">
+                pccls = #{pccls},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--获取列表-->
+    <select id="getListByFaId" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_xlfa_xldw where xt_sjzt = '1' and xt_scbz = '0'
+        and fa_id = #{faid}
+    </select>
+
+    <!--获取详情-->
+    <select id="getById" resultMap="resultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_jcgl_xlfa_xldw where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <!--根据方案Id删除数据-->
+    <delete id="deleteEntity" parameterType="String">
+        delete
+        from tb_jcgl_xlfa_xldw
+        where fa_id = #{faid}
+    </delete>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglZbflMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglZbflMapper.xml
new file mode 100644
index 0000000..fceba58
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglZbflMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TpJcglZbflMapper">
+    <update id="updateZt">
+        update tb_jcgl_zbfl set xt_scbz = '1' where pcode=#{scode} or scode=#{scode}
+    </update>
+    <update id="updateType">
+        update tb_jcgl_zbfl set xt_scbz = '1' where id=#{id}
+    </update>
+
+
+    <select id="selectMaxCode" resultType="java.lang.String">
+        SELECT max(replace(scode,'ZB',''))scode FROM `tb_jcgl_zbfl`
+    </select>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglZjkMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglZjkMapper.xml
new file mode 100644
index 0000000..04a9068
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglZjkMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TbJcglZjkMapper">
+
+    <!--批量删除-->
+    <delete id="deleteBatch">
+        delete from tb_jcgl_zjk where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/TbJcglZnzbMapper.xml b/mosty-jcgl/src/main/resources/mapper/TbJcglZnzbMapper.xml
new file mode 100644
index 0000000..f4e7701
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/TbJcglZnzbMapper.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.TpjcglZnzbMapper">
+
+    <resultMap type="com.mosty.base.model.vo.jcgl.TbJcglZnzbVo" id="resultMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sbImei" column="sb_imei" jdbcType="VARCHAR"/>
+        <result property="sbbh" column="sbbh" jdbcType="VARCHAR"/>
+        <result property="sbmc" column="sbmc" jdbcType="VARCHAR"/>
+        <result property="scode" column="scode" jdbcType="VARCHAR"/>
+        <result property="sname" column="sname" jdbcType="VARCHAR"/>
+        <result property="sbIpv4" column="sb_ipv4" jdbcType="VARCHAR"/>
+        <result property="sbIpv6" column="sb_ipv6" jdbcType="VARCHAR"/>
+        <result property="sbMac" column="sb_mac" jdbcType="VARCHAR"/>
+        <result property="sccs" column="sccs" jdbcType="VARCHAR"/>
+        <result property="cgrq" column="cgrq" jdbcType="TIMESTAMP"/>
+        <result property="dqsj" column="dqsj" jdbcType="TIMESTAMP"/>
+        <result property="zbTp" column="zb_tp" jdbcType="VARCHAR"/>
+        <result property="zbzt" column="zbzt" jdbcType="VARCHAR"/>
+        <result property="sftx" column="sftx" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+    <update id="deleteZb">
+        update tb_jcgl_znzb set xt_scbz = '1' where id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--条件查询智能装备列表-->
+    <select id="getFjzbCount" parameterType="Map" resultType="Integer">
+        select count(1)
+        from mosty_jcgl.tb_jcgl_znzb a,
+        (
+        select d.ssbmdm, c.jd, c.wd
+        from mosty_yszx.tb_ys_gajg c,
+        mosty_yszx.tb_ys_gajg_glbm d
+        where c.ysdl = '001'
+        and c.yszl = '001001'
+        and c.ysxl in ('001001002', '001001003', '001001004')
+        and d.xt_scbz = '0'
+        and d.xt_sjzt = '1'
+        and c.id = d.gajg_id
+        and c.xt_scbz = '0'
+        and c.xt_sjzt = '1'
+        <if test="dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(c.jd,c.wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ) f
+        where a.ssbmdm = f.ssbmdm
+        and a.xt_scbz = '0'
+        and a.xt_sjzt = '1'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and a.ssbmdm = #{dto.ssbmdm}
+        </if>
+    </select>
+
+    <!--条件查询智能装备列表-->
+    <select id="getFjzbList" parameterType="Map" resultMap="resultMap">
+        select a.*, f.jd, f.wd
+        <if test="dto.jd != null and dto.wd != null">
+            ,st_distance_sphere(POINT(f.jd,f.wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from mosty_jcgl.tb_jcgl_znzb a,
+        (
+        select d.ssbmdm, c.jd, c.wd
+        from mosty_yszx.tb_ys_gajg c,
+        mosty_yszx.tb_ys_gajg_glbm d
+        where c.ysdl = '001'
+        and c.yszl = '001001'
+        and c.ysxl in ('001001002', '001001003', '001001004')
+        and d.xt_scbz = '0'
+        and d.xt_sjzt = '1'
+        and c.id = d.gajg_id
+        and c.xt_scbz = '0'
+        and c.xt_sjzt = '1'
+        <if test="dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(c.jd,c.wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ) f
+        where a.ssbmdm = f.ssbmdm
+        and a.xt_scbz = '0'
+        and a.xt_sjzt = '1'
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and a.ssbmid = #{dto.ssbmid}
+        </if>
+        <if test="dto.sfzy != null and dto.sfzy != ''">
+            and a.sfzy = #{dto.sfzy}
+        </if>
+        <if test="dto.sfrh != null and dto.sfrh != ''">
+            and a.sfrh = #{dto.sfrh}
+        </if>
+        <if test="dto.jd != null and dto.wd != null">
+            order by distance
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="sblxTj" resultType="java.util.Map">
+        SELECT scode,IFNULL(SUM(sl),0)  sl,IFNULL(SUM(xfs),0) xfs,IFNULL(SUM(bss),0) bss
+        FROM `tb_jcgl_jyqx`
+        WHERE xfid is NULL  and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != null">
+            AND ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        GROUP BY scode
+    </select>
+
+    <select id="selectDict" resultType="com.mosty.common.config.entity.SysDictItem">
+        select *
+        from mosty_base.sys_dict_item
+        where zdbh = #{dictName}  and dm = #{dm}
+          and xt_zxbz = '0'
+    </select>
+
+
+    <select id="znlxTj" resultType="java.util.Map">
+        SELECT COUNT(1) sl,scode
+        FROM `tb_jcgl_znzb`
+        WHERE xfid is NULL   and xt_scbz = '0' and sfbs is null
+        <if test="ssbmdm != null and ssbmdm != null">
+            AND ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        <if test="scode != null and scode != null">
+            AND scode like concat(#{scode},'%')
+        </if>
+        GROUP BY scode
+    </select>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwShareStMhJgxxbGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwShareStMhJgxxbGxMapper.xml
new file mode 100644
index 0000000..5757969
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwShareStMhJgxxbGxMapper.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwShareStMhJgxxbGxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.afjcsj.VwShareStMhJgxxbGx">
+        <result column="PSR_ARST" property="psrArst" />
+        <result column="PSR_EDIO" property="psrEdio" />
+        <result column="SEG_DEPTNO" property="segDeptno" />
+        <result column="PDT_DEPT" property="pdtDept" />
+        <result column="TELNO" property="telno" />
+        <result column="PSR_WCBD" property="psrWcbd" />
+        <result column="FLT_AIRLCODE" property="fltAirlcode" />
+        <result column="PSR_SPE" property="psrSpe" />
+        <result column="PSR_HBPRBG" property="psrHbprbg" />
+        <result column="STA_DEPTTM" property="staDepttm" />
+        <result column="PSR_SEATNBR" property="psrSeatnbr" />
+        <result column="WL" property="wl" />
+        <result column="PSR_DEP" property="psrDep" />
+        <result column="PSR_WTYPE" property="psrWtype" />
+        <result column="FILENAME" property="filename" />
+        <result column="DEP_ACTION_FLAG" property="depActionFlag" />
+        <result column="PSR_CRS" property="psrCrs" />
+        <result column="PSR_OUTBOUND" property="psrOutbound" />
+        <result column="PSR_RST" property="psrRst" />
+        <result column="SBY" property="sby" />
+        <result column="CKI_CHG" property="ckiChg" />
+        <result column="PSR_OSR" property="psrOsr" />
+        <result column="PDT_BIRTHDAY" property="pdtBirthday" />
+        <result column="PSR_SPML" property="psrSpml" />
+        <result column="PSR_MSG" property="psrMsg" />
+        <result column="PSR_EDI_DEST" property="psrEdiDest" />
+        <result column="SPECIAL_BG" property="specialBg" />
+        <result column="PSR_CKITIME" property="psrCkitime" />
+        <result column="PROVINCE" property="province" />
+        <result column="PSR_NOTIFY" property="psrNotify" />
+        <result column="PSR_AVIH" property="psrAvih" />
+        <result column="PSR_RFFI" property="psrRffi" />
+        <result column="PSR_EDI_DEPT" property="psrEdiDept" />
+        <result column="DELETE_FLAG" property="deleteFlag" />
+        <result column="SVC" property="svc" />
+        <result column="PSR_INAD" property="psrInad" />
+        <result column="PSR_WCBW" property="psrWcbw" />
+        <result column="PSR_OFL" property="psrOfl" />
+        <result column="PSR_NAME" property="psrName" />
+        <result column="CITY" property="city" />
+        <result column="PSR_STDRS" property="psrStdrs" />
+        <result column="PSR_UNATTACH" property="psrUnattach" />
+        <result column="DELETE_FLT_ID" property="deleteFltId" />
+        <result column="CMT" property="cmt" />
+        <result column="PSR_TSI" property="psrTsi" />
+        <result column="PDT_MIDNAME" property="pdtMidname" />
+        <result column="PAXCLASS" property="paxclass" />
+        <result column="PSR_PIL" property="psrPil" />
+        <result column="PSR_BAGS" property="psrBags" />
+        <result column="PSR_XT" property="psrXt" />
+        <result column="PSR_DEAF" property="psrDeaf" />
+        <result column="PSR_WCMD" property="psrWcmd" />
+        <result column="PSR_XASR" property="psrXasr" />
+        <result column="PSR_BLND" property="psrBlnd" />
+        <result column="CERT_TYPE" property="certType" />
+        <result column="ICAO_CODE" property="icaoCode" />
+        <result column="PSR_HOSTNBR" property="psrHostnbr" />
+        <result column="PSR_TYPE" property="psrType" />
+        <result column="DATASOURCE" property="datasource" />
+        <result column="ADRESS" property="adress" />
+        <result column="POSTCODE" property="postcode" />
+        <result column="PDT_DEST" property="pdtDest" />
+        <result column="PSR_FFFR" property="psrFffr" />
+        <result column="FLT_DATE" property="fltDate" />
+        <result column="PSR_OFFICE" property="psrOffice" />
+        <result column="EDI" property="edi" />
+        <result column="SEG_FLTID" property="segFltid" />
+        <result column="PSR_BAGGAGE" property="psrBaggage" />
+        <result column="FLT_NUMBER" property="fltNumber" />
+        <result column="PDT_COUNTRY" property="pdtCountry" />
+        <result column="SEG_DEST_CODE" property="segDestCode" />
+        <result column="STA_ARVETM" property="staArvetm" />
+        <result column="PSR_INFNAME" property="psrInfname" />
+        <result column="PSR_GROUP" property="psrGroup" />
+        <result column="PSR_RTFI" property="psrRtfi" />
+        <result column="PSR_EDII" property="psrEdii" />
+        <result column="PSR_BRDNO" property="psrBrdno" />
+        <result column="PSR_AGENT" property="psrAgent" />
+        <result column="PSR_CHNNAME" property="psrChnname" />
+        <result column="STCR" property="stcr" />
+        <result column="PSR_CKIPID" property="psrCkipid" />
+        <result column="JMP" property="jmp" />
+        <result column="PSR_BSCT" property="psrBsct" />
+        <result column="PNR_REF" property="pnrRef" />
+        <result column="SEG_DESTNO" property="segDestno" />
+        <result column="PSR_PCTC" property="psrPctc" />
+        <result column="PSR_INBOUND" property="psrInbound" />
+        <result column="SN_ID" property="snId" />
+        <result column="PSR_INF" property="psrInf" />
+        <result column="PSR_SEG_SEATNBR" property="psrSegSeatnbr" />
+        <result column="PSR_PSPT" property="psrPspt" />
+        <result column="PSR_RUSH" property="psrRush" />
+        <result column="PSR_EDI_WARN" property="psrEdiWarn" />
+        <result column="PSR_REA" property="psrRea" />
+        <result column="PDT_FIRSTNAME" property="pdtFirstname" />
+        <result column="PDT_ISSUEDATE" property="pdtIssuedate" />
+        <result column="PDT_ISSUE_COUNTRY" property="pdtIssueCountry" />
+        <result column="PSR_PSM" property="psrPsm" />
+        <result column="PSR_FOID_NONET" property="psrFoidNonet" />
+        <result column="CT_DT" property="ctDt" />
+        <result column="PDT_LASTNAME" property="pdtLastname" />
+        <result column="PSR_STATUS" property="psrStatus" />
+        <result column="PSR_XABP" property="psrXabp" />
+        <result column="PSR_XRES" property="psrXres" />
+        <result column="FFQNO" property="ffqno" />
+        <result column="URES" property="ures" />
+        <result column="PSR_EXSTSEAT" property="psrExstseat" />
+        <result column="PSR_ARRIVE_TIME" property="psrArriveTime" />
+        <result column="PSR_SBYNO" property="psrSbyno" />
+        <result column="SEG_DEPT_CODE" property="segDeptCode" />
+        <result column="PSR_GENDER" property="psrGender" />
+        <result column="PSR_VUDGRADE" property="psrVudgrade" />
+        <result column="PSR_WCOB" property="psrWcob" />
+        <result column="PSR_ASOBOI" property="psrAsoboi" />
+        <result column="PSR_SEA" property="psrSea" />
+        <result column="PSR_CITYCANC" property="psrCitycanc" />
+        <result column="PSR_BAGWGT" property="psrBagwgt" />
+        <result column="VIP" property="vip" />
+        <result column="DEP_ACTION_TIME" property="depActionTime" />
+        <result column="FLT_SUFFIX" property="fltSuffix" />
+        <result column="PSR_ACC" property="psrAcc" />
+        <result column="PSR_CTCA" property="psrCtca" />
+        <result column="PSR_UDGRADE" property="psrUdgrade" />
+        <result column="SPECIAL_SEAT" property="specialSeat" />
+        <result column="PSR_EMIG" property="psrEmig" />
+        <result column="PSR_AEC" property="psrAec" />
+        <result column="PDT_BIR_ADRESS" property="pdtBirAdress" />
+        <result column="BORDER_TYPE" property="borderType" />
+        <result column="PSR_SPML_ID" property="psrSpmlId" />
+        <result column="PSR_ICS" property="psrIcs" />
+        <result column="PSR_EFMN" property="psrEfmn" />
+        <result column="PSR_SIP" property="psrSip" />
+        <result column="PSR_PETC" property="psrPetc" />
+        <result column="CERT_NO" property="certNo" />
+        <result column="PDT_EXPRIRYDATE" property="pdtExprirydate" />
+        <result column="PSR_CLASS" property="psrClass" />
+        <result column="ETL_OPER_TYPE" property="etlOperType" />
+        <result column="ETL_TIMESTAMP" property="etlTimestamp" />
+        <result column="ETL_UPDATE_TIME" property="etlUpdateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        PSR_ARST, PSR_EDIO, SEG_DEPTNO, PDT_DEPT, TELNO, PSR_WCBD, FLT_AIRLCODE, PSR_SPE, PSR_HBPRBG,
+        STA_DEPTTM, PSR_SEATNBR, WL, PSR_DEP, PSR_WTYPE, FILENAME, DEP_ACTION_FLAG, PSR_CRS, PSR_OUTBOUND,
+        PSR_RST, SBY, CKI_CHG, PSR_OSR, PDT_BIRTHDAY, PSR_SPML, PSR_MSG, PSR_EDI_DEST, SPECIAL_BG, PSR_CKITIME,
+        PROVINCE, PSR_NOTIFY, PSR_AVIH, PSR_RFFI, PSR_EDI_DEPT, DELETE_FLAG, SVC, PSR_INAD, PSR_WCBW,
+        PSR_OFL, PSR_NAME, CITY, PSR_STDRS, PSR_UNATTACH, DELETE_FLT_ID, CMT, PSR_TSI, PDT_MIDNAME, PAXCLASS,
+        PSR_PIL, PSR_BAGS, PSR_XT, PSR_DEAF, PSR_WCMD, PSR_XASR, PSR_BLND, CERT_TYPE, ICAO_CODE, PSR_HOSTNBR,
+        PSR_TYPE, DATASOURCE, ADRESS, POSTCODE, PDT_DEST, PSR_FFFR, FLT_DATE, PSR_OFFICE, EDI, SEG_FLTID,
+        PSR_BAGGAGE, FLT_NUMBER, PDT_COUNTRY, SEG_DEST_CODE, STA_ARVETM, PSR_INFNAME, PSR_GROUP, PSR_RTFI,
+        PSR_EDII, PSR_BRDNO, PSR_AGENT, PSR_CHNNAME, STCR, PSR_CKIPID, JMP, PSR_BSCT, PNR_REF, SEG_DESTNO,
+        PSR_PCTC, PSR_INBOUND, SN_ID, PSR_INF, PSR_SEG_SEATNBR, PSR_PSPT, PSR_RUSH, PSR_EDI_WARN, PSR_REA,
+        PDT_FIRSTNAME, PDT_ISSUEDATE, PDT_ISSUE_COUNTRY, PSR_PSM, PSR_FOID_NONET, CT_DT, PDT_LASTNAME, PSR_STATUS,
+        PSR_XABP, PSR_XRES, FFQNO, URES, PSR_EXSTSEAT, PSR_ARRIVE_TIME, PSR_SBYNO, SEG_DEPT_CODE, PSR_GENDER,
+        PSR_VUDGRADE, PSR_WCOB, PSR_ASOBOI, PSR_SEA, PSR_CITYCANC, PSR_BAGWGT, VIP, DEP_ACTION_TIME, FLT_SUFFIX,
+        PSR_ACC, PSR_CTCA, PSR_UDGRADE, SPECIAL_SEAT, PSR_EMIG, PSR_AEC, PDT_BIR_ADRESS, BORDER_TYPE, PSR_SPML_ID,
+        PSR_ICS, PSR_EFMN, PSR_SIP, PSR_PETC, CERT_NO, PDT_EXPRIRYDATE, PSR_CLASS, ETL_OPER_TYPE, ETL_TIMESTAMP,
+        ETL_UPDATE_TIME
+    </sql>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwShareStShzyJtKyqcgpxxGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwShareStShzyJtKyqcgpxxGxMapper.xml
new file mode 100644
index 0000000..cc2269a
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwShareStShzyJtKyqcgpxxGxMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwShareStShzyJtKyqcgpxxGxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.afjcsj.VwShareStShzyJtKyqcgpxxGx">
+        <result column="GPRXM" property="gprxm" />
+        <result column="GPRHM" property="gprhm" />
+        <result column="GPRSJH" property="gprsjh" />
+        <result column="XM" property="xm" />
+        <result column="SFYXH" property="sfyxh" />
+        <result column="ZJHM" property="zjhm" />
+        <result column="ZJLXDM" property="zjlxdm" />
+        <result column="ZJLX" property="zjlx" />
+        <result column="XBDM" property="xbdm" />
+        <result column="XB" property="xb" />
+        <result column="MZDM" property="mzdm" />
+        <result column="MZ" property="mz" />
+        <result column="LXDZ" property="lxdz" />
+        <result column="GPFS" property="gpfs" />
+        <result column="SPY" property="spy" />
+        <result column="GPZT" property="gpzt" />
+        <result column="GPDZ" property="gpdz" />
+        <result column="GPSJ" property="gpsj" />
+        <result column="CCCZ" property="cccz" />
+        <result column="FCSJ" property="fcsj" />
+        <result column="CCCZBH" property="ccczbh" />
+        <result column="CCCZJD" property="ccczjd" />
+        <result column="CCCZWD" property="ccczwd" />
+        <result column="DDCZ" property="ddcz" />
+        <result column="DDCZBH" property="ddczbh" />
+        <result column="DDCZJD" property="ddczjd" />
+        <result column="DDCZWD" property="ddczwd" />
+        <result column="CCCZCOD" property="ccczcod" />
+        <result column="CCCZXZ" property="ccczxz" />
+        <result column="DDCZCOD" property="ddczcod" />
+        <result column="DDCZXZ" property="ddczxz" />
+        <result column="CFD" property="cfd" />
+        <result column="DDD" property="ddd" />
+        <result column="CC" property="cc" />
+        <result column="CPH" property="cph" />
+        <result column="ZWH" property="zwh" />
+        <result column="BZ" property="bz" />
+        <result column="INFOSOURCEADDR" property="infosourceaddr" />
+        <result column="INFOSOURCEDESC" property="infosourcedesc" />
+        <result column="DEP_ACTION_FLAG" property="depActionFlag" />
+        <result column="DEP_ACTION_TIME" property="depActionTime" />
+        <result column="DEP_FIRSTENTER_TIME" property="depFirstenterTime" />
+        <result column="UUID" property="uuid" />
+        <result column="GPH" property="gph" />
+        <result column="PH" property="ph" />
+        <result column="ETL_OPER_TYPE" property="etlOperType" />
+        <result column="ETL_TIMESTAMP" property="etlTimestamp" />
+        <result column="ETL_UPDATE_TIME" property="etlUpdateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        GPRXM, GPRHM, GPRSJH, XM, SFYXH, ZJHM, ZJLXDM, ZJLX, XBDM, XB, MZDM, MZ, LXDZ, GPFS, SPY, GPZT, GPDZ, GPSJ,
+        CCCZ, FCSJ, CCCZBH, CCCZJD, CCCZWD, DDCZ, DDCZBH, DDCZJD, DDCZWD, CCCZCOD, CCCZXZ, DDCZCOD, DDCZXZ, CFD, DDD,
+        CC, CPH, ZWH, BZ, INFOSOURCEADDR, INFOSOURCEDESC, DEP_ACTION_FLAG, DEP_ACTION_TIME, DEP_FIRSTENTER_TIME, UUID,
+        GPH, PH, ETL_OPER_TYPE, ETL_TIMESTAMP, ETL_UPDATE_TIME
+    </sql>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwShareStTlLksmdpGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwShareStTlLksmdpGxMapper.xml
new file mode 100644
index 0000000..780893f
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwShareStTlLksmdpGxMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwShareStTlLksmdpGxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.afjcsj.VwShareStTlLksmdpGx">
+        <result column="ID" property="id" />
+        <result column="DZ" property="dz" />
+        <result column="DEP_ACTION_TIME" property="depActionTime" />
+        <result column="DEP_ACTION_FLAG" property="depActionFlag" />
+        <result column="DPCK" property="dpck" />
+        <result column="RKSJC" property="rksjc" />
+        <result column="SPSJ" property="spsj" />
+        <result column="ZWH" property="zwh" />
+        <result column="CXH" property="cxh" />
+        <result column="FZ" property="fz" />
+        <result column="CCR_XM" property="ccrXm" />
+        <result column="CCR_ZJHM" property="ccrZjhm" />
+        <result column="CCRQ" property="ccrq" />
+        <result column="CC" property="cc" />
+        <result column="ETL_OPER_TYPE" property="etlOperType" />
+        <result column="ETL_TIMESTAMP" property="etlTimestamp" />
+        <result column="ETL_UPDATE_TIME" property="etlUpdateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, DZ, DEP_ACTION_TIME, DEP_ACTION_FLAG, DPCK, RKSJC, SPSJ, ZWH, CXH, FZ, CCR_XM, CCR_ZJHM, CCRQ, CC,
+        ETL_OPER_TYPE, ETL_TIMESTAMP, ETL_UPDATE_TIME
+    </sql>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwSydwCyryGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwSydwCyryGxMapper.xml
new file mode 100644
index 0000000..e51f9b3
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwSydwCyryGxMapper.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwSydwCyryGxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.afjcsj.VwSydwCyryGx">
+        <result column="ID" property="id" />
+        <result column="DWID" property="dwid" />
+        <result column="RYID" property="ryid" />
+        <result column="ZJLXDM" property="zjlxdm" />
+        <result column="ZJHM" property="zjhm" />
+        <result column="XM" property="xm" />
+        <result column="CSRQ" property="csrq" />
+        <result column="XB" property="xb" />
+        <result column="GJDM" property="gjdm" />
+        <result column="JGDM" property="jgdm" />
+        <result column="LXDH" property="lxdh" />
+        <result column="JZD_XZQHDM" property="jzdXzqhdm" />
+        <result column="JZD_DZXZ" property="jzdDzxz" />
+        <result column="SZBM" property="szbm" />
+        <result column="SZGW" property="szgw" />
+        <result column="ZWLBDM" property="zwlbdm" />
+        <result column="BGZKSRQ" property="bgzksrq" />
+        <result column="BGZJSRQ" property="bgzjsrq" />
+        <result column="SJLY" property="sjly" />
+        <result column="RYBH" property="rybh" />
+        <result column="DZ_DWDZDM" property="dzDwdzdm" />
+        <result column="DZ_DWDZSSXDM" property="dzDwdzssxdm" />
+        <result column="DZ_DWDZXZ" property="dzDwdzxz" />
+        <result column="DZ_DWDZMLPDM" property="dzDwdzmlpdm" />
+        <result column="DZ_DWDZMLPXZ" property="dzDwdzmlpxz" />
+        <result column="CJRLBDM" property="cjrlbdm" />
+        <result column="CJYJDM" property="cjyjdm" />
+        <result column="BMJB" property="bmjb" />
+        <result column="SCBJ" property="scbj" />
+        <result column="XZBJ" property="xzbj" />
+        <result column="BZ" property="bz" />
+        <result column="XT_CJSJ" property="xtCjsj" />
+        <result column="XT_LRSJ" property="xtLrsj" />
+        <result column="XT_LRRXM" property="xtLrrxm" />
+        <result column="XT_LRRID" property="xtLrrid" />
+        <result column="XT_LRRBM" property="xtLrrbm" />
+        <result column="XT_LRRBMID" property="xtLrrbmid" />
+        <result column="XT_LRIP" property="xtLrip" />
+        <result column="XT_ZHXGSJ" property="xtZhxgsj" />
+        <result column="XT_ZHXGRXM" property="xtZhxgrxm" />
+        <result column="XT_ZHXGRID" property="xtZhxgrid" />
+        <result column="XT_ZHXGRBM" property="xtZhxgrbm" />
+        <result column="XT_ZHXGRBMID" property="xtZhxgrbmid" />
+        <result column="XT_ZHXGIP" property="xtZhxgip" />
+        <result column="XT_ZXBZ" property="xtZxbz" />
+        <result column="XT_ZXYY" property="xtZxyy" />
+        <result column="JZD_MLPDM" property="jzdMlpdm" />
+        <result column="JZD_MLPXZ" property="jzdMlpxz" />
+        <result column="JZD_DZID" property="jzdDzid" />
+        <result column="JZD_ZBX" property="jzdZbx" />
+        <result column="JZD_ZBY" property="jzdZby" />
+        <result column="DWMC" property="dwmc" />
+        <result column="DWFL" property="dwfl" />
+        <result column="DWDZMC" property="dwdzmc" />
+        <result column="BGRQ" property="bgrq" />
+        <result column="ZXYYBZ" property="zxyybz" />
+        <result column="KYJX" property="kyjx" />
+        <result column="KYXW" property="kyxw" />
+        <result column="MZDM" property="mzdm" />
+        <result column="LDRKID" property="ldrkid" />
+        <result column="SFZTRY" property="sfztry" />
+        <result column="SFCLSYRK" property="sfclsyrk" />
+        <result column="OLD_ID" property="oldId" />
+        <result column="OLD_DWID" property="oldDwid" />
+        <result column="OLD_RYID" property="oldRyid" />
+        <result column="OLD_JZD_DZID" property="oldJzdDzid" />
+        <result column="CYGJ_QRBZ" property="cygjQrbz" />
+        <result column="SSDQ" property="ssdq" />
+        <result column="XT_TIMESTAMP" property="xtTimestamp" />
+        <result column="SFYLXDH" property="sfylxdh" />
+        <result column="DEP_ACTION_FLAG" property="depActionFlag" />
+        <result column="DEP_ACTION_TIME" property="depActionTime" />
+        <result column="DEP_FIRSTENTER_TIME" property="depFirstenterTime" />
+        <result column="rowkey" property="rowkey" />
+        <result column="ETL_OPER_TYPE" property="etlOperType" />
+        <result column="ETL_TIMESTAMP" property="etlTimestamp" />
+        <result column="ETL_UPDATE_TIME" property="etlUpdateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, DWID, RYID, ZJLXDM, ZJHM, XM, CSRQ, XB, GJDM, JGDM, LXDH, JZD_XZQHDM, JZD_DZXZ, SZBM, SZGW, ZWLBDM,
+        BGZKSRQ, BGZJSRQ, SJLY, RYBH, DZ_DWDZDM, DZ_DWDZSSXDM, DZ_DWDZXZ, DZ_DWDZMLPDM, DZ_DWDZMLPXZ, CJRLBDM,
+        CJYJDM, BMJB, SCBJ, XZBJ, BZ, XT_CJSJ, XT_LRSJ, XT_LRRXM, XT_LRRID, XT_LRRBM, XT_LRRBMID, XT_LRIP, XT_ZHXGSJ,
+        XT_ZHXGRXM, XT_ZHXGRID, XT_ZHXGRBM, XT_ZHXGRBMID, XT_ZHXGIP, XT_ZXBZ, XT_ZXYY, JZD_MLPDM, JZD_MLPXZ, JZD_DZID,
+        JZD_ZBX, JZD_ZBY, DWMC, DWFL, DWDZMC, BGRQ, ZXYYBZ, KYJX, KYXW, MZDM, LDRKID, SFZTRY, SFCLSYRK, OLD_ID,
+        OLD_DWID, OLD_RYID, OLD_JZD_DZID, CYGJ_QRBZ, SSDQ, XT_TIMESTAMP, SFYLXDH, DEP_ACTION_FLAG, DEP_ACTION_TIME,
+        DEP_FIRSTENTER_TIME, rowkey, ETL_OPER_TYPE, ETL_TIMESTAMP, ETL_UPDATE_TIME
+    </sql>
+
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwSydwJbxxGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwSydwJbxxGxMapper.xml
new file mode 100644
index 0000000..1c26036
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwSydwJbxxGxMapper.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwSydwJbxxGxMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx">
+        <result column="XXSBZH" property="xxsbzh"/>
+        <result column="ZCDZ" property="zcdz"/>
+        <result column="GLDJ" property="gldj"/>
+        <result column="XT_LRRID" property="xtLrrid"/>
+        <result column="XT_LRIP" property="xtLrip"/>
+        <result column="SFYTP" property="sfytp"/>
+        <result column="DEP_FIRSTENTER_TIME" property="depFirstenterTime"/>
+        <result column="SJDWID" property="sjdwid"/>
+        <result column="DWLXDH" property="dwlxdh"/>
+        <result column="LXRZJHM" property="lxrzjhm"/>
+        <result column="LXRLXDH" property="lxrlxdh"/>
+        <result column="SJDM" property="sjdm"/>
+        <result column="DWSCJP" property="dwscjp"/>
+        <result column="LXRXM" property="lxrxm"/>
+        <result column="DWXZ" property="dwxz"/>
+        <result column="DZ_DWDZMLPDM" property="dzDwdzmlpdm"/>
+        <result column="ZCRQ" property="zcrq"/>
+        <result column="ZCDZBH" property="zcdzbh"/>
+        <result column="JKGS" property="jkgs"/>
+        <result column="XT_ZHXGSJ" property="xtZhxgsj"/>
+        <result column="LXRGJDM" property="lxrgjdm"/>
+        <result column="BMJB" property="bmjb"/>
+        <result column="DZ_DWDZXZ" property="dzDwdzxz"/>
+        <result column="XT_TIMESTAMP" property="xtTimestamp"/>
+        <result column="BZ" property="bz"/>
+        <result column="WHKSRQ" property="whksrq"/>
+        <result column="DWFL" property="dwfl"/>
+        <result column="LXRZJLX" property="lxrzjlx"/>
+        <result column="SXZW" property="sxzw"/>
+        <result column="DWDZS" property="dwdzs"/>
+        <result column="ZZJGDM" property="zzjgdm"/>
+        <result column="DWMCJP" property="dwmcjp"/>
+        <result column="XT_ZXYY" property="xtZxyy"/>
+        <result column="XT_LRRXM" property="xtLrrxm"/>
+        <result column="WHJZRQ" property="whjzrq"/>
+        <result column="DEP_ACTION_FLAG" property="depActionFlag"/>
+        <result column="DWDZSC" property="dwdzsc"/>
+        <result column="SFBD" property="sfbd"/>
+        <result column="CQZQ" property="cqzq"/>
+        <result column="DZ_DWDZDM" property="dzDwdzdm"/>
+        <result column="ID" property="id"/>
+        <result column="SSZRQDM" property="sszrqdm"/>
+        <result column="ZPFMID" property="zpfmid"/>
+        <result column="ZXYYBZ" property="zxyybz"/>
+        <result column="CYRS" property="cyrs"/>
+        <result column="WLJDSBDZH" property="wljdsbdzh"/>
+        <result column="DWMC" property="dwmc"/>
+        <result column="SWDJH" property="swdjh"/>
+        <result column="XT_ZXBZ" property="xtZxbz"/>
+        <result column="XXSBMM" property="xxsbmm"/>
+        <result column="YYZZH" property="yyzzh"/>
+        <result column="JYFW" property="jyfw"/>
+        <result column="SJDW" property="sjdw"/>
+        <result column="ZBY" property="zby"/>
+        <result column="ZCZB" property="zczb"/>
+        <result column="SJLYBS" property="sjlybs"/>
+        <result column="XT_CJSJ" property="xtCjsj"/>
+        <result column="ZAFZR" property="zafzr"/>
+        <result column="YXQZ" property="yxqz"/>
+        <result column="XT_LRRBM" property="xtLrrbm"/>
+        <result column="DWBH" property="dwbh"/>
+        <result column="XT_LRSJ" property="xtLrsj"/>
+        <result column="SSFJDM" property="ssfjdm"/>
+        <result column="SCBJ" property="scbj"/>
+        <result column="DZ_DWDZSSXDM" property="dzDwdzssxdm"/>
+        <result column="XT_ZHXGRBMID" property="xtZhxgrbmid"/>
+        <result column="XT_LRRBMID" property="xtLrrbmid"/>
+        <result column="XT_ZHXGRBM" property="xtZhxgrbm"/>
+        <result column="LXRGMSFHM" property="lxrgmsfhm"/>
+        <result column="FZRQ" property="fzrq"/>
+        <result column="SJMC" property="sjmc"/>
+        <result column="SSDQ" property="ssdq"/>
+        <result column="SFYSPJK" property="sfyspjk"/>
+        <result column="XT_ZHXGRXM" property="xtZhxgrxm"/>
+        <result column="XT_ZHXGRID" property="xtZhxgrid"/>
+        <result column="XT_ZHXGIP" property="xtZhxgip"/>
+        <result column="SSPCSDM" property="sspcsdm"/>
+        <result column="WHZT" property="whzt"/>
+        <result column="DZ_DWDZMLPXZ" property="dzDwdzmlpxz"/>
+        <result column="OLD_ID" property="oldId"/>
+        <result column="DWSC" property="dwsc"/>
+        <result column="XZBJ" property="xzbj"/>
+        <result column="DEP_ACTION_TIME" property="depActionTime"/>
+        <result column="OLD_SJDWID" property="oldSjdwid"/>
+        <result column="WLJDSBDMM" property="wljdsbdmm"/>
+        <result column="BARS" property="bars"/>
+        <result column="ZBX" property="zbx"/>
+        <result column="ETL_OPER_TYPE" property="etlOperType"/>
+        <result column="ETL_TIMESTAMP" property="etlTimestamp"/>
+        <result column="ETL_UPDATE_TIME" property="etlUpdateTime"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        XXSBZH, ZCDZ, GLDJ, XT_LRRID, XT_LRIP, SFYTP, DEP_FIRSTENTER_TIME, SJDWID, DWLXDH,
+        LXRZJHM, LXRLXDH, SJDM, DWSCJP, LXRXM, DWXZ, DZ_DWDZMLPDM, ZCRQ, ZCDZBH, JKGS, XT_ZHXGSJ,
+        LXRGJDM, BMJB, DZ_DWDZXZ, XT_TIMESTAMP, BZ, WHKSRQ, DWFL, LXRZJLX, SXZW, DWDZS, ZZJGDM,
+        DWMCJP, XT_ZXYY, XT_LRRXM, WHJZRQ, DEP_ACTION_FLAG, DWDZSC, SFBD, CQZQ, DZ_DWDZDM, ID,
+        SSZRQDM, ZPFMID, ZXYYBZ, CYRS, WLJDSBDZH, DWMC, SWDJH, XT_ZXBZ, XXSBMM, YYZZH, JYFW,
+        SJDW, ZBY, ZCZB, SJLYBS, XT_CJSJ, ZAFZR, YXQZ, XT_LRRBM, DWBH, XT_LRSJ, SSFJDM, SCBJ,
+        DZ_DWDZSSXDM, XT_ZHXGRBMID, XT_LRRBMID, XT_ZHXGRBM, LXRGMSFHM, FZRQ, SJMC, SSDQ, SFYSPJK,
+        XT_ZHXGRXM, XT_ZHXGRID, XT_ZHXGIP, SSPCSDM, WHZT, DZ_DWDZMLPXZ, OLD_ID, DWSC, XZBJ, DEP_ACTION_TIME,
+        OLD_SJDWID, WLJDSBDMM, BARS, ZBX, ETL_OPER_TYPE, ETL_TIMESTAMP, ETL_UPDATE_TIME
+    </sql>
+
+    <select id="selectSydwList" resultType="com.mosty.base.model.entity.afjcsj.VwSydwJbxxGx">
+        select * from af_jcsj.vw_sydw_jbxx_gx a where xt_zxbz = '0'
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and match(a.zcdz,a.dwlxdh,a.dz_dwdzxz,a.dwmc) against (#{dto.keyword})
+        </if>
+        <if test="dto.gldj != null and dto.gldj != ''">
+            and a.gldj = #{dto.gldj}
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectSydwCount" resultType="java.lang.Integer">
+        select count(1) from af_jcsj.vw_sydw_jbxx_gx a where xt_zxbz = '0'
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and match(a.zcdz,a.dwlxdh,a.dz_dwdzxz,a.dwmc) against (#{dto.keyword})
+        </if>
+        <if test="dto.gldj != null and dto.gldj != ''">
+            and a.gldj = #{dto.gldj}
+        </if>
+    </select>
+
+    <select id="getStatistics" resultType="java.util.Map">
+        select count(gldj) count,gldj from af_jcsj.vw_sydw_jbxx_gx where xt_zxbz = '0' group by gldj
+    </select>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/mapper/VwSyrkJzgjGxMapper.xml b/mosty-jcgl/src/main/resources/mapper/VwSyrkJzgjGxMapper.xml
new file mode 100644
index 0000000..692107c
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/mapper/VwSyrkJzgjGxMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.base.manager.mapper.VwSyrkJzgjGxMapper">
+
+    <select id="getCount" resultType="Integer">
+        select count(1) from af_jcsj.vw_syrk_jzgj_gx a where xt_zxbz = '0'
+        and a.jzd_fxjdm = "510109000000"
+        <if test="dto.gldjdm != null and dto.gldjdm != ''">
+            and a.gldjdm = #{dto.gldjdm}
+        </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and match(a.JZD_DZXZ,a.GLDW) against (#{dto.keyword})
+        </if>
+    </select>
+
+    <select id="getList" resultType="com.mosty.base.model.entity.afjcsj.VwSyrkJzgjGx">
+        select * from af_jcsj.vw_syrk_jzgj_gx a where xt_zxbz = '0'
+        and a.jzd_fxjdm = "510109000000"
+        <if test="dto.gldjdm != null and dto.gldjdm != ''">
+            and a.gldjdm = #{dto.gldjdm}
+        </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and match(a.JZD_DZXZ,a.GLDW) against (#{dto.keyword})
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getStatistics" resultType="java.util.Map">
+        select count(a.gldjdm) count, a.gldjdm
+        from af_jcsj.vw_syrk_jzgj_gx a
+        where xt_zxbz = '0'
+          and a.jzd_fxjdm = "510109000000"
+        group by a.gldjdm
+    </select>
+</mapper>
diff --git a/mosty-jcgl/src/main/resources/rebel.xml b/mosty-jcgl/src/main/resources/rebel.xml
new file mode 100644
index 0000000..9f63c54
--- /dev/null
+++ b/mosty-jcgl/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-jcgl</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-jcgl/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-other/mosty-other.iml b/mosty-other/mosty-other.iml
new file mode 100644
index 0000000..a509aca
--- /dev/null
+++ b/mosty-other/mosty-other.iml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.oracle:ojdbc6:11.2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.9" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-other/pom.xml b/mosty-other/pom.xml
new file mode 100644
index 0000000..684bb1b
--- /dev/null
+++ b/mosty-other/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-other</artifactId>
+    <description>三方数据抽取中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+
+
+</project>
\ No newline at end of file
diff --git a/mosty-other/src/main/java/com/mosty/lzother/MostyLzotherApplication.java b/mosty-other/src/main/java/com/mosty/lzother/MostyLzotherApplication.java
new file mode 100644
index 0000000..8187d21
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/MostyLzotherApplication.java
@@ -0,0 +1,21 @@
+package com.mosty.lzother;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableTimeConsume
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@EnableDiscoveryClient
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@EnableScheduling
+public class MostyLzotherApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MostyLzotherApplication.class, args);
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/config/FeignConfig.java b/mosty-other/src/main/java/com/mosty/lzother/config/FeignConfig.java
new file mode 100644
index 0000000..7d15d5a
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/config/FeignConfig.java
@@ -0,0 +1,27 @@
+package com.mosty.lzother.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null && attr.getRequest() != null) {
+            HttpServletRequest request = attr.getRequest();
+            if (StringUtils.isNotBlank(request.getHeader("Authorization"))) {
+                // 添加token
+                requestTemplate.header("Authorization", request.getHeader("Authorization"));
+            }
+        }
+
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/config/GlobalYmlConfig.java b/mosty-other/src/main/java/com/mosty/lzother/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..f6db352
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.lzother.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/config/WebMvcConfig.java b/mosty-other/src/main/java/com/mosty/lzother/config/WebMvcConfig.java
new file mode 100644
index 0000000..2e195ca
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.lzother.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/controller/VLz110TxjController.java b/mosty-other/src/main/java/com/mosty/lzother/controller/VLz110TxjController.java
new file mode 100644
index 0000000..39ce535
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/controller/VLz110TxjController.java
@@ -0,0 +1,62 @@
+package com.mosty.lzother.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.utils.OkHttpUtils;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.lzother.service.VLz110TxjService;
+import com.mosty.lzother.task.SyncJqTask;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+
+@RestController
+@AllArgsConstructor
+@RequestMapping(value = "lzJq")
+@Api(tags = {"泸州特巡警警情110对象接口"})
+public class VLz110TxjController extends BaseController {
+
+    private final VLz110TxjService vLz110TxjService;
+    private final RedisService redisService;
+
+    @GetMapping(value = "/syncHndJq")
+    @ApiOperation("同步警情110数据")
+    public ResponseResult<Void> syncHndJq(String time) {
+        this.vLz110TxjService.syncHndJq(time);
+        return ResponseResult.success();
+    }
+
+    @GetMapping(value = "/syncJqCjd")
+    @ApiOperation("处警警情")
+    public ResponseResult<Void> syncJqCjd(String time) {
+        this.vLz110TxjService.syncJqCjd(time);
+        return ResponseResult.success();
+    }
+
+    @GetMapping(value = "/autoTime")
+    @ApiOperation("启动或者停止警情定时器")
+    public ResponseResult<Boolean> autoTime() {
+        SyncJqTask.start = !SyncJqTask.start;
+        return ResponseResult.success(SyncJqTask.start);
+    }
+
+    @GetMapping(value = "/autoTimeXzjq")
+    @ApiOperation("启动或者停止修正警情定时器")
+    public ResponseResult<Boolean> autoTimeXzjq() {
+        SyncJqTask.jqxz = !SyncJqTask.jqxz;
+        return ResponseResult.success(SyncJqTask.jqxz);
+    }
+}
\ No newline at end of file
diff --git a/mosty-other/src/main/java/com/mosty/lzother/mapper/CzxxMapper.java b/mosty-other/src/main/java/com/mosty/lzother/mapper/CzxxMapper.java
new file mode 100644
index 0000000..013930d
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/mapper/CzxxMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.lzother.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.xinzhi.Czxx;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CzxxMapper extends BaseMapper<Czxx> {
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/mapper/FkdbMapper.java b/mosty-other/src/main/java/com/mosty/lzother/mapper/FkdbMapper.java
new file mode 100644
index 0000000..f06b87c
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/mapper/FkdbMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.lzother.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.lzother.FKDB;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FkdbMapper extends BaseMapper<FKDB> {
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/mapper/JjdbMapper.java b/mosty-other/src/main/java/com/mosty/lzother/mapper/JjdbMapper.java
new file mode 100644
index 0000000..f56abad
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/mapper/JjdbMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.lzother.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface JjdbMapper extends BaseMapper<Jjdb> {
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/mapper/RhMyhtWarnMapper.java b/mosty-other/src/main/java/com/mosty/lzother/mapper/RhMyhtWarnMapper.java
new file mode 100644
index 0000000..e12b1e7
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/mapper/RhMyhtWarnMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.lzother.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RhMyhtWarnMapper extends BaseMapper<RhMyhtWarn> {
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/remote/TbBaseAdaptRemoteService.java b/mosty-other/src/main/java/com/mosty/lzother/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..8a44c9e
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,136 @@
+package com.mosty.lzother.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    /**
+     * 部门信息
+     */
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    /**
+     * 根据部门编码查询部门信息
+     *
+     * @param orgCode 部门编码
+     * @return 部门信息
+     */
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 根据部门deptid获取所属分县局、所属地市州
+     *
+     * @param deptid 部门编码
+     */
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 根据部门deptid获取所属分县局、所属地市州
+     *
+     * @param orgcode 部门编码
+     */
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门code查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门code查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 获取所有的用户数据
+     */
+    public List<SysUserDeptVO> getUserAll(String deptId) {
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserAll(deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return new ArrayList<>();
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 获取所有的部门信息集合
+     */
+    public List<DeptInfoVo> getDeptAll() {
+        ResponseResult<List<DeptInfoVo>> responseResult = mostyBaseFeignService.getDeptAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return new ArrayList<>();
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 给人员发送消息
+     */
+    public Integer sendMsg(SysMessageInfoInsertDto dto) {
+        ResponseResult<Integer> responseResult = mostyBaseFeignService.sendMsg(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("给人员发送消息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            return 0;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 获取人员的部门所属
+     */
+    public DeptInfoVo getDeptInfoByUserId(String userId) {
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoByUserId(userId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取人员的部门所属失败， responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/remote/TbSjzxAdaptRemoteService.java b/mosty-other/src/main/java/com/mosty/lzother/remote/TbSjzxAdaptRemoteService.java
new file mode 100644
index 0000000..55deef2
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/remote/TbSjzxAdaptRemoteService.java
@@ -0,0 +1,107 @@
+package com.mosty.lzother.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostySjzxFeignService;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.xinzhi.GxCjdb;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.model.vo.xinzhi.GxAlarmAllVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/31
+ * 外部调用事件中心接口
+ **/
+@Service
+@Slf4j
+public class TbSjzxAdaptRemoteService {
+
+    @Resource
+    private MostySjzxFeignService mostySjzxFeignService;
+
+    // 同步仁寿警情信息
+    public void addRsJq(TbJq dto) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.addRsJq(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("同步仁寿警情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("同步仁寿警情信息异常");
+        }
+    }
+
+    // 获取警情的最新的一条信息
+    public TbJqVo getLastJq() {
+        ResponseResult<TbJqVo> responseResult = this.mostySjzxFeignService.getLastJq();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取警情的最新的一条信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取警情的最新的一条信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取最新一条处警单的数据
+    public TbJqCjdb getLastJqCjdb() {
+        ResponseResult<TbJqCjdb> responseResult = this.mostySjzxFeignService.getLastJqCjdb();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取最新一条处警单的数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取最新一条处警单的数据异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加仁寿处警单数据
+    public void addRsCjdb(TbJqCjdb cjdb) {
+        ResponseResult<TbJqCjdb> responseResult = this.mostySjzxFeignService.addRsCjdb(cjdb);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加仁寿处警单数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加仁寿处警单数据异常");
+        }
+    }
+
+    // 添加泸州110警情数据
+    public void addLzJq(VLz110Txj lz110) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.addLzJq(lz110);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州110警情数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州110警情数据异常");
+        }
+    }
+
+    // 添加泸州海能达警情数据
+    public void addLzHndJq(Jjdb jjdb) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.addLzHndJq(jjdb);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州110警情数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州110警情数据异常");
+        }
+    }
+
+    // 查询没得经纬度的接警单编号
+    public List<String> selectJjdbh() {
+        ResponseResult<List<String>> responseResult = this.mostySjzxFeignService.selectJjdbh();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询没得经纬度的接警单编号 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询没得经纬度的接警单编号异常");
+        }
+        return responseResult.getData();
+    }
+
+    //修改经纬度
+    public void updateJqJwd(Jjdb jjdb) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.updateJqJwd(jjdb);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州110警情数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州110警情数据异常");
+        }
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/remote/TbYjzlAdaptRemoteService.java b/mosty-other/src/main/java/com/mosty/lzother/remote/TbYjzlAdaptRemoteService.java
new file mode 100644
index 0000000..a84e818
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/remote/TbYjzlAdaptRemoteService.java
@@ -0,0 +1,78 @@
+package com.mosty.lzother.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyYjzlFeignService;
+import com.mosty.base.model.dto.yjzl.GetLastYjDto;
+import com.mosty.base.model.entity.lzother.TAlarmYjZl;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.vo.lzother.TAlarmYjZlVo;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用公安机关要素接口
+ **/
+@Service
+@Slf4j
+public class TbYjzlAdaptRemoteService {
+
+    @Resource
+    private MostyYjzlFeignService mostyYjzlFeignService;
+
+    // 同步拓尔思预警指令(高新)
+    public void addTrsZl(VwAlermYjzlVo dto) {
+        ResponseResult<Void> responseResult = this.mostyYjzlFeignService.addTrsZl(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("同步拓尔思预警指令失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("同步拓尔思预警指令失败");
+        }
+    }
+
+    // 获取trs最新的一条指令信息
+    public TbZlxx getLastZlxx() {
+        ResponseResult<TbZlxx> responseResult = this.mostyYjzlFeignService.getLastZlxx();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取trs最新的一条指令信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取trs最新的一条指令信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据条件查询最新的预警信息
+    public TbYjxx getLastYj(GetLastYjDto dto) {
+        ResponseResult<TbYjxx> responseResult = this.mostyYjzlFeignService.getLastYj(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据条件查询最新的预警信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据条件查询最新的预警信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加泸州拓尔思预警信息
+    public void addYjxx(TAlarmYjgj item) {
+        ResponseResult<Void> responseResult = this.mostyYjzlFeignService.addYjxx(item);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州拓尔思预警信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州拓尔思预警信息失败");
+        }
+    }
+
+    // 添加融合预警信息失败
+    public void addRhyj(RhMyhtWarn rhMyhtWarn) {
+        ResponseResult<Void> responseResult = this.mostyYjzlFeignService.saveHryj(rhMyhtWarn);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加融合预警信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加融合预警信息失败");
+        }
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/remote/TbYsZxAdaptRemoteService.java b/mosty-other/src/main/java/com/mosty/lzother/remote/TbYsZxAdaptRemoteService.java
new file mode 100644
index 0000000..68a5a2f
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/remote/TbYsZxAdaptRemoteService.java
@@ -0,0 +1,69 @@
+package com.mosty.lzother.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.dto.yszx.TbYsGajgByJwdDto;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用公安机关要素接口
+ **/
+@Service
+@Slf4j
+public class TbYsZxAdaptRemoteService {
+
+    @Resource
+    private MostyYszxFeignService tbYszxFeignService;
+
+    // 返回要素表中不存在的感知源
+    public List<String> getInfoBySbbh(List<String> ids) {
+        ResponseResult<List<String>> responseResult = tbYszxFeignService.getInfoBySbbh(ids);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return new ArrayList<>();
+        }
+        return responseResult.getData();
+    }
+
+    // 添加摄像头信息
+    public Integer addSxt(TbYsSxtDto dto) {
+        ResponseResult<Integer> responseResult = tbYszxFeignService.addSxt(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加摄像头信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加摄像头信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据经纬度查询所在辖区
+    public TbYsGajgVo getGajgByJwd(TbYsGajgByJwdDto dto) {
+        ResponseResult<TbYsGajgVo> responseResult = tbYszxFeignService.getGajgByJwd(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所在辖区失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所在辖区失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加泸州感知源信息
+    public void addLzGzy(ZhjmxfXfqwXfqyGzdw dto) {
+        ResponseResult<Void> responseResult = this.tbYszxFeignService.addLzGzy(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州感知源信息 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州感知源信息异常");
+        }
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/service/VLz110TxjService.java b/mosty-other/src/main/java/com/mosty/lzother/service/VLz110TxjService.java
new file mode 100644
index 0000000..479e4f3
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/service/VLz110TxjService.java
@@ -0,0 +1,22 @@
+package com.mosty.lzother.service;
+
+import com.mosty.base.model.entity.xinzhi.Czxx;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface VLz110TxjService {
+
+    @ApiOperation("海能达警情")
+    void syncHndJq(String time);
+
+    @ApiOperation("海能达处警警情")
+    void syncJqCjd(String time);
+
+    @ApiOperation("融合预警")
+    void rhyj(String time);
+
+    @ApiOperation("修改经纬度")
+    void selectJjdbh();
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/service/impl/VLz110TxjServiceImpl.java b/mosty-other/src/main/java/com/mosty/lzother/service/impl/VLz110TxjServiceImpl.java
new file mode 100644
index 0000000..06935f0
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/service/impl/VLz110TxjServiceImpl.java
@@ -0,0 +1,181 @@
+package com.mosty.lzother.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.yjzl.GetLastYjDto;
+import com.mosty.base.model.entity.lzother.FKDB;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.xinzhi.Czxx;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzYjjb;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.lzother.mapper.CzxxMapper;
+import com.mosty.lzother.mapper.FkdbMapper;
+import com.mosty.lzother.mapper.JjdbMapper;
+import com.mosty.lzother.mapper.RhMyhtWarnMapper;
+import com.mosty.lzother.remote.TbBaseAdaptRemoteService;
+import com.mosty.lzother.remote.TbSjzxAdaptRemoteService;
+import com.mosty.lzother.remote.TbYjzlAdaptRemoteService;
+import com.mosty.lzother.service.VLz110TxjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+@Service
+@AllArgsConstructor
+public class VLz110TxjServiceImpl extends ServiceImpl<JjdbMapper, Jjdb>
+        implements VLz110TxjService {
+
+    private final TbSjzxAdaptRemoteService tbSjzxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYjzlAdaptRemoteService tbYjzlAdaptRemoteService;
+    private final FkdbMapper fkdbMapper;
+    private final RhMyhtWarnMapper rhMyhtWarnMapper;
+    private final CzxxMapper czxxMapper;
+    private final RedisService redisService;
+
+    @Override
+    public void syncJqCjd(String time) {
+        // 获取最后一条数据的时间
+        TbJqCjdb cjd = this.tbSjzxAdaptRemoteService.getLastJqCjdb();
+        if (StringUtils.isBlank(time) && ObjectUtils.isNotEmpty(cjd)) {
+            time = DateUtils.getQueryDateString(cjd.getRksj(), "02");
+        } else {
+            time = time + " 00:00:00";
+        }
+        List<FKDB> list = this.fkdbMapper.selectList(
+                new LambdaQueryWrapper<FKDB>()
+                        .first("select * from ( ")
+                        .last(" ) a  where  to_char(cjsj,'yyyy-MM-dd HH24:mi:ss') > '" + time + "' order by cjsj asc")
+
+        );
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(item -> {
+                TbJqCjdb cjdb = new TbJqCjdb();
+                BeanUtils.copyProperties(item, cjdb);
+                cjdb.setId(UUIDGenerator.getUUID());
+                cjdb.setCjdbh(item.getFkdbh());
+                cjdb.setJjdbh(item.getJjdbh());
+                cjdb.setTzdbh(item.getPjdbh());
+                cjdb.setCjdwbh(item.getFkdwdm());
+                cjdb.setCjyxm(item.getFkyxm());
+                cjdb.setCjybh(item.getFkybh());
+                cjdb.setScfksj(item.getFksj());
+                cjdb.setCjsj(item.getCjsj01());
+                cjdb.setDdxcsj(item.getDdxcsj());
+                cjdb.setCjwbsj(item.getXcclwbsj());
+                cjdb.setFknr(item.getCjczqk());
+                cjdb.setCjqk(item.getCjczqk());
+                cjdb.setCljglx(item.getJqcljgdm());
+                cjdb.setCljg(item.getJqcljgsm());
+                cjdb.setCdry(item.getCdrc());
+                cjdb.setCdcl(item.getCdcc());
+                cjdb.setXzqh(item.getXzqhdm());
+                cjdb.setRksj(item.getCjsj());
+                cjdb.setFkdwxzb(item.getFkdwxzb());
+                cjdb.setFkdwyzb(item.getFkdwyzb());
+                DeptInfoVo dept;
+                if (StringUtils.isNotBlank(item.getFkdwdm())) {
+                    dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getFkdwdm());
+                    if (dept != null) {
+                        cjdb.setCjdwmc(dept.getDeptname());
+                    }
+                }
+                cjdb.setXzqh(item.getXzqhdm());
+                cjdb.setXtSjly("1");
+                cjdb.setCjwbsj(item.getXcclwbsj());
+                cjdb.setCljg(item.getJqclztdm());
+                // TODO 翻译类型
+                cjdb.setCljglx(item.getJqcljgdm());
+                this.tbSjzxAdaptRemoteService.addRsCjdb(cjdb);
+            });
+        }
+    }
+
+
+    @Override
+    public void syncHndJq(String time) {
+        TbJqVo jqVo = this.tbSjzxAdaptRemoteService.getLastJq();
+        if (StringUtils.isBlank(time) && ObjectUtils.isNotEmpty(jqVo)) {
+            time = DateUtils.getQueryDateString(jqVo.getBjsj(), "02");
+        } else {
+            time = time + " 00:00:00";
+        }
+        List<Jjdb> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<Jjdb>()
+                        .last(" where  LENGTH(jqlbdm) > 0  and LENGTH(bjnr) > 0  and LENGTH(gxdwdm) > 0  and to_char(\"bjsj\",'yyyy-MM-dd HH24:mi:ss') > '" + time + "' order by bjsj asc")
+        );
+        if (!CollectionUtils.isEmpty(list)) {
+            for (Jjdb jjdb : list) {
+                this.tbSjzxAdaptRemoteService.addLzHndJq(jjdb);
+            }
+        }
+    }
+
+    @Override
+    @DS("rh_yj")
+    public void rhyj(String time) {
+        if (StringUtils.isEmpty(time)) {
+            TbYjxx lastYj = this.tbYjzlAdaptRemoteService.getLastYj(new GetLastYjDto().setYjlyid("02"));
+            if (ObjectUtils.isNotEmpty(lastYj)) {
+                time = DateUtils.getQueryDateString(lastYj.getYjSj(), "02");
+            }
+        }
+        long gjsj = DateUtils.strToDate(StringUtils.isNoneBlank(time) ? time : DateUtils.getSystemDateTimeString(), "02").getTime() / 1000;
+        List<RhMyhtWarn> rhMyhtWarns = this.rhMyhtWarnMapper.selectList(new LambdaQueryWrapper<RhMyhtWarn>().gt(RhMyhtWarn::getCreateTime, gjsj));
+        if (!CollectionUtils.isEmpty(rhMyhtWarns)) {
+            rhMyhtWarns.forEach(this.tbYjzlAdaptRemoteService::addRhyj);
+        }
+    }
+
+
+    public void selectJjdbh() {
+        List<String> jjdbh = this.tbSjzxAdaptRemoteService.selectJjdbh();
+        if (!CollectionUtils.isEmpty(jjdbh)) {
+            jjdbh.forEach(v -> {
+                Jjdb jjdb = this.baseMapper.selectOne(
+                        new LambdaQueryWrapper<Jjdb>()
+                                .eq(Jjdb::getJjdbh, v)
+                                .isNotNull(Jjdb::getFxdwwd)
+                                .isNotNull(Jjdb::getFxdwjd)
+                );
+                if (ObjectUtils.isNotEmpty(jjdb)) {
+                    this.tbSjzxAdaptRemoteService.updateJqJwd(jjdb);
+                }
+
+            });
+        }
+        //补全警情 查询今日接警单号
+        String time = DateUtils.getSystemDateTimeString();
+        time = DateUtils.getQueryDateString(DateUtils.getNextDate(DateUtils.strToDate(time, "02"), "H", -3), "02");
+        List<Jjdb> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<Jjdb>()
+                        .last(" where  LENGTH(jqlbdm) > 0  and LENGTH(bjnr) > 0  and LENGTH(gxdwdm) > 0  and to_char(\"bjsj\",'yyyy-MM-dd HH24:mi:ss') >= '" + time + "' order by bjsj asc")
+        );
+        //判断
+        if (!CollectionUtils.isEmpty(list)) {
+            for (Jjdb jjdb : list) {
+                if (!redisService.hasKey(Constant.JQ + jjdb.getJjdbh())) {
+                    this.tbSjzxAdaptRemoteService.addLzHndJq(jjdb);
+                }
+            }
+        }
+
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/task/SyncJqTask.java b/mosty-other/src/main/java/com/mosty/lzother/task/SyncJqTask.java
new file mode 100644
index 0000000..d6dbb1e
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/task/SyncJqTask.java
@@ -0,0 +1,46 @@
+package com.mosty.lzother.task;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.mosty.lzother.service.VLz110TxjService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author dw
+ * @since 2022/12/15
+ * 同步特巡警110警情数据
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class SyncJqTask {
+
+    private final VLz110TxjService vLz110TxjService;
+    public static boolean start = true;
+    public static boolean jqxz = true;
+
+    @Scheduled(cron = "0/30 * * * * *")
+    @Transactional
+    public void run() {
+        if (start) {
+            log.info("同步特巡警110警情数据");
+            this.vLz110TxjService.syncHndJq(null);
+            this.vLz110TxjService.syncJqCjd(null);
+            log.info("同步特巡警110警情数据--->结束");
+        }
+    }
+
+    //两分钟分钟分钟修正一次经纬度
+    @Scheduled(cron = "0 */20 * * * ?")
+    @Transactional
+    public void selectJjdbh() {
+        if (jqxz) {
+            log.info("修改经纬度");
+            this.vLz110TxjService.selectJjdbh();
+            log.info("修改经纬度--->结束");
+        }
+    }
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/utils/ArthenaTest.java b/mosty-other/src/main/java/com/mosty/lzother/utils/ArthenaTest.java
new file mode 100644
index 0000000..efea5b6
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/utils/ArthenaTest.java
@@ -0,0 +1,56 @@
+package com.mosty.lzother.utils;
+
+import com.google.common.collect.Maps;
+import com.mosty.base.utils.Constant;
+import com.mosty.common.core.util.HttpClientUtil;
+import com.mosty.common.core.util.http.HttpUtils;
+import okhttp3.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpResponse;
+
+import javax.crypto.Cipher;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.security.KeyFactory;
+import java.security.PublicKey;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ArthenaTest {
+
+    /**
+     * 注册到网关的调用方应用所属的公钥,用于加密需要加密的参数
+     */
+    private static final String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCOA2uL+d+0/DC8laEG9xbsfYZd9eoSJephsUdrnF4zLV+btHVCu/9MMwN0KMomgL63VjDI/w8VwL7urDhW6jG8jmVcXJezU5VetfPpFIupNEYIgdOJ2V0nMJlbYPNXfTNHDx1V7hDb4gbCOxXIda8tJHWhTk0gMls84ElqK0+G2wIDAQAB";
+
+    private static final String rsaKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbDiY4EyIXyS94pRMS18KP4wwCwnpncNYjj6y9WjdIxyz35Cs8UCKztPeeHZi7Pqovln/4ul3yzyU/A4RYEhwVLUr8bC8HHCHkINbI0aNLvS5uq3uZd7NbgjA/F1O0XvC0whVqCBLNM0HNtkUyGDGz9r1+X2DpaYyvCxD+Mt8BOQIDAQAB";
+    /**
+     * 注册到网关的调用方应用的key,作为唯一标识符
+     */
+    private static final String athenaAppKey = "afbbc6936d0243aea4f421fbf2b6b75d";
+    /**
+     * 注册到网关的调用方应用的名字
+     */
+    private static final String athenaAppName = "智慧派出所";
+
+    private static final String url = "/athena/forward/93AD36543A39D2505C70A56C66D6B9FCF195D02A717E51E34E29703D5C49ACC6";
+
+    private static final String ysToken = "bc837f91-76a7-4314-b4c0-db98d62b2931";
+
+
+    private static String encryptData(String str, String publicKeyText) throws Exception {
+        byte[] decoded = Base64.getDecoder().decode(publicKeyText);
+        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(decoded);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        PublicKey pk = keyFactory.generatePublic(keySpec);
+        Cipher cipher = Cipher.getInstance("RSA");
+        cipher.init(Cipher.ENCRYPT_MODE, pk);
+        byte[] encryptedData = cipher.doFinal(str.getBytes());
+        return Base64.getEncoder().encodeToString(encryptedData);
+    }
+
+}
diff --git a/mosty-other/src/main/java/com/mosty/lzother/utils/OkHttpUtils.java b/mosty-other/src/main/java/com/mosty/lzother/utils/OkHttpUtils.java
new file mode 100644
index 0000000..bd9f055
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/utils/OkHttpUtils.java
@@ -0,0 +1,403 @@
+package com.mosty.lzother.utils;
+
+import com.alibaba.fastjson.JSON;
+import okhttp3.*;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+public class OkHttpUtils {
+    private static volatile OkHttpClient okHttpClient = null;
+    private static volatile Semaphore semaphore = null;
+    private Map<String, String> headerMap;
+    private Map<String, Object> paramMap;
+    private String url;
+    private Request.Builder request;
+
+    /**
+     * 初始化okHttpClient，并且允许https访问
+     */
+    private OkHttpUtils() {
+        if (okHttpClient == null) {
+            synchronized (OkHttpUtils.class) {
+                if (okHttpClient == null) {
+                    TrustManager[] trustManagers = buildTrustManagers();
+                    okHttpClient = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS).readTimeout(20, TimeUnit.SECONDS).sslSocketFactory(createSSLSocketFactory(trustManagers), (X509TrustManager) trustManagers[0]).hostnameVerifier((hostName, session) -> true).retryOnConnectionFailure(true).build();
+                    addHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+                }
+            }
+        }
+    }
+
+    /**
+     * 用于异步请求时，控制访问线程数，返回结果
+     *
+     * @return
+     */
+    private static Semaphore getSemaphoreInstance() {
+        //只能1个线程同时访问
+        synchronized (OkHttpUtils.class) {
+            if (semaphore == null) {
+                semaphore = new Semaphore(0);
+            }
+        }
+        return semaphore;
+    }
+
+    /**
+     * 创建OkHttpUtils
+     *
+     * @return
+     */
+    public static OkHttpUtils builder() {
+        return new OkHttpUtils();
+    }
+
+    /**
+     * 添加url
+     *
+     * @param url
+     * @return
+     */
+    public OkHttpUtils url(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * 添加参数
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addParam(String key, Object value) {
+        if (paramMap == null) {
+            paramMap = new LinkedHashMap<>(16);
+        }
+        paramMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 添加请求头
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addHeader(String key, String value) {
+        if (headerMap == null) {
+            headerMap = new LinkedHashMap<>(16);
+        }
+        headerMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 初始化get方法
+     *
+     * @return
+     */
+    public OkHttpUtils get() {
+        request = new Request.Builder().get();
+        StringBuilder urlBuilder = new StringBuilder(url);
+        if (paramMap != null) {
+            urlBuilder.append("?");
+            try {
+                for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
+                    urlBuilder.append(URLEncoder.encode(entry.getKey(), "utf-8")).append("=").append(URLEncoder.encode(entry.getValue().toString(), "utf-8")).append("&");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        }
+        request.url(urlBuilder.toString());
+        return this;
+    }
+
+    /**
+     * 初始化delet方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils delete(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().delete(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils post(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    public OkHttpUtils post(Map<String, Object> data, boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(Map<String, Object> data, boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 同步请求
+     *
+     * @return
+     */
+    public String sync() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            assert response.body() != null;
+            System.out.println(response.headers().toString());
+            return response.body().string();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "请求失败：" + e.getMessage();
+        }
+    }
+
+    public Headers syncHeader() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            System.out.println(response.headers());
+            return  response.headers();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+
+    /**
+     * 异步请求，有返回值
+     */
+    public String async() {
+        StringBuilder buffer = new StringBuilder("");
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                buffer.append("请求出错：").append(e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                buffer.append(response.body().string());
+                getSemaphoreInstance().release();
+            }
+        });
+        try {
+            getSemaphoreInstance().acquire();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * 异步请求，带有接口回调
+     *
+     * @param callBack
+     */
+    public void async(ICallBack callBack) {
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callBack.onFailure(call, e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                callBack.onSuccessful(call, response.body().string());
+            }
+        });
+    }
+
+    /**
+     * 为request添加请求头
+     *
+     * @param request
+     */
+    private void setHeader(Request.Builder request) {
+        if (headerMap != null) {
+            try {
+                for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+                    request.addHeader(entry.getKey(), entry.getValue());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 生成安全套接字工厂，用于https请求的证书跳过
+     *
+     * @return
+     */
+    private static SSLSocketFactory createSSLSocketFactory(TrustManager[] trustAllCerts) {
+        SSLSocketFactory ssfFactory = null;
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new SecureRandom());
+            ssfFactory = sc.getSocketFactory();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ssfFactory;
+    }
+
+    private static TrustManager[] buildTrustManagers() {
+        return new TrustManager[]{new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[]{};
+            }
+        }};
+    }
+    /**
+     * 自定义一个接口回调
+     */
+    public interface ICallBack {
+
+        void onSuccessful(Call call, String data);
+
+        void onFailure(Call call, String errorMsg);
+
+    }
+}
\ No newline at end of file
diff --git a/mosty-other/src/main/java/com/mosty/lzother/utils/RSAUtil.java b/mosty-other/src/main/java/com/mosty/lzother/utils/RSAUtil.java
new file mode 100644
index 0000000..f406f5f
--- /dev/null
+++ b/mosty-other/src/main/java/com/mosty/lzother/utils/RSAUtil.java
@@ -0,0 +1,278 @@
+package com.mosty.lzother.utils;
+
+
+import org.apache.tomcat.util.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import java.security.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * RSA加密和解密工具
+ */
+public class RSAUtil {
+
+    /**
+     * 数字签名，密钥算法
+     */
+    private static final String RSA_KEY_ALGORITHM = "RSA";
+
+    /**
+     * 数字签名签名/验证算法
+     */
+    private static final String SIGNATURE_ALGORITHM = "MD5withRSA";
+
+    /**
+     * RSA密钥长度，RSA算法的默认密钥长度是1024密钥长度必须是64的倍数，在512到65536位之间
+     */
+    private static final int KEY_SIZE = 1024;
+
+    /**
+     * 生成密钥对
+     */
+    private static Map<String, String> initKey() throws Exception {
+        KeyPairGenerator keygen = KeyPairGenerator.getInstance(RSA_KEY_ALGORITHM);
+        SecureRandom secrand = new SecureRandom();
+        /**
+         * 初始化随机产生器
+         */
+        secrand.setSeed("initSeed".getBytes());
+        /**
+         * 初始化密钥生成器
+         */
+        keygen.initialize(KEY_SIZE, secrand);
+        KeyPair keys = keygen.genKeyPair();
+
+        byte[] pub_key = keys.getPublic().getEncoded();
+        String publicKeyString = Base64.encodeBase64String(pub_key);
+
+        byte[] pri_key = keys.getPrivate().getEncoded();
+        String privateKeyString = Base64.encodeBase64String(pri_key);
+
+        Map<String, String> keyPairMap = new HashMap<>();
+        keyPairMap.put("publicKeyString", publicKeyString);
+        keyPairMap.put("privateKeyString", privateKeyString);
+
+        return keyPairMap;
+    }
+
+    /**
+     * 密钥转成字符串
+     *
+     * @param key
+     * @return
+     */
+    public static String encodeBase64String(byte[] key) {
+        return Base64.encodeBase64String(key);
+    }
+
+    /**
+     * 密钥转成byte[]
+     *
+     * @param key
+     * @return
+     */
+    public static byte[] decodeBase64(String key) {
+        return Base64.decodeBase64(key);
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data      加密前的字符串
+     * @param publicKey 公钥
+     * @return 加密后的字符串
+     * @throws Exception
+     */
+    public static String encryptByPubKey(String data, String publicKey) throws Exception {
+        byte[] pubKey = com.mosty.common.core.util.RSAUtil.decodeBase64(publicKey);
+        byte[] enSign = encryptByPubKey(data.getBytes(), pubKey);
+        return Base64.encodeBase64String(enSign);
+    }
+
+    /**
+     * 公钥加密
+     *
+     * @param data   待加密数据
+     * @param pubKey 公钥
+     * @return
+     * @throws Exception
+     */
+    public static byte[] encryptByPubKey(byte[] data, byte[] pubKey) throws Exception {
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 私钥加密
+     *
+     * @param data       加密前的字符串
+     * @param privateKey 私钥
+     * @return 加密后的字符串
+     * @throws Exception
+     */
+    public static String encryptByPriKey(String data, String privateKey) throws Exception {
+        byte[] priKey = com.mosty.common.core.util.RSAUtil.decodeBase64(privateKey);
+        byte[] enSign = encryptByPriKey(data.getBytes(), priKey);
+        return Base64.encodeBase64String(enSign);
+    }
+
+    /**
+     * 私钥加密
+     *
+     * @param data   待加密的数据
+     * @param priKey 私钥
+     * @return 加密后的数据
+     * @throws Exception
+     */
+    public static byte[] encryptByPriKey(byte[] data, byte[] priKey) throws Exception {
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.ENCRYPT_MODE, privateKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 公钥解密
+     *
+     * @param data   待解密的数据
+     * @param pubKey 公钥
+     * @return 解密后的数据
+     * @throws Exception
+     */
+    public static byte[] decryptByPubKey(byte[] data, byte[] pubKey) throws Exception {
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.DECRYPT_MODE, publicKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 公钥解密
+     *
+     * @param data      解密前的字符串
+     * @param publicKey 公钥
+     * @return 解密后的字符串
+     * @throws Exception
+     */
+    public static String decryptByPubKey(String data, String publicKey) throws Exception {
+        byte[] pubKey = com.mosty.common.core.util.RSAUtil.decodeBase64(publicKey);
+        byte[] design = decryptByPubKey(Base64.decodeBase64(data), pubKey);
+        return new String(design);
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data   待解密的数据
+     * @param priKey 私钥
+     * @return
+     * @throws Exception
+     */
+    public static byte[] decryptByPriKey(byte[] data, byte[] priKey) throws Exception {
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+        cipher.init(Cipher.DECRYPT_MODE, privateKey);
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 私钥解密
+     *
+     * @param data       解密前的字符串
+     * @param privateKey 私钥
+     * @return 解密后的字符串
+     * @throws Exception
+     */
+    public static String decryptByPriKey(String data, String privateKey) throws Exception {
+        byte[] priKey = com.mosty.common.core.util.RSAUtil.decodeBase64(privateKey);
+        byte[] design = decryptByPriKey(Base64.decodeBase64(data), priKey);
+        return new String(design);
+    }
+
+    /**
+     * RSA签名
+     *
+     * @param data   待签名数据
+     * @param priKey 私钥
+     * @return 签名
+     * @throws Exception
+     */
+    public static String sign(byte[] data, byte[] priKey) throws Exception {
+        // 取得私钥
+        PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        // 生成私钥
+        PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
+        // 实例化Signature
+        Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+        // 初始化Signature
+        signature.initSign(privateKey);
+        // 更新
+        signature.update(data);
+        return Base64.encodeBase64String(signature.sign());
+    }
+
+    /**
+     * RSA校验数字签名
+     *
+     * @param data   待校验数据
+     * @param sign   数字签名
+     * @param pubKey 公钥
+     * @return boolean 校验成功返回true，失败返回false
+     */
+    public boolean verify(byte[] data, byte[] sign, byte[] pubKey) throws Exception {
+        // 实例化密钥工厂
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+        // 初始化公钥
+        X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
+        // 产生公钥
+        PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+        // 实例化Signature
+        Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+        // 初始化Signature
+        signature.initVerify(publicKey);
+        // 更新
+        signature.update(data);
+        // 验证
+        return signature.verify(sign);
+    }
+
+    public static void main(String[] args) {
+        try {
+            Map<String, String> keyMap = initKey();
+            String publicKeyString = keyMap.get("publicKeyString");
+            String privateKeyString = keyMap.get("privateKeyString");
+            System.out.println("公钥:" + publicKeyString);
+            System.out.println("私钥:" + privateKeyString);
+
+            // 待加密数据
+            String data = "admin123";
+            // 公钥加密
+            String encrypt = com.mosty.common.core.util.RSAUtil.encryptByPubKey(data, publicKeyString);
+            // 私钥解密
+            String decrypt = com.mosty.common.core.util.RSAUtil.decryptByPriKey(encrypt, privateKeyString);
+
+            System.out.println("加密前:" + data);
+            System.out.println("加密后:" + encrypt);
+            System.out.println("解密后:" + decrypt);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+
+
diff --git a/mosty-other/src/main/resources/application.yml b/mosty-other/src/main/resources/application.yml
new file mode 100644
index 0000000..146a20b
--- /dev/null
+++ b/mosty-other/src/main/resources/application.yml
@@ -0,0 +1,55 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    dynamic:
+      primary: jq
+      strict: false
+      datasource:
+        jq:
+          url: jdbc:postgresql://80.85.6.57:5431/mti-cad
+          username: qcck_test
+          password: 12345678abc
+          driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+
+swagger:
+  host: 80.93.7.13
+  port: 8010
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
diff --git a/mosty-other/src/main/resources/bootstrap.yml b/mosty-other/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..015874b
--- /dev/null
+++ b/mosty-other/src/main/resources/bootstrap.yml
@@ -0,0 +1,24 @@
+server:
+  port: 8025
+  servlet:
+    context-path: /mosty-other/
+spring:
+  application:
+    name: mosty-other
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
diff --git a/mosty-other/src/main/resources/logback-spring.xml b/mosty-other/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-other/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-qwzx/mosty-qwzx.iml b/mosty-qwzx/mosty-qwzx.iml
new file mode 100644
index 0000000..371f6b2
--- /dev/null
+++ b/mosty-qwzx/mosty-qwzx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353924" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-qwzx/pom.xml b/mosty-qwzx/pom.xml
new file mode 100644
index 0000000..cad35a7
--- /dev/null
+++ b/mosty-qwzx/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-qwzx</artifactId>
+    <description>勤务中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/MostyQwzxApplication.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/MostyQwzxApplication.java
new file mode 100644
index 0000000..4823ded
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/MostyQwzxApplication.java
@@ -0,0 +1,32 @@
+package com.mosty.qwzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	勤务中心 微服务
+ * @author kevin
+ * @date 2022/1/22 4:23 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.qwzx.mapper")
+@EnableDiscoveryClient
+@EnableScheduling
+@SpringBootApplication
+public class MostyQwzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyQwzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/config/FeignConfig.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/FeignConfig.java
new file mode 100644
index 0000000..6da0038
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.qwzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/config/GlobalYmlConfig.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..ac5d641
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.qwzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/config/WebMvcConfig.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..44faa9a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.qwzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxQwlbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxQwlbController.java
new file mode 100644
index 0000000..e9b13a2
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxQwlbController.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.qwzx.service.QwzxQwlbService;
+import com.mosty.qwzx.service.QwzxStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "勤务类别统计接口-源MAGIC接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/qwlb")
+public class QwzxQwlbController {
+
+    private QwzxQwlbService qwzxQwlbService;
+
+    @ApiOperation("勤务列表-不在岗警力清单")
+    @GetMapping("/bzgjlqd")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> bzgjlqd(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxQwlbService.bzgjlqd(dto));
+    }
+
+    @ApiOperation("勤务列表-街面巡组")
+    @GetMapping("/jmxz")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> jmxz(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxQwlbService.jmxz(dto));
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxStatisticsController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxStatisticsController.java
new file mode 100644
index 0000000..8196803
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/QwzxStatisticsController.java
@@ -0,0 +1,279 @@
+package com.mosty.qwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.qwzx.service.QwzxStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "勤务中心统计接口-源MAGIC接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jlqk")
+public class QwzxStatisticsController {
+
+    private QwzxStatisticsService qwzxStatisticsService;
+
+    @ApiOperation("警力情况-辅警-全部辅警数量")
+    @GetMapping("/fj/qbfj")
+    @JwtSysUser
+    public ResponseResult<Integer> qbfj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbfj(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-全部辅警列表")
+    @GetMapping("/fj/qbfjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qbfjList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbfjList(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-全部列表")
+    @GetMapping("/fj/qblb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qblb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qblb(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-全部列表-第三方")
+    @GetMapping("other/fj/qblb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qblbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qblbOther(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-全部在岗统计")
+    @GetMapping("/fj/qbzgtj")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qbzgtj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbzgtj(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-在岗辅警")
+    @GetMapping("/fj/zgfj")
+    @JwtSysUser
+    public ResponseResult<Integer> zgfj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgfj(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-在岗辅警列表")
+    @GetMapping("/fj/zgfjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zgfjList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgfjList(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-在岗辅警列表-第三方")
+    @GetMapping("other/fj/zgfjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zgfjListOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgfjListOther(dto));
+    }
+
+    @ApiOperation("警力情况-辅警-在岗列表")
+    @GetMapping("/fj/zglb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zglb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zglb(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-辅警列表")
+    @GetMapping("/jmjl/fjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> fjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.fjlb(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-辅警列表-第三方")
+    @GetMapping("other/jmjl/fjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> fjlbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.fjlbOther(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-民警列表")
+    @GetMapping("/jmjl/mjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjlb(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-民警列表-第三方")
+    @GetMapping("other/jmjl/mjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjlbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjlbOther(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-全部民警辅警")
+    @GetMapping("/jmjl/qb")
+    @JwtSysUser
+    public ResponseResult<Integer> qb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qb(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-全部民警辅警列表")
+    @GetMapping("/jmjl/qbList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qbList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbList(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-全部在岗民警辅警")
+    @GetMapping("/jmjl/zg")
+    @JwtSysUser
+    public ResponseResult<Integer> zg(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zg(dto));
+    }
+
+    @ApiOperation("警力情况-街面警力-在岗民警辅警列表")
+    @GetMapping("/jmjl/zgList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zgList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgList(dto));
+    }
+
+    @ApiOperation("警力情况-可抽调-可抽调辅警列表")
+    @GetMapping("/kcd/fjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> kcdFjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.kcdFjlb(dto));
+    }
+
+    @ApiOperation("警力情况-可抽调-可抽调民警辅警数量")
+    @GetMapping("/kcd/zbtj")
+    @JwtSysUser
+    public ResponseResult<List<Map<String,Object>>> zbtj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zbtj(dto));
+    }
+
+    @ApiOperation("警力情况-可抽调-可抽调民警列表")
+    @GetMapping("/kcd/mjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> kcdMjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.kcdMjlb(dto));
+    }
+
+    @ApiOperation("警力情况-民警-民警辅警整合列表")
+    @GetMapping("/mj/mjfjzh")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjfjzh(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjfjzh(dto));
+    }
+
+    @ApiOperation("警力情况-民警-全部列表")
+    @GetMapping("/mj/qblb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjQblb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjQblb(dto));
+    }
+
+    //===============================================================================================
+    @ApiOperation("警力情况-民警-全部列表-第三方")
+    @GetMapping("other/mj/qblb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjQblbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjQblbOther(dto));
+    }
+
+    @ApiOperation("警力情况-民警-全部民警")
+    @GetMapping("/mj/qbmj")
+    @JwtSysUser
+    public ResponseResult<Integer> qbmj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbmj(dto));
+    }
+
+    @ApiOperation("警力情况-民警-全部民警列表")
+    @GetMapping("/mj/qbmjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qbmjList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qbmjList(dto));
+    }
+
+    @ApiOperation("警力情况-民警-全部在岗统计")
+    @GetMapping("/mj/qbzgtj")
+    @JwtSysUser
+    public ResponseResult<Integer> mjQbzgtj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjQbzgtj(dto));
+    }
+
+    @ApiOperation("警力情况-民警-在岗列表")
+    @GetMapping("/mj/zglb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> mjZglb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjZglb(dto));
+    }
+
+    @ApiOperation("警力情况-民警-在岗民警")
+    @GetMapping("/mj/zgmj")
+    @JwtSysUser
+    public ResponseResult<Integer> zgmj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgmj(dto));
+    }
+
+    @ApiOperation("警力情况-民警-在岗民警辅警整合")
+    @GetMapping("/mj/zgmjfjzh")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zgmjfjzh(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgmjfjzh(dto));
+    }
+
+    @ApiOperation("警力情况-民警-在岗民警列表")
+    @GetMapping("/mj/zgmjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zgmjList(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgmjList(dto));
+    }
+
+    @ApiOperation("警力情况-民警-在岗民警列表-第三方")
+    @GetMapping("other/mj/zgmjList")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> zgmjListOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.zgmjListOther(dto));
+    }
+
+    @ApiOperation("警力情况-请休假-辅警列表")
+    @GetMapping("/qxj/fjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qxFjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qxFjlb(dto));
+    }
+
+    @ApiOperation("警力情况-请休假-辅警列表-第三方")
+    @GetMapping("other/qxj/fjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qxFjlbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qxFjlbOther(dto));
+    }
+
+    @ApiOperation("警力情况-请休假-民警辅警统计")
+    @GetMapping("/qxj/mjfjtj")
+    @JwtSysUser
+    public ResponseResult<List<Map<String,Object>>> mjfjtj(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.mjfjtj(dto));
+    }
+
+    @ApiOperation("警力情况-请休假-民警列表")
+    @GetMapping("/qxj/mjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qxjMjlb(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qxjMjlb(dto));
+    }
+
+    @ApiOperation("警力情况-请休假-民警列表-第三方")
+    @GetMapping("other/qxj/mjlb")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> qxjMjlbOther(TbQwMfjSearchDto dto) {
+        return ResponseResult.success(this.qwzxStatisticsService.qxjMjlbOther(dto));
+    }
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwBmjlbbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwBmjlbbController.java
new file mode 100644
index 0000000..204c975
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwBmjlbbController.java
@@ -0,0 +1,89 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwSearchJlqdDto;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbbJlmx;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbCountVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwSearchZgmfjDto;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbCountQuery;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbQuery;
+import com.mosty.base.model.vo.qwzx.Gzqk;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbVo;
+import com.mosty.qwzx.service.TbQwBmjlbbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 部门每日警力报备表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Api(tags = "部门每日警力报备接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbQwBmjlbb")
+public class TbQwBmjlbbController {
+
+    private TbQwBmjlbbService tbQwBmjlbbService;
+
+    @ApiOperation("大屏-查询在岗警力")
+    @GetMapping("/selectOnCop")
+    @JwtSysUser
+    @Log(title = "查询在岗警力", businessType = BusinessType.OTHER)
+    public ResponseResult<Gzqk> selectOnCop() {
+        return ResponseResult.success(tbQwBmjlbbService.selectOnCop());
+    }
+
+    @ApiOperation("计算今日部门警力报备情况")
+    @PostMapping("/setBmjlbbInfo")
+    @JwtSysUser
+    public ResponseResult<Void> setBmjlbbInfo(String time) {
+        tbQwBmjlbbService.setBmjlbbInfo(time);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询警力清单")
+    @JwtSysUser
+    @GetMapping("/getJlqdList")
+    public ResponseResult<List<Map<String, Object>>> getJlqdList(TbQwSearchJlqdDto dto) {
+        return ResponseResult.success(tbQwBmjlbbService.getJlqdList(dto));
+    }
+
+    @ApiOperation("查询警力清单,存入redis中")
+    @JwtSysUser
+    @GetMapping("/getJlqdListToRedis")
+    public ResponseResult<List<Map<String, Object>>> getJlqdListToRedis(TbQwSearchJlqdDto dto) {
+        return ResponseResult.success(tbQwBmjlbbService.getJlqdListToRedis(dto));
+    }
+
+    @ApiOperation("高新领导端--查询在岗警力数量")
+    @GetMapping("/getZgjlCount")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getZgjlCount() {
+        return ResponseResult.success(tbQwBmjlbbService.getZgjlCount());
+    }
+
+    @ApiOperation("值班统计")
+    @GetMapping("/countCdepTree")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> countCdepTree(String ssbmdm) {
+        return ResponseResult.success(tbQwBmjlbbService.countCdepTree(ssbmdm));
+    }
+
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwFaController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwFaController.java
new file mode 100644
index 0000000..b11ee99
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwFaController.java
@@ -0,0 +1,114 @@
+package com.mosty.qwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.qwzx.TbQwFa;
+import com.mosty.base.model.query.qwzx.TbQwFaQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.qwzx.service.TbQwFaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 巡防方案
+ */
+@Api(tags = "巡防方案")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbqwfa")
+public class TbQwFaController {
+
+    private final TbQwFaService tbQwFaService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防方案单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "方案ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbQwFa> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbQwFaService.queryById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param query 筛选条件
+     * @return 查询结果
+     */
+    @ApiOperation("巡防方案分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwFa>> paginQuery(TbQwFaQuery query) {
+        IPage<TbQwFa> page = tbQwFaService.paginQuery(query);
+        return ResponseResult.success(page);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("巡防方案新增")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡防方案新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbQwFa xf) {
+        return ResponseResult.success(tbQwFaService.insert(xf));
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param xf 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新巡防方案")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡防方案更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbQwFa xf) {
+        return ResponseResult.success(tbQwFaService.update(xf));
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡防方案删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbQwFaService.deleteById(id));
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("批量删除")
+    @PostMapping("/bacth")
+    @Log(title = "巡防方案删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestBody List<String> id) {
+        return ResponseResult.success(tbQwFaService.deleteByIds(id));
+    }
+}
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwJjrController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwJjrController.java
new file mode 100644
index 0000000..e47d1cd
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwJjrController.java
@@ -0,0 +1,80 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.dto.qwzx.TbQwQwbcEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwJjr;
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.mosty.base.model.query.qwzx.TbQwJjrQuery;
+import com.mosty.base.model.query.qwzx.TbQwQwbcQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.qwzx.service.TbQwJjrService;
+import com.mosty.qwzx.service.TbQwQwbcService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "节假日相关接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwJjr")
+public class TbQwJjrController {
+
+    private final TbQwJjrService tbQwJjrService;
+
+
+    @ApiOperation("新增节假日")
+    @JwtSysUser
+    @PostMapping("add")
+    @Log(title = "新增节假日", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> add(@RequestBody TbQwJjr jjr) {
+        this.tbQwJjrService.add(jjr);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改节假日")
+    @JwtSysUser
+    @PostMapping("update")
+    @Log(title = "修改节假日", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> update(@RequestBody TbQwJjr jjr) {
+        this.tbQwJjrService.update(jjr);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("批量删除节假日")
+    @JwtSysUser
+    @PostMapping("deleteBatch")
+    @Log(title = "批量删除节假日", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "ids", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteBatch(@RequestParam List<String> ids) {
+        tbQwJjrService.deleteBatch(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("单条删除节假日")
+    @JwtSysUser
+    @PostMapping("del/{id}")
+    @Log(title = "单条删除节假日", businessType = BusinessType.DELETE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@PathVariable("id") String id) {
+        tbQwJjrService.deleteByIds(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("分页查询节假日信息")
+    @JwtSysUser
+    @PostMapping("getPageList")
+    public ResponseResult<IPage<TbQwJjr>> getPageList(@RequestBody TbQwJjrQuery dto) {
+        return ResponseResult.success(tbQwJjrService.getPageList(dto));
+    }
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwbcController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwbcController.java
new file mode 100644
index 0000000..96d87c5
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwbcController.java
@@ -0,0 +1,96 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwQwbcEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.mosty.base.model.query.qwzx.TbQwQwbcQuery;
+import com.mosty.qwzx.service.TbQwQwbcService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务班次表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Api(tags = "勤务班次表接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwQwbc")
+public class TbQwQwbcController {
+
+    private TbQwQwbcService tbQwQwbcService;
+
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "勤务班次表单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbQwQwbc> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbQwQwbcService.selectById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwQwbc>> paginQuery(TbQwQwbcQuery tbQwQwbcQuery) {
+        IPage<TbQwQwbc> page = new Page<>(tbQwQwbcQuery.getPageCurrent(), tbQwQwbcQuery.getPageSize());
+        return ResponseResult.success(tbQwQwbcService.getQwbc(tbQwQwbcQuery, page));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "勤务班次表新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbQwQwbc qwbc) {
+        return ResponseResult.success(tbQwQwbcService.addQwbc(qwbc));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "勤务班次表更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbQwQwbcEditDto qwbc) {
+        return ResponseResult.success(tbQwQwbcService.editQwbc(qwbc));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "勤务班次表删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbQwQwbcService.deleteById(id));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "勤务班次表删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id) {
+        return ResponseResult.success(tbQwQwbcService.deleteBatch(id));
+    }
+
+    @ApiOperation("app查询班次信息")
+    @GetMapping("/getBcList")
+    @JwtSysUser
+    public ResponseResult<Page<TbQwQwbc>> getBcList(AppSearchQuery dto) {
+        return ResponseResult.success(tbQwQwbcService.getBcList(dto));
+    }
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwdjController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwdjController.java
new file mode 100644
index 0000000..cf014cb
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQwdjController.java
@@ -0,0 +1,106 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwQwdjDto;
+import com.mosty.base.model.dto.qwzx.TbQwQwdjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwdj;
+import com.mosty.base.model.query.qwzx.TbQwQwdjQuery;
+import com.mosty.qwzx.service.TbQwQwdjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务等级表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Api(tags = "勤务等级接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwQwdj")
+public class TbQwQwdjController {
+
+    private TbQwQwdjService tbQwQwdjService;
+
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "勤务等级单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbQwQwdj> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbQwQwdjService.selectById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwQwdj>> paginQuery(TbQwQwdjQuery dto) {
+        IPage<TbQwQwdj> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        return ResponseResult.success(tbQwQwdjService.getQwdj(dto, page));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "勤务等级新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbQwQwdj qwdj) {
+        return ResponseResult.success(tbQwQwdjService.addQwdj(qwdj));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "勤务等级更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbQwQwdjEditDto qwdj) {
+        return ResponseResult.success(tbQwQwdjService.editQwdj(qwdj));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "勤务等级删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbQwQwdjService.deleteById(id));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "勤务等级删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id) {
+        return ResponseResult.success(tbQwQwdjService.deleteBatch(id));
+    }
+
+    @ApiOperation("发布勤务等级")
+    @PostMapping("/publish")
+    @Log(title = "发布勤务等级", businessType = BusinessType.UPDATE)
+    public ResponseResult<Boolean> publishQwdj(@RequestBody TbQwQwdjDto dto) {
+        return ResponseResult.success(tbQwQwdjService.publishQwdj(dto.getId()));
+    }
+
+    @ApiOperation("查询当前勤务等级")
+    @JwtSysUser
+    @GetMapping("/currentQwdj")
+    @Log(title = "查询当前勤务等级", businessType = BusinessType.OTHER)
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "query", name = "dateTime", value = "dateTime", dataType = "String", required = true)})
+    public ResponseResult<TbQwQwdj> currentQwdj(String dateTime) {
+        return ResponseResult.success(tbQwQwdjService.queryCurrentQwdj(dateTime));
+    }
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQxjController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQxjController.java
new file mode 100644
index 0000000..319774a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwQxjController.java
@@ -0,0 +1,92 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.query.qwzx.TbQwQxjMyQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwQxjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQxj;
+import com.mosty.base.model.query.qwzx.TbQwQxjQuery;
+import com.mosty.qwzx.service.TbQwQxjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Api(tags = "请休假接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwQxj")
+public class TbQwQxjController {
+
+    private TbQwQxjService tbQwQxjService;
+
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "请休假单条数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbQwQxj> queryById(@PathVariable String id){
+        return ResponseResult.success(tbQwQxjService.selectById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwQxj>> paginQuery(TbQwQxjQuery tbQwQxjQuery){
+        IPage<TbQwQxj> page = new Page<>(tbQwQxjQuery.getPageCurrent(), tbQwQxjQuery.getPageSize());
+        return ResponseResult.success(tbQwQxjService.getQxj(tbQwQxjQuery, page));
+    }
+
+    @ApiOperation("APP查询我的请休假记录")
+    @JwtSysUser
+    @GetMapping("getMyQxjList")
+    public ResponseResult<IPage<TbQwQxj>> getMyQxjList(TbQwQxjMyQuery dto){
+        return ResponseResult.success(tbQwQxjService.getMyQxjList(dto));
+    }
+
+    @ApiOperation("请休假新增")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "请休假新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbQwQxj qxj){
+        return ResponseResult.success(tbQwQxjService.addQxj(qxj));
+    }
+
+    @ApiOperation("请休假更新")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "请休假更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbQwQxjEditDto qxj){
+        return ResponseResult.success(tbQwQxjService.editQxj(qxj));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "请休假删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id){
+        return ResponseResult.success(tbQwQxjService.deleteById(id));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "请休假删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id){
+        return ResponseResult.success(tbQwQxjService.deleteBatch(id));
+    }
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwSpsCsdwController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwSpsCsdwController.java
new file mode 100644
index 0000000..fddf549
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwSpsCsdwController.java
@@ -0,0 +1,58 @@
+package com.mosty.qwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwSpsHdgjChangeDto;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaUpdateDto;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdw;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.base.model.query.qwzx.TbQwSpsCsdwQuery;
+import com.mosty.base.model.query.spxl.TbSpxlSpxlfaQuery;
+import com.mosty.base.model.vo.qwzx.TbQwSpsCsdwVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.qwzx.service.TbQwSpsCsdwService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Api(tags = "世乒赛参赛队伍相关接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbQwSpsCsdw")
+public class TbQwSpsCsdwController {
+
+    @Resource
+    private TbQwSpsCsdwService tbQwSpsCsdwService;
+
+    @ApiOperation("根据条件查询所有的参赛队伍")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<Object> getList(TbQwSpsCsdwQuery dto) {
+        return ResponseResult.success(this.tbQwSpsCsdwService.getList(dto));
+    }
+
+    @ApiOperation("查询某一个队伍的当前的状态")
+    @JwtSysUser
+    @GetMapping("getCsdwInfo/{id}")
+    public ResponseResult<TbQwSpsCsdwVo> getCsdwInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbQwSpsCsdwService.getCsdwInfo(id));
+    }
+
+    @ApiOperation("参赛队伍活动轨迹变更")
+    @JwtSysUser
+    @PostMapping("changeHdgj")
+    public ResponseResult<Void> changeHdgj(@RequestBody TbQwSpsHdgjChangeDto dto) {
+        this.tbQwSpsCsdwService.changeHdgj(dto);
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfBxfsqController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfBxfsqController.java
new file mode 100644
index 0000000..6f60b7b
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfBxfsqController.java
@@ -0,0 +1,90 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwBxfsqEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.mosty.base.model.query.qwzx.TbQwXfBxfsqQuery;
+import com.mosty.qwzx.service.TbQwXfBxfsqService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "不巡防申请接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwXfBxfsq")
+public class TbQwXfBxfsqController {
+
+    private TbQwXfBxfsqService tbQwXfBxfsqService;
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "不巡防申请数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbQwXfBxfsq> queryById(@PathVariable String id){
+        return ResponseResult.success(tbQwXfBxfsqService.selectById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwXfBxfsq>> paginQuery(TbQwXfBxfsqQuery dto){
+        IPage<TbQwXfBxfsq> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        return ResponseResult.success(tbQwXfBxfsqService.getBxfsq(dto, page));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "不巡防申请新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbQwXfBxfsq bxfsq){
+        return ResponseResult.success(tbQwXfBxfsqService.addBxfsq(bxfsq));
+    }
+
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "不巡防申请更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbQwXfBxfsq dto){
+        return ResponseResult.success(tbQwXfBxfsqService.editBxfsq(dto));
+    }
+
+
+    @ApiOperation("审批不巡防申请")
+    @JwtSysUser
+    @PutMapping("judge")
+    @Log(title = "审批不巡防申请", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> judge(@RequestBody TbQwBxfsqEditDto dto){
+        return ResponseResult.success(tbQwXfBxfsqService.judge(dto));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "不巡防申请删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id){
+        return ResponseResult.success(tbQwXfBxfsqService.deleteById(id));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "不巡防申请删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id){
+        return ResponseResult.success(tbQwXfBxfsqService.deleteBatch(id));
+    }
+
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java
new file mode 100644
index 0000000..5bff7c3
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java
@@ -0,0 +1,348 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.*;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.qwzx.TbQwxfbbDk;
+import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
+import com.mosty.base.model.query.sjzx.XfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbTjQuery;
+import com.mosty.base.model.query.sjzx.XftjQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
+import com.mosty.qwzx.service.TbQwXfbbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ * 巡防报备表 前端控制器
+ */
+@Api(tags = "巡防报备接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwXfbb")
+public class TbQwXfbbController {
+
+    @Resource
+    private TbQwXfbbService tbQwXfbbService;
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "巡防报备数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbQwXfbbVo> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbQwXfbbService.selectById(id));
+    }
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("getBbxxInfo")
+    public ResponseResult<TbQwXfbb> getBbxxInfo(String id) {
+        return ResponseResult.success(tbQwXfbbService.getBbxxInfo(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwXfbbVo>> paginQuery(TbQwXfbbQuery tbQwXfbbQuery) {
+        return ResponseResult.success(tbQwXfbbService.queryPage(tbQwXfbbQuery));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡防报备新增", businessType = BusinessType.INSERT)
+    public ResponseResult<String> add(@RequestBody TbQwXfbbVo xfbb) {
+        return ResponseResult.success(tbQwXfbbService.addXfbb(xfbb));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("{id}")
+    @Log(title = "巡防报备删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbQwXfbbService.deleteById(id));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "巡防报备删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "id", value = "标签主键", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> id) {
+        return ResponseResult.success(tbQwXfbbService.deleteBatch(id));
+    }
+
+    @ApiOperation("查询街面巡组,力量,时长,里程")
+    @GetMapping("/selectDeck")
+    @JwtSysUser
+    public ResponseResult<Map<String, Integer>> selectDeck() {
+        return ResponseResult.success(tbQwXfbbService.selectDeck());
+    }
+
+    @ApiOperation("大屏-计划街面巡组列表-分页")
+    @GetMapping("/selectJhjmxzList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwXfpbZq>> selectJhjmxzList(TbQwXzSearchDto dto) {
+        return ResponseResult.success(tbQwXfbbService.selectJhjmxzList(dto));
+    }
+
+    @ApiOperation("大屏-实际街面巡组列表-分页")
+    @GetMapping("/selectSjjmxzList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwXfbb>> selectSjjmxzList(TbQwXzSearchDto dto) {
+        return ResponseResult.success(tbQwXfbbService.selectSjjmxzList(dto));
+    }
+
+    @ApiOperation("大屏-街面力量-分页")
+    @GetMapping("/selectJmllList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwJl>> selectJmllList(TbQwJmllSearchDto dto) {
+        return ResponseResult.success(tbQwXfbbService.selectJmllList(dto));
+    }
+
+    @ApiOperation("大屏-查询街面巡组列表,附近警组")
+    @GetMapping("/selectDeckList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwXfbb>> selectDeckList(TbQwXfbbJmxzQuery dto) {
+        return ResponseResult.success(tbQwXfbbService.selectDeckList(dto));
+    }
+
+    @ApiOperation("查询巡组信息第三方")
+    @GetMapping("/other/selectDeckList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwXfbb>> selectDeckListOther(TbQwXfbbJmxzQuery dto) {
+        return ResponseResult.success(tbQwXfbbService.selectDeckListOther(dto));
+    }
+
+    @ApiOperation("查询街面巡组")
+    @GetMapping("/selectJmxz")
+    @JwtSysUser
+    public ResponseResult<IPage<TbQwXfbb>> selectJmxz(TbQwJmxzSearchDto dto) {
+        return ResponseResult.success(tbQwXfbbService.selectJmxz(dto));
+    }
+
+    @ApiOperation("大屏-巡组气泡-查询周边巡组")
+    @PostMapping("/selectNearbyDeck")
+    @Log(title = "大屏-巡组气泡-查询周边巡组", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbQwXfbb>> selectNearbyDeck(@RequestBody TbQwXfbb tbQwXfbb) {
+        return ResponseResult.success(tbQwXfbbService.selectNearbyDeck(tbQwXfbb));
+    }
+
+    @ApiOperation("开始、结束报备")
+    @PostMapping("/startOrEndBb")
+    @JwtSysUser
+    @Log(title = "开始、结束报备", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> startOrEndBb(@RequestBody TbQwXfbbStartOrEndBbDto dto) {
+        return ResponseResult.success(tbQwXfbbService.startOrEndBb(dto));
+    }
+
+    @ApiOperation("查询我今天的报备new")
+    @GetMapping("/getMybbTodayNew")
+    @JwtSysUser
+    public ResponseResult<TbQwXfbb> getMybbTodayNew(String bblx) {
+        return ResponseResult.success(tbQwXfbbService.getMybbTodayNew(bblx));
+    }
+
+    @ApiOperation("判断派出所、巡防区范围内是否有巡组")
+    @GetMapping("/getFjbbByYsId")
+    @JwtSysUser
+    public ResponseResult<List<TbQwXfbb>> getFjbbByYsId(String ysid) {
+        return ResponseResult.success(tbQwXfbbService.getFjbbByYsId(ysid));
+    }
+
+    @ApiOperation("根据身份证号获取最后一次报备的数据 进行显示")
+    @GetMapping("/getMybbLastBySfzh")
+    @JwtSysUser
+    public ResponseResult<TbQwXfbb> getMybbLastBySfzh(String sfzh) {
+        return ResponseResult.success(tbQwXfbbService.getMybbLastBySfzh(sfzh));
+    }
+
+    @ApiOperation("自动结束报备")
+    @GetMapping("/authJsbb")
+    @JwtSysUser
+    public ResponseResult<Void> authJsbb() {
+        tbQwXfbbService.authJsbb();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据报备ID查询巡组下的人员列表")
+    @GetMapping("/getJlxxByBbid/{id}")
+    public ResponseResult<List<TbQwJlDto>> getJlxxByBbid(@PathVariable("id") String id) {
+        return ResponseResult.success(tbQwXfbbService.getJlxxByBbid(id));
+    }
+
+
+    @ApiOperation("查询范围内的最近的巡组信息")
+    @PostMapping("/getBbxxByJi")
+    public ResponseResult<TbQwXfbb> getBbxxByJi(@RequestBody TbQwXfbbQueryByJlDto dto) {
+        return ResponseResult.success(tbQwXfbbService.getBbxxByJi(dto));
+    }
+
+    @ApiOperation("app查询界面警力民警辅警数量")
+    @GetMapping("/selectMfjCount")
+    @JwtSysUser
+    @ApiImplicitParam(name = "bbrq", value = "查询日期", required = true, dataType = "String")
+    public ResponseResult<Map<String, Object>> selectMfjCount(String bbrq) {
+        return ResponseResult.success(tbQwXfbbService.selectMfjCount(bbrq));
+    }
+
+    @ApiOperation("根据设备ID查询该设备所在的巡组")
+    @PostMapping("/getBbList/{sbid}")
+    @JwtSysUser
+    @ApiImplicitParam(name = "sbid", value = "设备ID", required = true, dataType = "String")
+    public ResponseResult<List<TbQwXfbb>> getBbList(@PathVariable("sbid") String sbid) {
+        return ResponseResult.success(tbQwXfbbService.getBbList(sbid));
+    }
+
+    @ApiOperation("根据设备ID查询该设备所在的巡组")
+    @PostMapping("/getClBbList/{gpsId}")
+    @JwtSysUser
+    @ApiImplicitParam(name = "pgsId", value = "车辆gpsiID", required = true, dataType = "String")
+    public ResponseResult<List<TbQwXfbb>> getClBbList(@PathVariable("gpsId") String gpsId) {
+        return ResponseResult.success(tbQwXfbbService.getClBbList(gpsId));
+    }
+
+    @ApiOperation("新增巡防报备打卡")
+    @PostMapping("/addXfbbDk")
+    @JwtSysUser
+    @Log(title = "新增巡防报备打卡", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> addXfbbDk(@RequestBody TbQwXfbbDkDto dto) {
+        tbQwXfbbService.addXfbbDk(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("判断当前位置是否再报备的巡防区内")
+    @PostMapping("/isDdWz")
+    @JwtSysUser
+    public ResponseResult<Boolean> isDdWz(@RequestBody TbQwXfbbDkWzDto dto) {
+        return ResponseResult.success(tbQwXfbbService.isDdWz(dto));
+    }
+
+    @ApiOperation("高新领导段-查询街面警力数量")
+    @PostMapping("/getJmjlCount")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getJmjlCount() {
+        return ResponseResult.success(tbQwXfbbService.getJmjlCount());
+    }
+
+    // 泸州态势统计-各区县巡防时长和里程
+    @ApiOperation("泸州态势统计-各区县巡防时长和里程")
+    @PostMapping("/getXfscAndLc")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getXfscAndLcTj(XfbbQuery dto) {
+        return ResponseResult.success(tbQwXfbbService.getXfscAndLc(dto));
+    }
+
+    // 查询部门的报备的数量
+    @ApiOperation("查询部门的报备的数量")
+    @PostMapping("/getBbCount")
+    @JwtSysUser
+    public ResponseResult<Integer> getBbCount(@RequestParam("ssbmdm") String ssbmdm,
+                                              @RequestParam("time") String time) {
+        return ResponseResult.success(tbQwXfbbService.getBbCount(ssbmdm, time));
+    }
+
+    // 查询部门时长、里程
+    @ApiOperation("查询部门时长、里程")
+    @PostMapping("/getScLc")
+    @JwtSysUser
+    public ResponseResult<Map<String, Integer>> getScLc(@RequestParam("ssbmdm") String ssbmdm,
+                                                        @RequestParam("time") String time) {
+        return ResponseResult.success(tbQwXfbbService.getScLc(ssbmdm, time));
+    }
+
+    // 查询部门的报备的数量
+    @ApiOperation("修改巡逻状态数据")
+    @PostMapping("/updateXfzt")
+    @JwtSysUser
+    @Log(title = "修改巡逻状态数据", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> updateXfzt() {
+        tbQwXfbbService.updateXfzt();
+        return ResponseResult.success();
+    }
+
+    // 大屏巡防报备统计
+    @ApiOperation("大屏巡防报备统计")
+    @PostMapping("/xfbbTj")
+    @JwtSysUser
+    public ResponseResult<Map<String, Integer>> xfbbTj() {
+        return ResponseResult.success(tbQwXfbbService.xfbbTj());
+    }
+
+    // 部门统计
+    @ApiOperation("部门统计")
+    @PostMapping("/bmtj")
+    @JwtSysUser
+    @Log(title = "部门统计", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<Object>> bmtj(@RequestBody XfbbTjQuery query) {
+        return ResponseResult.success(tbQwXfbbService.bmtj(query));
+    }
+
+    @ApiOperation("部门统计All")
+    @PostMapping("/bmtjAll")
+    @JwtSysUser
+    @Log(title = "部门统计All", businessType = BusinessType.OTHER)
+    public ResponseResult<Object> bmtjAll(@RequestBody XfbbTjQuery query) {
+        return ResponseResult.success(tbQwXfbbService.bmtjAll(query));
+    }
+
+    @ApiOperation("巡区统计")
+    @PostMapping("/xqtj")
+    @JwtSysUser
+    @Log(title = "巡区统计", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<Object>> xqtj(@RequestBody XfbbTjQuery query) {
+        return ResponseResult.success(tbQwXfbbService.xqtj(query));
+    }
+
+
+    @ApiOperation("个人统计")
+    @PostMapping("/grtj")
+    @JwtSysUser
+    @Log(title = "个人统计", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<Object>> grtj(@RequestBody XfbbTjQuery query) {
+        return ResponseResult.success(tbQwXfbbService.grtj(query));
+    }
+
+
+    @ApiOperation("根据巡区获取报备id")
+    @GetMapping("/getBbidByXq")
+    @JwtSysUser
+    public ResponseResult<List<TbQwXfbb>> getBbidByXq(String xqid) {
+        return ResponseResult.success(tbQwXfbbService.getBbidByXq(xqid));
+    }
+
+    @ApiOperation("删除reidsxfwz")
+    @GetMapping("/delRedisXfwz")
+    @JwtSysUser
+    public ResponseResult<Void> delRedisXfwz() {
+        tbQwXfbbService.delRedisXfwz();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("更新巡防里程")
+    @GetMapping("/updateXflc")
+    @JwtSysUser
+    public ResponseResult<Integer> updateXflc(String bbid) {
+        return ResponseResult.success(tbQwXfbbService.updateXflc(bbid));
+    }
+
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfpbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfpbController.java
new file mode 100644
index 0000000..51ee869
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfpbController.java
@@ -0,0 +1,158 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbZqDto;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbAddAndEditDto;
+import com.mosty.base.model.dto.qwzx.TbQwXzSearchDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.query.qwzx.TbQwXfpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfpbSearchMyQuery;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqVo;
+import com.mosty.qwzx.service.TbQwXfpbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Api(tags = "巡防排班接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwXfpb")
+public class TbQwXfpbController {
+
+    private TbQwXfpbService tbQwXfpbService;
+
+    @ApiOperation("巡防排班新增")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "巡防排班新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbQwXfpbAddAndEditDto dto) {
+        return ResponseResult.success(this.tbQwXfpbService.addEntity(dto));
+    }
+
+    @ApiOperation("巡防排班修改")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "巡防排班修改", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> editEntity(@RequestBody TbQwXfpbAddAndEditDto dto) {
+        return ResponseResult.success(this.tbQwXfpbService.editEntity(dto));
+    }
+
+    @ApiOperation("删除单条巡防排班")
+    @JwtSysUser
+    @DeleteMapping("{id}")
+    @Log(title = "删除单条巡防排班", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> delEntity(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbQwXfpbService.delEntity(id));
+    }
+
+    @ApiOperation("批量删除巡防排班")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "批量删除巡防排班", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> delBatch(@RequestBody List<String> ids) {
+        this.tbQwXfpbService.delBatch(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("分页查询巡防排班")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwXfpbAddAndEditDto>> getPageList(TbQwXfpbQuery dto) {
+        return ResponseResult.success(this.tbQwXfpbService.getPageList(dto));
+    }
+
+    @ApiOperation("查询巡防排班详细信息")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbQwXfpbAddAndEditDto> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbQwXfpbService.getInfo(id));
+    }
+
+    @ApiOperation("分页查询我的巡防排班")
+    @JwtSysUser
+    @GetMapping("getMyXfpb")
+    public ResponseResult<IPage<TbQwXfpbAddAndEditDto>> getMyXfpb(TbQwXfpbSearchMyQuery dto) {
+        return ResponseResult.success(this.tbQwXfpbService.getMyXfpb(dto));
+    }
+
+    @ApiOperation("APP获取我的排班信息")
+    @JwtSysUser
+    @GetMapping("getMyXfpbToday")
+    public ResponseResult<TbQwXfpbZqMyVo> getMyXfpbToday() {
+        return ResponseResult.success(this.tbQwXfpbService.getMyXfpbToday());
+    }
+
+    @ApiOperation("查询本月的巡防排班信息")
+    @JwtSysUser
+    @GetMapping("getThisMonthPbList")
+    public ResponseResult<IPage<TbQwXfpbZqVo>> getThisMonthPbList(TbQwXzSearchDto dto) {
+        return ResponseResult.success(this.tbQwXfpbService.getThisMonthPbList(dto));
+    }
+
+    @ApiOperation("查询当前时间的巡防排班情况，发送消息提醒报备（定时任务）")
+    @JwtSysUser
+    @GetMapping("checkThisTimeXfpb")
+    public ResponseResult<IPage<TbQwXfpbZqVo>> checkThisTimeXfpb() {
+        this.tbQwXfpbService.checkThisTimeXfpb();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据周期Id查询排班信息")
+    @JwtSysUser
+    @GetMapping("getPbZq")
+    public ResponseResult<TbQwXfpbZqMyVo> getPbZq(String id, String time) {
+        return ResponseResult.success(this.tbQwXfpbService.getPbZq(id, time));
+    }
+
+    @ApiOperation("每月一日添加本月的每日警力（定时任务）")
+    @JwtSysUser
+    @GetMapping("addMrjl")
+    public ResponseResult<Void> addMrjl() {
+        this.tbQwXfpbService.addMrjl();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据时间查询月份排班、报备情况")
+    @JwtSysUser
+    @GetMapping("getPbbbByMonth")
+    public ResponseResult<List<Map<String, Object>>> getPbbbByMonth(String time) {
+        return ResponseResult.success(this.tbQwXfpbService.getPbbbByMonth(time));
+    }
+
+    @ApiOperation("根据时间部门月份巡防排班、巡防报备情况")
+    @JwtSysUser
+    @GetMapping("getXfbbByMonth")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "time", value = "月份yyyy-MM", required = true, dataType = "String")
+    })
+    public ResponseResult<List<Map<String, Object>>> getXfbbByMonth(String time) {
+        return ResponseResult.success(this.tbQwXfpbService.getXfbbByMonth(time));
+    }
+
+
+    @ApiOperation("根据时间查询部门月份排班、报备情况")
+    @JwtSysUser
+    @GetMapping("getPbbbByMonthBm")
+    public ResponseResult<List<Map<String, Object>>> getPbbbByMonthBm(String time,String ssbmdm) {
+        return ResponseResult.success(this.tbQwXfpbService.getPbbbByMonthBm(time, ssbmdm));
+    }
+
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbbbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbbbController.java
new file mode 100644
index 0000000..6b5a049
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbbbController.java
@@ -0,0 +1,123 @@
+package com.mosty.qwzx.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbStartOrEndBbDto;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbZqDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.qwzx.TbQwZbbb;
+import com.mosty.base.model.query.qwzx.TbQwZbbbQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbbbVo;
+import com.mosty.qwzx.service.TbQwZbbbService;
+import io.swagger.annotations.*;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-09
+ */
+@Api(tags = "值班报备接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbQwZbbb")
+public class TbQwZbbbController {
+
+    public static final String 根据时间部门查询警力情况 = "根据时间部门查询警力情况";
+    private final TbQwZbbbService tbQwZbbbService;
+
+    @ApiOperation("值班报备新增")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "值班报备新增", businessType = BusinessType.INSERT)
+    public ResponseResult<String> add(@RequestBody TbQwZbbbVo zb) {
+        return ResponseResult.success(tbQwZbbbService.addQwzb(zb));
+    }
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "值班数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "报备ID", paramType = "path", required = true, dataType = "String")
+    public ResponseResult<TbQwZbbbVo> queryById(@PathVariable String id) {
+        return ResponseResult.success(tbQwZbbbService.selectById(id));
+    }
+
+    @ApiOperation("分页查询值班报备列表")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwZbbbVo>> paginQuery(TbQwZbbbQuery dto) {
+        return ResponseResult.success(tbQwZbbbService.queryPage(dto));
+    }
+
+    @ApiOperation("值班报备批量删除")
+    @DeleteMapping("/batch")
+    @JwtSysUser
+    @Log(title = "值班报备批量删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Boolean> deleteByIds(@RequestParam List<String> ids) {
+        return ResponseResult.success(tbQwZbbbService.deleteBatch(ids));
+    }
+
+    @ApiOperation("APP获取我当前的报备信息")
+    @GetMapping("/getMyBbInfoToday")
+    @JwtSysUser
+    public ResponseResult<TbQwZbbb> getMyBbInfoToday() {
+        return ResponseResult.success(tbQwZbbbService.getMyBbInfoToday());
+    }
+
+    @ApiOperation("开始、结束报备")
+    @PostMapping("/startOrEndBb")
+    @JwtSysUser
+    @Log(title = "开始、结束报备", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> startOrEndBb(@RequestBody TbQwXfbbStartOrEndBbDto dto) {
+        return ResponseResult.success(this.tbQwZbbbService.startOrEndBb(dto));
+    }
+
+    @ApiOperation("自动结束报备")
+    @GetMapping("/authJsbb")
+    @JwtSysUser
+    public ResponseResult<Void> authJsbb() {
+        this.tbQwZbbbService.authJsbb();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("APP根据时间统计报备数量")
+    @PostMapping("/getBbCountByDept")
+    @JwtSysUser
+    @ApiImplicitParam(name = "time", value = "查询日期", required = true, dataType = "String")
+    public ResponseResult<Map<String,Object>> getBbCountByDept(String time) {
+        return ResponseResult.success(this.tbQwZbbbService.getBbCountByDept(time));
+    }
+
+    @ApiOperation("APP根据时间统计报备列表")
+    @PostMapping("/getBbListByDept")
+    @JwtSysUser
+    @ApiImplicitParam(name = "time", value = "查询日期", required = true, dataType = "String")
+    public ResponseResult<List<Map<String,Object>>> getBbListByDept(String time) {
+        return ResponseResult.success(this.tbQwZbbbService.getBbListByDept(time));
+    }
+
+    @ApiOperation("查询值班领导")
+    @PostMapping("/getZbld")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getZbld() {
+        return ResponseResult.success(this.tbQwZbbbService.getZbld());
+    }
+
+
+    @ApiOperation("根据时间部门查询警力情况")
+    @GetMapping("getJlByBm")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getJlByBm(String time, String ssbmdm) {
+        return ResponseResult.success(this.tbQwZbbbService.getJlByBm(time,ssbmdm));
+    }
+
+}
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbpbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbpbController.java
new file mode 100644
index 0000000..6c85646
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwZbpbController.java
@@ -0,0 +1,146 @@
+package com.mosty.qwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbZqDto;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo;
+import com.mosty.base.model.vo.qwzx.TbQwZbpbZqMyVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbInsertOrUpdateDto;
+import com.mosty.base.model.query.qwzx.TbQwZbpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwZbpbSearchMyQuery;
+import com.mosty.qwzx.service.TbQwZbpbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Api(tags = "值班排班相关接口（新）")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbQwZbpb")
+public class TbQwZbpbController {
+
+    @Resource
+    private TbQwZbpbService tbQwZbpbService;
+
+    @ApiOperation("新增值班排班信息")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增值班排班信息", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbQwZbpbInsertOrUpdateDto dto) {
+        return ResponseResult.success(this.tbQwZbpbService.addEntity(dto));
+    }
+
+    @ApiOperation("修改值班排班信息")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改值班排班信息", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> updateEntity(@RequestBody TbQwZbpbInsertOrUpdateDto dto) {
+        return ResponseResult.success(this.tbQwZbpbService.updateEntity(dto));
+    }
+
+    @ApiOperation("批量删除值班排班信息")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除值班排班信息", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteBatch(@RequestBody List<String> ids) {
+        this.tbQwZbpbService.deleteBatch(ids);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("删除单条值班排班信息")
+    @JwtSysUser
+    @DeleteMapping("{id}")
+    @Log(title = "删除单条值班排班信息", businessType = BusinessType.DELETE)
+    public ResponseResult<Void> deleteEntity(@PathVariable("id") String id) {
+        this.tbQwZbpbService.deleteEntity(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询值班排班列表信息--分页")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbQwZbpbInsertOrUpdateDto>> selectPage(TbQwZbpbQuery dto) {
+        return ResponseResult.success(this.tbQwZbpbService.selectPage(dto));
+    }
+
+    @ApiOperation("查询值班排班详情信息")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbQwZbpbInsertOrUpdateDto> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbQwZbpbService.getInfo(id));
+    }
+
+    @ApiOperation("分页查询我的值班排班")
+    @JwtSysUser
+    @GetMapping("getMyZbpb")
+    public ResponseResult<IPage<TbQwZbpbInsertOrUpdateDto>> getMyZbpb(TbQwZbpbSearchMyQuery dto) {
+        return ResponseResult.success(this.tbQwZbpbService.getMyZbpb(dto));
+    }
+
+    @ApiOperation("查询当前时间的值班排班情况，发送定时任务(定时任务)")
+    @JwtSysUser
+    @GetMapping("checkThisTimeZbpb")
+    public ResponseResult<Void> checkThisTimeZbpb() {
+        this.tbQwZbpbService.checkThisTimeZbpb();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("APP获取我的值班排班信息")
+    @JwtSysUser
+    @GetMapping("getMyZbpbToday")
+    public ResponseResult<TbQwZbpbZqMyVo> getMyZbpbToday() {
+        return ResponseResult.success(this.tbQwZbpbService.getMyZbpbToday());
+    }
+
+    @ApiOperation("根据周期ID查询周期详细信息")
+    @GetMapping("/getZbpbZqInfo/{id}")
+    public ResponseResult<TbQwZbpbZqDto> getZbpbZqInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbQwZbpbService.getZbpbZqInfo(id));
+    }
+
+    @ApiOperation("根据月份导出值班排班表情况")
+    @JwtSysUser
+    @GetMapping("exportData")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "time", value = "月份yyyy-MM", required = true, dataType="String"),
+            @ApiImplicitParam(name = "pbid", value = "排班ID", required = true, dataType="String")
+    })
+    public ResponseResult<List<Map<String,Object>>> exportData(String time,String pbid) {
+        return ResponseResult.success(this.tbQwZbpbService.exportData(time,pbid));
+    }
+
+    @ApiOperation("查询部门月排班情况")
+    @JwtSysUser
+    @GetMapping("getDeptByMonth")
+    @ApiImplicitParams({
+       @ApiImplicitParam(name = "time", value = "月份yyyy-MM", required = true, dataType="String")
+    })
+    public ResponseResult<List<Map<String,Object>>> getDeptByMonth(String time) {
+        return ResponseResult.success(this.tbQwZbpbService.getDeptByMonth(time));
+    }
+
+    @ApiOperation("根据时间查询部门值班排班、值班报备情况")
+    @JwtSysUser
+    @GetMapping("getZbbbByMonth")
+    @ApiImplicitParams({
+       @ApiImplicitParam(name = "time", value = "月份yyyy-MM", required = true, dataType="String")
+    })
+    public ResponseResult<List<Map<String, Object>>> getZbbbByMonth(String time) {
+        return ResponseResult.success(this.tbQwZbpbService.getZbbbByMonth(time));
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxQwlbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxQwlbMapper.java
new file mode 100644
index 0000000..5b1c1cb
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxQwlbMapper.java
@@ -0,0 +1,20 @@
+package com.mosty.qwzx.mapper;
+
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface QwzxQwlbMapper {
+
+    @ApiOperation("不在岗警力清单")
+    List<Map<String, Object>> qxjMjlb(Map<String, Object> map);
+
+    @ApiOperation("街面巡组")
+    List<Map<String, Object>> jmxz(Map<String, Object> map);
+
+    @ApiOperation("街面巡组count")
+    int jmxzCount(Map<String, Object> map);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxStatisticsMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxStatisticsMapper.java
new file mode 100644
index 0000000..f886af9
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/QwzxStatisticsMapper.java
@@ -0,0 +1,133 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface QwzxStatisticsMapper {
+
+    @ApiOperation("查询辅警数量")
+    int getQbfjCount(Map<String, Object> map);
+
+    @ApiOperation("查询辅警列表")
+    List<Map<String, Object>> getQbfjList(Map<String, Object> map);
+
+    @ApiOperation("查询全部列表")
+    List<Map<String, Object>> qblb(Map<String, Object> map);
+
+    @ApiOperation("查询全部列表计数")
+    int getQblbCount(Map<String, Object> map);
+
+    @ApiOperation("全部在岗统计")
+    List<Map<String, Object>> qbzgtj(Map<String, Object> map);
+
+    @ApiOperation("全部在岗统计计数")
+    int getQbzgtjCount(Map<String, Object> map);
+
+    @ApiOperation("在岗辅警数量")
+    int getZgfjCount(Map<String, Object> map);
+
+    @ApiOperation("在岗辅警列表")
+    List<Map<String, Object>> getZgfjList(Map<String, Object> map);
+
+    @ApiOperation("在岗列表")
+    List<Map<String, Object>> zglb(Map<String, Object> map);
+
+    @ApiOperation("在岗列表统计")
+    int getZglbCount(Map<String, Object> map);
+
+    @ApiOperation("辅警列表")
+    List<Map<String, Object>> fjlb(Map<String, Object> map);
+
+    @ApiOperation("辅警列表计数")
+    int getFjlbCount(Map<String, Object> map);
+
+    @ApiOperation("民警列表")
+    List<Map<String, Object>> mjlb(Map<String, Object> map);
+
+    @ApiOperation("民警列表计数")
+    int getMjlbCount(Map<String, Object> map);
+
+    @ApiOperation("全部民警和辅警数量")
+    int getQbCount(Map<String, Object> map);
+
+    @ApiOperation("全部民警和辅警列表")
+    List<Map<String, Object>> qbList(Map<String, Object> map);
+
+    @ApiOperation("在岗民警辅警数量")
+    int getZgCount(Map<String, Object> map);
+
+    @ApiOperation("在岗民警辅警列表")
+    List<Map<String, Object>> zgList(Map<String, Object> map);
+
+    @ApiOperation("可抽调辅警列表")
+    List<Map<String, Object>> kcdFjlb(Map<String, Object> map);
+
+    @ApiOperation("可抽调辅警列表计数")
+    int getKcdFjlbCount(Map<String, Object> map);
+
+    @ApiOperation("可抽调民警辅警数量")
+    List<Map<String,Object>> getZbtjCount(Map<String, Object> map);
+
+    @ApiOperation("可抽调民警列表")
+    List<Map<String, Object>> kcdMjList(Map<String, Object> map);
+
+    @ApiOperation("民警辅警整合列表")
+    List<Map<String, Object>> mjfjzh(Map<String, Object> map);
+
+    @ApiOperation("全部列表")
+    List<Map<String, Object>> mjQblb(Map<String, Object> map);
+
+    @ApiOperation("全部民警")
+    Integer getQbmjCount(Map<String, Object> map);
+
+    @ApiOperation("全部民警列表")
+    List<Map<String, Object>> qbmjList(Map<String, Object> map);
+
+    @ApiOperation("全部在岗统计")
+    int getQbzgCount(Map<String, Object> map);
+
+    @ApiOperation("民警-在岗列表")
+    List<Map<String, Object>> mjZglb(Map<String, Object> map);
+
+    @ApiOperation("民警-在岗列表")
+    int getmMjzglbCount(Map<String, Object> map);
+
+    @ApiOperation("在岗民警")
+    int getZgmj(Map<String, Object> map);
+
+    @ApiOperation("在岗民警辅警整合")
+    List<Map<String, Object>> zgmjfjzh(Map<String, Object> map);
+
+    @ApiOperation("在岗民警列表")
+    List<Map<String, Object>> zgmjList(Map<String, Object> map);
+
+    @ApiOperation("请休假-辅警列表")
+    List<Map<String, Object>> qxFjlb(Map<String, Object> map);
+
+    @ApiOperation("请休假-民警辅警统计")
+    List<Map<String,Object>> mjfjtj(Map<String, Object> map);
+
+    @ApiOperation("警力情况-请休假-民警列表")
+    List<Map<String, Object>> qxjMjlb(Map<String, Object> map);
+
+    @ApiOperation("可抽调民警列表")
+    int kcdMjCount(Map<String, Object> map);
+
+    @ApiOperation("民警数量")
+    int mjQblbCount(Map<String, Object> map);
+
+    @ApiOperation("民警辅警整合count")
+    int mjfjzhCount(Map<String, Object> map);
+
+    @ApiOperation("请休假-民警列表")
+    int qxjMjlbCount(Map<String, Object> map);
+
+    @ApiOperation("请休假-辅警列表")
+    int qxFjlbCount(Map<String, Object> map);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbJlmxMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbJlmxMapper.java
new file mode 100644
index 0000000..413f024
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbJlmxMapper.java
@@ -0,0 +1,28 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbbJlmx;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 部门每日警力报备-警力明细 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwBmjlbbJlmxMapper extends BaseMapper<TbQwBmjlbbJlmx> {
+
+    @ApiOperation("删除部门每日警力报备-警力明细")
+    int deleteJlmx(@Param("list") List<String> list);
+
+    @ApiOperation("根据警组ID删除")
+    void deleteByJlbbId(@Param("jlbbId") String jlbbId);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbMapper.java
new file mode 100644
index 0000000..2272ed3
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwBmjlbbMapper.java
@@ -0,0 +1,29 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwBmjlbbCountDto;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbb;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbCountQuery;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbQuery;
+import com.mosty.base.model.vo.qwzx.Gzqk;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbCountVo;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwBmjlbbMapper extends BaseMapper<TbQwBmjlbb> {
+
+    @ApiOperation("警力报备统计")
+    TbQwBmjlbbCountVo jlbbCount(@Param("params") TbQwBmjlbbCountQuery bbjlQuery);
+
+    Gzqk selectOnCop(@Param("ssbmdm") String ssbmdm);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwClMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwClMapper.java
new file mode 100644
index 0000000..015b308
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwClMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwCl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-车辆表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwClMapper extends BaseMapper<TbQwCl> {
+
+    /**
+     * 删除车辆
+     * @param list
+     */
+    int deleteCl(@Param("list") List<String> list);
+
+    /**
+     * 根据业务ID删除
+     * @param ywid
+     */
+    void deleteByYwid(@Param("ywid") String ywid);
+
+    /**
+     * 根据 业务ID查询
+     * @param ywidList
+     * @return
+     */
+    List<TbQwCl> queryListByYwid(@Param("list") List<String> ywidList);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwFaMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwFaMapper.java
new file mode 100644
index 0000000..43f996a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwFaMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwFa;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbQwFaMapper  extends BaseMapper<TbQwFa> {
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJjrMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJjrMapper.java
new file mode 100644
index 0000000..425122a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJjrMapper.java
@@ -0,0 +1,19 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwJjr;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/8
+ **/
+@Mapper
+public interface TbQwJjrMapper extends BaseMapper<TbQwJjr> {
+
+    @ApiOperation("删除节假日数据")
+    void deleteBatch(List<String> ids);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJlMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJlMapper.java
new file mode 100644
index 0000000..601ccef
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJlMapper.java
@@ -0,0 +1,57 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 巡防排班或报备或值班-警力表(TbQwJl)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-20 15:43:32
+ */
+@Mapper
+public interface TbQwJlMapper extends BaseMapper<TbQwJl> {
+
+    @ApiOperation("查询所有数据")
+    List<TbQwJl> queryAll();
+
+    @ApiOperation("通过ID查询单条数据")
+    TbQwJl queryById(String id);
+
+    @ApiOperation("统计总行数")
+    long count(TbQwJl tbQwJl);
+
+    @ApiOperation("MyBatis原生foreach方法")
+    int insertBatch(@Param("entities") List<TbQwJl> entities);
+
+    @ApiOperation("批量新增或按主键更新数据（MyBatis原生foreach方法）")
+    int insertOrUpdateBatch(@Param("entities") List<TbQwJl> entities);
+
+    @ApiOperation("修改数据")
+    int update(TbQwJl tbQwJl);
+
+    @ApiOperation("通过主键删除数据")
+    int deleteById(String id);
+
+    List<Map<String, Integer>> countReportPolice(@Param("sql") String sql);
+
+    @ApiOperation("根据ywid删除警力信息")
+    void deleteByYwid(String id);
+
+    @ApiOperation("根据业务ID查询")
+    List<TbQwJl> queryListByYwid(@Param("list") List<String> list);
+
+    @ApiOperation("查询今日警力列表")
+    List<TbQwJl> getList(Map<String, Object> map);
+
+    @ApiOperation("查询今日警力统计")
+    int getCount(Map<String, Object> map);
+}
+
+
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJyqxMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJyqxMapper.java
new file mode 100644
index 0000000..53bcaae
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwJyqxMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwJyqx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-警用器械表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwJyqxMapper extends BaseMapper<TbQwJyqx> {
+
+    /**
+     * 删除警用器械
+     * @param list
+     */
+    int deleteJyqx(@Param("list") List<String> list);
+
+    /**
+     * 根据业务ID删除
+     * @param ywid
+     */
+    void deleteByYwid(@Param("ywid") String ywid);
+
+    /**
+     * 根据 业务ID查询
+     * @param ywidList
+     * @return
+     */
+    List<TbQwJyqx> queryListByYwid(@Param("list") List<String> ywidList);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwbcMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwbcMapper.java
new file mode 100644
index 0000000..63b503a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwbcMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbQwQwbcMapper extends BaseMapper<TbQwQwbc> {
+
+    @ApiOperation("删除勤务班次")
+    int deleteQwbc(@Param("list") List<String> list);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwdjMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwdjMapper.java
new file mode 100644
index 0000000..4590370
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQwdjMapper.java
@@ -0,0 +1,28 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwQwdj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务等级表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwQwdjMapper extends BaseMapper<TbQwQwdj> {
+
+    @ApiOperation("删除勤务等级")
+    int deleteQwdj(@Param("list") List<String> list);
+
+    @ApiOperation("查询当前等级")
+    TbQwQwdj queryCurrentQwdj(@Param("datetime") String datetime);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQxjMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQxjMapper.java
new file mode 100644
index 0000000..2a4c3d9
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwQxjMapper.java
@@ -0,0 +1,29 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwQxj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apiguardian.api.API;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 请休假 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwQxjMapper extends BaseMapper<TbQwQxj> {
+
+    @ApiOperation("删除通讯装备")
+    int deleteQxj(@Param("list") List<String> list);
+
+    @ApiOperation("")
+    List<Map<String,Integer>>  selectHolidayCount(@Param("sql") String sql);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwMapper.java
new file mode 100644
index 0000000..465e028
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdw;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Mapper
+public interface TbQwSpsCsdwMapper extends BaseMapper<TbQwSpsCsdw> {
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwhdgjMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwhdgjMapper.java
new file mode 100644
index 0000000..b20155e
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwSpsCsdwhdgjMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdw;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdwhdgj;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Mapper
+public interface TbQwSpsCsdwhdgjMapper extends BaseMapper<TbQwSpsCsdwhdgj> {
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfBxfsqMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfBxfsqMapper.java
new file mode 100644
index 0000000..c26d216
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfBxfsqMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbQwXfBxfsqMapper extends BaseMapper<TbQwXfBxfsq> {
+
+    @ApiOperation("删除不巡防申请")
+    int deleteBxfsq(@Param("list") List<String> list);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java
new file mode 100644
index 0000000..ab4c62b
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java
@@ -0,0 +1,125 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbTjQuery;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡防报备表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwXfbbMapper extends BaseMapper<TbQwXfbb> {
+
+    @ApiOperation("删除巡防报备")
+    int deleteXfbb(@Param("list") List<String> list);
+
+    @ApiOperation("值班查询")
+    IPage<TbQwXfbbVo> queryList(@Param("page") IPage<TbQwXfbbVo> page, @Param("params") TbQwXfbbQuery zfbb);
+
+    @ApiOperation("id查询")
+    TbQwXfbbVo queryById(@Param("id") String id);
+
+    @ApiOperation("查询街面巡组计划数")
+    Integer selectJhsl(Map<String, Object> map);
+
+    @ApiOperation("查询街面巡组实际数")
+    Integer selectSjsl(Map<String, Object> map);
+
+    @ApiOperation("查询巡逻力量和时长里程")
+    Map<String, Integer> selectPowerAndDayLength(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("查询周边巡组")
+    List<TbQwXfbb> selectNearbyDeck(@Param("t") TbQwXfbb tbQwXfbb);
+
+    @ApiOperation("查询计划巡组列表")
+    List<TbQwXfpbZq> selectJhslList(Map<String, Object> map);
+
+    @ApiOperation("查询数据巡组列表")
+    List<TbQwXfbb> selectSjslList(Map<String, Object> map);
+
+    @ApiOperation("查询周边巡组或街面巡组数量")
+    int getCountZbxz(Map<String, Object> map);
+
+    @ApiOperation("查询周边巡组或街面巡组列表")
+    List<TbQwXfbb> getListZbxz(Map<String, Object> map);
+
+
+    @ApiOperation("查询我今天的报备new")
+    TbQwXfbb getMybbTodayNew(@Param("sfzh") String sfzh,
+                             @Param("bblx") String bblx);
+
+    @ApiOperation("根据时间查询报备信息")
+    List<TbQwXfbb> getMybbTodayByTime(@Param("userId") String userId,
+                                      @Param("bblx") String bblx,
+                                      @Param("time") String time);
+
+    @ApiOperation("查询范围内的最近的巡组信息")
+    TbQwXfbb getBbxxByJi(TbQwXfbbQueryByJlDto dto);
+
+    @ApiOperation("根据设备ID查询该设备所在的巡组")
+    List<TbQwXfbb> getBbList(String sbid);
+
+    @ApiOperation("根据车辆gpsid查询该设备所在的巡组")
+    List<TbQwXfbb> getClBbList(String sbid);
+
+
+    @ApiOperation("新增巡防报备")
+    void insertEntity(TbQwXfbb xfbb);
+
+    @ApiOperation("巡防时长统计")
+    List<Map<String, Object>> getSumXfsc(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("巡防里程统计")
+    List<Map<String, Object>> getSumXflc(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+
+    @ApiOperation("查询当前所有报备中的数据")
+    List<TbQwXfbb> getBbAll();
+
+    @ApiOperation("修改巡逻状态")
+    int updateByXlzt(@Param("xlzt") String xlzt,
+                     @Param("id") String id);
+
+    @ApiOperation("修改巡逻时长")
+    int updateXfscById(TbQwXfbb xfbb);
+
+    @ApiOperation("部门统计")
+    IPage<Object> bmtj(@Param("page") IPage<TbQwXfbbVo> page, @Param("params") XfbbTjQuery query);
+
+    @ApiOperation("部门统计")
+    Map<String, Object> bmtjAll(XfbbTjQuery query);
+
+    @ApiOperation("巡区统计")
+    IPage<Object> xqtj(@Param("page") IPage<TbQwXfbbVo> page, @Param("params") XfbbTjQuery query);
+
+    @ApiOperation("个人统计")
+    IPage<Object> grtj(@Param("page") IPage<TbQwXfbbVo> page, @Param("params") XfbbTjQuery query);
+
+    @ApiOperation("根据设备ID查询该设备所在的巡组")
+    List<TbQwXfbb> getBbidByXq(String xqid);
+
+    @ApiOperation("部门统计")
+    Map<String, Integer> getScLc(@Param("ssbmdm") String ssbmdm, @Param("time") String time);
+
+    @ApiOperation("根据报备id获取巡逻轨迹")
+    List<TbWzLswz> getBbgj(String bbid);
+
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXffwMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXffwMapper.java
new file mode 100644
index 0000000..965e917
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXffwMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXffw;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbQwXffwMapper extends BaseMapper<TbQwXffw> {
+
+    @ApiOperation("删除巡防范围数据")
+    void deleteByYwid(String id);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMapper.java
new file mode 100644
index 0000000..07db121
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMapper.java
@@ -0,0 +1,38 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwXfpb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbMrjl;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Mapper
+public interface TbQwXfpbMapper extends BaseMapper<TbQwXfpb> {
+
+    @ApiOperation("根据条件按查询总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("根据条件按查询列表")
+    List<TbQwXfpb> getList(Map<String, Object> map);
+
+    @ApiOperation("查询当前时间的巡防排班情况，发送消息提醒报备")
+    List<TbQwXfpbMrjl> checkThisTimeXfpb();
+
+    @ApiOperation("根据时间查询排班情况")
+    List<TbQwXfpb> getPbBySjAndJl(@Param("pbksrq") String pbksrq,
+                                  @Param("pbjsrq") String pbjsrq,
+                                  @Param("jlId") String jlId,
+                                  @Param("kssj") String kssj,
+                                  @Param("jssj") String jssj,
+                                  @Param("id") String id);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMrjlMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMrjlMapper.java
new file mode 100644
index 0000000..3392c90
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbMrjlMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbMrjl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/10
+ **/
+@Mapper
+public interface TbQwXfpbMrjlMapper extends BaseMapper<TbQwXfpbMrjl> {
+
+    @ApiOperation("删除警力报备数据")
+    void deleteByYwid(@Param("pbId") String pbId, @Param("pbzqId") String pbzqId);
+
+    @ApiOperation("根据时间查询每日警力信息")
+    List<TbQwXfpbMrjl> getMrjlByTime(@Param("xfkssj")String xfkssj,
+                                     @Param("xfjssj")String xfjssj,
+                                     @Param("pbid")String pbid);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbZqMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbZqMapper.java
new file mode 100644
index 0000000..c319ea4
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfpbZqMapper.java
@@ -0,0 +1,33 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Mapper
+public interface TbQwXfpbZqMapper extends BaseMapper<TbQwXfpbZq> {
+
+    @ApiOperation("删除巡防排班周期数据")
+    void deleteByPbId(@Param("pbId") String pbId);
+
+    @ApiOperation("APP获取我的排班信息")
+    TbQwXfpbZqMyVo getMyXfpbToday(@Param("userId") String userId);
+
+    @ApiOperation("查询当天的排班信息")
+    List<TbQwXfpbZq> getMyXfpbByTime(@Param("kssj") Date kssj,
+                                     @Param("userId") String userId);
+
+    @ApiOperation("查询部门排班情况")
+    List<TbQwXfpbZq> getDeptByMonth(@Param("kssj") Date kssj, @Param("ssbmdm") String ssbmdm);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbbbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbbbMapper.java
new file mode 100644
index 0000000..2620bad
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbbbMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.qwzx.TbQwZbbb;
+import com.mosty.base.model.query.qwzx.TbQwZbbbQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbbbVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbQwZbbbMapper extends BaseMapper<TbQwZbbb> {
+
+    @ApiOperation("根据ID删除值班")
+    int deleteZb(@Param("id") List<String> id);
+
+    @ApiOperation("值班查询")
+    IPage<TbQwZbbbVo> queryList(@Param("page") IPage<TbQwZbbbVo> page, @Param("params") TbQwZbbbQuery zb);
+
+    @ApiOperation("id查询")
+    TbQwZbbbVo queryById(@Param("id") String id);
+
+    @ApiOperation("APP获取我当前的报备信息")
+    TbQwZbbb getMyBbInfoToday(String valueOf);
+
+    @ApiOperation("查询我的报备信息")
+    List<TbQwZbbb> getMybbTodayByTime(@Param("userId") String userId, @Param("time") String time);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMapper.java
new file mode 100644
index 0000000..c154eb9
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMapper.java
@@ -0,0 +1,38 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfpb;
+import com.mosty.base.model.entity.qwzx.TbQwZbpb;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbMrjl;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Mapper
+public interface TbQwZbpbMapper extends BaseMapper<TbQwZbpb> {
+
+    @ApiOperation("根据条件按查询总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("根据条件按查询列表")
+    List<TbQwZbpb> getList(Map<String, Object> map);
+
+    @ApiOperation("查询当前时间的值班排班情况，发送消息提醒报备")
+    List<TbQwZbpbMrjl> checkThisTimeZbpb();
+
+    @ApiOperation("根据时间查询排班情况")
+    List<TbQwZbpb> getZbBySjAndJl(@Param("zbpbksrq") String zbpbksrq,
+                                  @Param("zbpbjsrq") String zbpbjsrq,
+                                  @Param("jlId") String jlId,
+                                  @Param("kssj") String kssj,
+                                  @Param("jssj") String jssj,
+                                  @Param("id") String id);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMrjlMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMrjlMapper.java
new file mode 100644
index 0000000..4d2197b
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbMrjlMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbMrjl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/10
+ **/
+@Mapper
+public interface TbQwZbpbMrjlMapper extends BaseMapper<TbQwZbpbMrjl> {
+
+    @ApiOperation("删除警力报备数据")
+    void deleteByYwid(@Param("pbId") String pbId, @Param("pbzqId") String pbzqId);
+
+    @ApiOperation("根据时间查询每日警力信息")
+    List<TbQwZbpbMrjl> getMrjlByTime(@Param("zbkssj") String zbkssj,
+                                     @Param("zbjssj") String zbjssj,
+                                     @Param("pbid") String pbid);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbZqMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbZqMapper.java
new file mode 100644
index 0000000..8a6dc6b
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZbpbZqMapper.java
@@ -0,0 +1,31 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.vo.qwzx.TbQwZbpbZqMyVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Mapper
+public interface TbQwZbpbZqMapper extends BaseMapper<TbQwZbpbZq> {
+
+    @ApiOperation("根据排班ID删除排班周期信息")
+    void deleteByPbId(@Param("pbId") String pbId);
+
+    @ApiOperation("APP获取我的值班排班信息")
+    TbQwZbpbZqMyVo getMyZbpbToday(String userId);
+
+    @ApiOperation("根据时间查询用户的排班情况")
+    List<TbQwZbpbZq> getMyZbpbByTime(@Param("kssj") Date kssj, @Param("userId") String userId);
+
+    @ApiOperation("查询部门排班情况")
+    List<TbQwZbpbZq> getDeptByMonth(@Param("kssj") Date kssj, @Param("ssbmid") String ssbmid);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZnzbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZnzbMapper.java
new file mode 100644
index 0000000..4f5ef7e
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwZnzbMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.mapper;
+
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-通讯装备表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwZnzbMapper extends BaseMapper<TbQwZnzb> {
+
+    /**
+     * 删除通讯装备
+     * @param list
+     */
+    int deleteZnzb(@Param("list") List<String> list);
+
+    /**
+     * 根据业务ID删除
+     * @param ywid
+     */
+    void deleteByYwid(@Param("ywid") String ywid);
+
+    /**
+     * 根据 业务ID查询
+     * @param ywidList
+     * @return
+     */
+    List<TbQwZnzb> queryListByYwid(@Param("list") List<String> ywidList);
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwxfbbDkMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwxfbbDkMapper.java
new file mode 100644
index 0000000..ca45933
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwxfbbDkMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.qwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwxfbbDk;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbQwxfbbDkMapper extends BaseMapper<TbQwxfbbDk> {
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..7131e15
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,118 @@
+package com.mosty.qwzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/MybatisPlusConfig.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..a5b077b
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.qwzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbBaseAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..c09b902
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,197 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.query.base.GetSysDeptListQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据部门deptid获取所属分县局、所属地市州
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门下的用户列表，不包含子部门
+    public List<SysUserDeptVO> getUserList(String deptid) {
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserList(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的用户列表异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的用户列表异常");
+        }
+        return responseResult.getData();
+    }
+    // 获取所有的用户数据
+    public List<SysUserDeptVO> getUserAll(String deptId) {
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserAll(deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取所有的部门信息集合
+    public List<DeptInfoVo> getDeptAll() {
+        ResponseResult<List<DeptInfoVo>> responseResult = mostyBaseFeignService.getDeptAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门id查询部门详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门id查询部门详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 给人员发送消息
+    public Integer sendMsg(SysMessageInfoInsertDto dto) {
+        ResponseResult<Integer> responseResult = mostyBaseFeignService.sendMsg(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("给人员发送消息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("给人员发送消息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取人员的部门所属
+    public DeptInfoVo getDeptInfoByUserId(String userId) {
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoByUserId(userId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取人员的部门所属失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取人员的部门所属失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取用户信息
+    public SysUser getUserInfoBySfzh(String sfzh) {
+        ResponseResult<SysUser> responseResult = mostyBaseFeignService.getUserInfoBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取用户信息
+    public List<String> getChildDept(String deptId) {
+        ResponseResult<List<String>> responseResult = mostyBaseFeignService.getChildDept(deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询部门下的所有的子部门信息列表
+    public List<DeptInfoVo> getChildDept(GetDeptListDTO dto) {
+        ResponseResult<List<DeptInfoVo>> responseResult = mostyBaseFeignService.getChildDept(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息失败");
+        }
+        return responseResult.getData();
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 获取下级部门列表
+     *
+     * @param query 组织机构部门查询对象
+     * @return 组织机构列表
+     */
+    public List<SysDept> getChildOrgList(GetSysDeptListQuery query) {
+        if (null == query) {
+            return new ArrayList<>();
+        }
+        ResponseResult<List<SysDept>> responseResult = mostyBaseFeignService.getOrganizationList(query);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取查询条件异常");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询部门详情
+    public SysDept getSysDeptBySsbmdm(String ssbmdm) {
+        ResponseResult<SysDept> responseResult = mostyBaseFeignService.getSysDeptBySsbmdm(ssbmdm);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门详情 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门详情 异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 通过key获取配置信息
+    public String getValue(String pzj) {
+        if (StringUtils.isBlank(pzj)) {
+            return null;
+        }
+        ResponseResult<String> responseResult = mostyBaseFeignService.getValue(pzj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询系统配置异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询系统配置异常");
+        }
+        return responseResult.getData();
+    }
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbJcglAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbJcglAdaptRemoteService.java
new file mode 100644
index 0000000..bd4d72f
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbJcglAdaptRemoteService.java
@@ -0,0 +1,106 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.base.model.entity.jcgl.TbJcglKfd;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.jcgl.TbJcglXfqy;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbJcglAdaptRemoteService {
+
+    @Resource
+    private MostyJcglFeignService mostyJcglFeignService;
+
+
+    // 获取部门下的巡防力量信息
+    public List<TbJcglXfllVo> getXfll(TbJcglXfllQueryAllDto dto) {
+        ResponseResult<List<TbJcglXfllVo>> responseResult = mostyJcglFeignService.getXfll(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的巡防力量信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的巡防力量信息失败");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询部门下的所有的辅警信息
+    public List<TbJcglXfllVo> getFjList(String deptid) {
+        ResponseResult<List<TbJcglXfllVo>> responseResult = mostyJcglFeignService.getFjList(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门下的所有的辅警信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return new ArrayList<>();
+        }
+        return responseResult.getData();
+    }
+
+    // 根据ID查询巡防区域
+    public TbJcglXfqyDto getxfqById(String id) {
+        ResponseResult<TbJcglXfqyDto> responseResult = mostyJcglFeignService.getxfqById(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据ID查询巡防区域失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据ID查询巡防区域失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据ID查询快反点
+    public TbJcglKfdDto getKfdById(String id) {
+        ResponseResult<TbJcglKfdDto> responseResult = mostyJcglFeignService.getKfdById(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据ID查询快反点失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据ID查询快反点失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据ID查询警务站
+    public TbJcglJwz getJwzById(String id) {
+        ResponseResult<TbJcglJwz> responseResult = mostyJcglFeignService.getJwzById(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据ID查询警务站失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据ID查询警务站失败");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 查询部门下面人员数量
+    public Integer getRysl(String ssbmdm) {
+        ResponseResult<Integer> responseResult = mostyJcglFeignService.getRysl(ssbmdm);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据ID查询警务站失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据ID查询警务站失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询查询巡防部门
+    public List<TbJcglXfll> getBmAll() {
+        ResponseResult<List<TbJcglXfll>> responseResult = mostyJcglFeignService.getBmAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询巡防部门失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询巡防部门失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbLzotherAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbLzotherAdaptRemoteService.java
new file mode 100644
index 0000000..c2fa487
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbLzotherAdaptRemoteService.java
@@ -0,0 +1,39 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyLzotherFeignService;
+import com.mosty.base.model.entity.lzother.BphJlxx;
+import com.mosty.base.model.entity.lzother.VJcxx;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbLzotherAdaptRemoteService {
+
+    private final MostyLzotherFeignService mostyLzotherFeignService;
+
+    // 根据身份证查询是否有接警数据
+    public BphJlxx getjlxx(String sfzh) {
+        ResponseResult<BphJlxx> responseResult = this.mostyLzotherFeignService.getjlxx(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情类别类型细类中文异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情类别类型细类中文异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据信息查询是否处警
+    public BphJlxx getjlxxCz(BphJlxx bphJlxx) {
+        ResponseResult<BphJlxx> responseResult = this.mostyLzotherFeignService.getjlxxCz(bphJlxx);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情类别类型细类中文异常Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情类别类型细类中文异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbRwzxAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbRwzxAdaptRemoteService.java
new file mode 100644
index 0000000..d90f330
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbRwzxAdaptRemoteService.java
@@ -0,0 +1,57 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.feign.service.MostyRwzxFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/10/05
+ * 外部调用任务中心接口
+ **/
+@Service
+@Slf4j
+public class TbRwzxAdaptRemoteService {
+
+    @Resource
+    private MostyRwzxFeignService mostyRwzxFeignService;
+
+    /**
+     * 发送任务给各个用户
+     *
+     * @return
+     */
+    public Integer addRw(TbRwTaskDto dto) {
+        ResponseResult<Integer> responseResult = mostyRwzxFeignService.addRw(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("任务下发失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return 0;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 发送任务给各个用户
+     *
+     * @return
+     */
+    public TbRwTask getRwByYwid(TbRwTaskByYwidQuery dto) {
+        ResponseResult<TbRwTask> responseResult = mostyRwzxFeignService.getRwByYwid(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("任务下发失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("任务查询报错！！");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbWebSocketAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbWebSocketAdaptRemoteService.java
new file mode 100644
index 0000000..49ca7b7
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbWebSocketAdaptRemoteService.java
@@ -0,0 +1,42 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyWebSocketFeignService;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * websocket外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbWebSocketAdaptRemoteService {
+
+    @Resource
+    private MostyWebSocketFeignService mostyWebSocketFeignService;
+
+    // 发送websocket信息
+    public void sendMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送websocket信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送websocket信息异常");
+        }
+    }
+
+    // 发送报备数据websocket信息
+    public void sendBbMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendBbMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送报备数据websocket信息 异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送报备数据websocket信息 异常");
+        }
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbYszxAdaptRemoteService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbYszxAdaptRemoteService.java
new file mode 100644
index 0000000..bef6891
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/remote/TbYszxAdaptRemoteService.java
@@ -0,0 +1,50 @@
+package com.mosty.qwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.dto.yszx.TbYsGajgGlbmDto;
+import com.mosty.base.model.vo.yszx.TbYsGajgGlbmVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/8/29
+ * 外部调用要素中心接口
+ **/
+@Service
+@Slf4j
+public class TbYszxAdaptRemoteService {
+
+    @Resource
+    private MostyYszxFeignService mostyYszxFeignService;
+
+    // 查询公安机关要素详情
+    public TbYsGajgVo getInfo(String id) {
+        ResponseResult<TbYsGajgVo> responseResult = mostyYszxFeignService.getInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询公安机关要素详情失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询公安机关要素详情失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询公安机关要素列表
+    public List<TbYsGajgGlbmVo> getGajgList(TbYsGajgQuery dto) {
+        ResponseResult<List<TbYsGajgGlbmVo>> responseResult = mostyYszxFeignService.getGajgList(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询公安机关要素列表失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询公安机关要素列表失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxQwlbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxQwlbService.java
new file mode 100644
index 0000000..fc8802a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxQwlbService.java
@@ -0,0 +1,17 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface QwzxQwlbService {
+
+    @ApiOperation("勤务列表-不在岗警力清单")
+    List<Map<String, Object>> bzgjlqd(TbQwMfjSearchDto dto);
+
+    @ApiOperation("勤务列表-街面巡组")
+    IPage<Map<String, Object>> jmxz(TbQwMfjSearchDto dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxStatisticsService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxStatisticsService.java
new file mode 100644
index 0000000..fef5f10
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/QwzxStatisticsService.java
@@ -0,0 +1,121 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import com.mosty.common.base.domain.ResponseResult;
+import io.swagger.annotations.ApiOperation;
+
+import javax.swing.*;
+import java.util.List;
+import java.util.Map;
+
+public interface QwzxStatisticsService {
+
+    @ApiOperation("警力情况-辅警-全部辅警数量")
+    Integer qbfj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-全部辅警列表")
+    IPage<Map<String, Object>> qbfjList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-全部列表")
+    IPage<Map<String, Object>> qblb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-全部在岗统计")
+    IPage<Map<String, Object>> qbzgtj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-在岗辅警")
+    Integer zgfj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-在岗辅警列表")
+    IPage<Map<String, Object>> zgfjList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-在岗列表")
+    IPage<Map<String, Object>> zglb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-辅警列表")
+    IPage<Map<String, Object>> fjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-民警列表")
+    IPage<Map<String, Object>> mjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-全部名民警辅警")
+    Integer qb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-民警列表")
+    IPage<Map<String, Object>> qbList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-在岗民警辅警")
+    Integer zg(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-在岗民警辅警列表")
+    IPage<Map<String, Object>> zgList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-可抽调-可抽调辅警列表")
+    IPage<Map<String, Object>> kcdFjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-可抽调-可抽调民警辅警数量")
+    List<Map<String,Object>> zbtj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-可抽调-可抽调民警列表")
+    IPage<Map<String, Object>> kcdMjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-民警辅警整合列表")
+    IPage<Map<String, Object>> mjfjzh(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-全部列表")
+    IPage<Map<String, Object>> mjQblb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-全部民警")
+    Integer qbmj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-全部民警列表")
+    IPage<Map<String, Object>> qbmjList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-全部在岗统计")
+    Integer mjQbzgtj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-在岗列表")
+    IPage<Map<String, Object>> mjZglb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-在岗民警")
+    Integer zgmj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-在岗民警辅警整合")
+    List<Map<String, Object>> zgmjfjzh(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-在岗民警列表")
+    IPage<Map<String, Object>> zgmjList(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-请休假-辅警列表")
+    IPage<Map<String, Object>> qxFjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-请休假-民警辅警统计")
+    List<Map<String,Object>> mjfjtj(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-请休假-民警列表")
+    IPage<Map<String, Object>> qxjMjlb(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-全部列表-第三方")
+    IPage<Map<String, Object>> mjQblbOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-民警列表-第三方")
+    IPage<Map<String, Object>> mjlbOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-民警-在岗民警列表-第三方")
+    IPage<Map<String, Object>> zgmjListOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-请休假-民警列表-第三方")
+    IPage<Map<String, Object>> qxjMjlbOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-全部列表-第三方")
+    IPage<Map<String, Object>> qblbOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-街面警力-辅警列表-第三方")
+    IPage<Map<String, Object>> fjlbOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-辅警-在岗辅警列表-第三方")
+    IPage<Map<String, Object>> zgfjListOther(TbQwMfjSearchDto dto);
+
+    @ApiOperation("警力情况-请休假-辅警列表-第三方")
+    IPage<Map<String, Object>> qxFjlbOther(TbQwMfjSearchDto dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwBmjlbbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwBmjlbbService.java
new file mode 100644
index 0000000..b3420ea
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwBmjlbbService.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwSearchJlqdDto;
+import com.mosty.base.model.dto.qwzx.TbQwSearchZgmfjDto;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbbJlmx;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbCountQuery;
+import com.mosty.base.model.query.qwzx.TbQwBmjlbbQuery;
+import com.mosty.base.model.vo.qwzx.Gzqk;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbCountVo;
+import com.mosty.base.model.vo.qwzx.TbQwBmjlbbVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ */
+public interface TbQwBmjlbbService {
+
+    @ApiOperation("查询在岗民警辅警数量")
+    Gzqk selectOnCop();
+
+    @ApiOperation("计算今日部门警力报备情况")
+    void setBmjlbbInfo(String time);
+
+    @ApiOperation("查询警力清单,存入redis中")
+    List<Map<String, Object>> getJlqdListToRedis(TbQwSearchJlqdDto dto);
+
+    @ApiOperation("查询警力清单")
+    List<Map<String, Object>> getJlqdList(TbQwSearchJlqdDto dto);
+
+    @ApiOperation("高新领导端--查询在岗警力数量")
+    Map<String, Object> getZgjlCount();
+
+    @ApiOperation("值班表统计")
+    List<Map<String, Object>> countCdepTree(String ssbmdm);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwFaService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwFaService.java
new file mode 100644
index 0000000..a497b6f
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwFaService.java
@@ -0,0 +1,22 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.qwzx.TbQwFa;
+import com.mosty.base.model.query.qwzx.TbQwFaQuery;
+
+import java.util.List;
+
+public interface TbQwFaService {
+
+    TbQwFa queryById(String id);
+
+    IPage<TbQwFa> paginQuery(TbQwFaQuery query);
+
+    Integer insert(TbQwFa xf);
+
+    Integer update(TbQwFa xf);
+
+    Boolean deleteById(String id);
+
+    Boolean deleteByIds(List<String> id);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwJjrService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwJjrService.java
new file mode 100644
index 0000000..7005a4c
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwJjrService.java
@@ -0,0 +1,27 @@
+package com.mosty.qwzx.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.qwzx.TbQwJjr;
+import com.mosty.base.model.query.qwzx.TbQwJjrQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbQwJjrService {
+
+    @ApiOperation("添加节假日")
+    void add(TbQwJjr jjr);
+
+    @ApiOperation("修改节假日")
+    void update(TbQwJjr jjr);
+
+    @ApiOperation("删除节假日数据")
+    void deleteBatch(List<String> ids);
+
+    @ApiOperation("单条删除节假日")
+    void deleteByIds(String id);
+
+    @ApiOperation("分页查询节假日信息")
+    IPage<TbQwJjr> getPageList(TbQwJjrQuery dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwbcService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwbcService.java
new file mode 100644
index 0000000..0f4e153
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwbcService.java
@@ -0,0 +1,43 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.dto.qwzx.TbQwQwbcEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.mosty.base.model.query.qwzx.TbQwQwbcQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务班次表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+public interface TbQwQwbcService {
+
+    @ApiOperation("新增勤务班次")
+    int addQwbc(TbQwQwbc qwbc);
+
+    @ApiOperation("查询勤务班次")
+    IPage<TbQwQwbc> getQwbc(TbQwQwbcQuery qwbc, IPage<TbQwQwbc> page);
+
+    @ApiOperation("编辑勤务班次")
+    int editQwbc(TbQwQwbcEditDto qwbc);
+
+    @ApiOperation("删除勤务班次")
+    boolean deleteBatch(List<String> ids);
+
+    @ApiOperation("id删除")
+    boolean deleteById(String id);
+
+    @ApiOperation("根据ID查询")
+    TbQwQwbc selectById(String id);
+
+    @ApiOperation("app查询班次信息")
+    Page<TbQwQwbc> getBcList(AppSearchQuery dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwdjService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwdjService.java
new file mode 100644
index 0000000..46a9bcc
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQwdjService.java
@@ -0,0 +1,44 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwQwdjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwdj;
+import com.mosty.base.model.query.qwzx.TbQwQwdjQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务等级表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+public interface TbQwQwdjService {
+
+    @ApiOperation("新增勤务等级")
+    int addQwdj(TbQwQwdj qwdj);
+
+    @ApiOperation("查询勤务等级")
+    IPage<TbQwQwdj> getQwdj(TbQwQwdjQuery qwdj, IPage<TbQwQwdj> page);
+
+    @ApiOperation("编辑勤务等级")
+    int editQwdj(TbQwQwdjEditDto qwdj);
+
+    @ApiOperation("删除勤务等级")
+    boolean deleteBatch(List<String> ids);
+
+    @ApiOperation("id删除")
+    boolean deleteById(String id);
+
+    @ApiOperation("根据ID查询")
+    TbQwQwdj selectById(String id);
+
+    @ApiOperation("勤务等级发布")
+    boolean publishQwdj(String id);
+
+    @ApiOperation("查询当前勤务等级")
+    TbQwQwdj queryCurrentQwdj(String dateTime);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQxjService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQxjService.java
new file mode 100644
index 0000000..80995f7
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwQxjService.java
@@ -0,0 +1,38 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwQxjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQxj;
+import com.mosty.base.model.query.qwzx.TbQwQxjMyQuery;
+import com.mosty.base.model.query.qwzx.TbQwQxjQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ */
+public interface TbQwQxjService {
+
+    @ApiOperation("新增请休假")
+    int addQxj(TbQwQxj qxj);
+
+    @ApiOperation("查询请休假")
+    IPage<TbQwQxj> getQxj(TbQwQxjQuery qxj, IPage<TbQwQxj> page);
+
+    @ApiOperation("编辑请休假")
+    int editQxj(TbQwQxjEditDto qxj);
+
+    @ApiOperation("删除请休假")
+    boolean deleteBatch(List<String> ids);
+
+    @ApiOperation("id删除")
+    boolean deleteById(String id);
+
+    @ApiOperation("根据ID查询")
+    TbQwQxj selectById(String id);
+
+    @ApiOperation("APP查询我的请休假记录")
+    IPage<TbQwQxj> getMyQxjList(TbQwQxjMyQuery dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwSpsCsdwService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwSpsCsdwService.java
new file mode 100644
index 0000000..808c4c0
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwSpsCsdwService.java
@@ -0,0 +1,23 @@
+package com.mosty.qwzx.service;
+
+import com.mosty.base.model.dto.qwzx.TbQwSpsHdgjChangeDto;
+import com.mosty.base.model.query.qwzx.TbQwSpsCsdwQuery;
+import com.mosty.base.model.vo.qwzx.TbQwSpsCsdwVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+public interface TbQwSpsCsdwService {
+
+    @ApiOperation("根据条件查询所有的参赛队伍")
+    Object getList(TbQwSpsCsdwQuery dto);
+
+    @ApiOperation("查询某一个队伍的当前的状态")
+    TbQwSpsCsdwVo getCsdwInfo(String id);
+
+    @ApiOperation("参赛队伍活动轨迹变更")
+    void changeHdgj(TbQwSpsHdgjChangeDto dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfBxfsqService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfBxfsqService.java
new file mode 100644
index 0000000..9b3ac83
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfBxfsqService.java
@@ -0,0 +1,33 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwBxfsqEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.mosty.base.model.query.qwzx.TbQwXfBxfsqQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbQwXfBxfsqService {
+
+    @ApiOperation("新增不巡防申请")
+    int addBxfsq(TbQwXfBxfsq bxfsq);
+
+    @ApiOperation("查询不巡防申请")
+    IPage<TbQwXfBxfsq> getBxfsq(TbQwXfBxfsqQuery bxfsq, IPage<TbQwXfBxfsq> page);
+
+    @ApiOperation("编辑不巡防申请")
+    int editBxfsq(TbQwXfBxfsq bxfsq);
+
+    @ApiOperation("删除不巡防申请")
+    boolean deleteBatch(List<String> ids);
+
+    @ApiOperation("ID删除")
+    boolean deleteById(String id);
+
+    @ApiOperation("根据ID查询")
+    TbQwXfBxfsq selectById(String id);
+
+    @ApiOperation("审批不巡防申请")
+    int judge(TbQwBxfsqEditDto dto);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java
new file mode 100644
index 0000000..e905643
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java
@@ -0,0 +1,155 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.*;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
+import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbTjQuery;
+import com.mosty.base.model.query.sjzx.XftjQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡防报备表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+public interface TbQwXfbbService {
+
+    @ApiOperation("查询巡防报备")
+    IPage<TbQwXfbbVo> queryList(TbQwXfbbQuery xfbb);
+
+    @ApiOperation("根据ID查询")
+    TbQwXfbbVo selectById(String id);
+
+    @ApiOperation("新增巡防报备")
+    String addXfbb(TbQwXfbbVo xfbb);
+
+    @ApiOperation("删除巡防报备")
+    boolean deleteBatch(List<String> ids);
+
+    @ApiOperation("id删除")
+    boolean deleteById(String id);
+
+    @ApiOperation("查询巡组")
+    Map<String, Integer> selectDeck();
+
+    @ApiOperation("查询巡组列表")
+    IPage<TbQwXfbb> selectDeckList(TbQwXfbbJmxzQuery dto);
+
+    @ApiOperation("查询周边巡组")
+    List<TbQwXfbb> selectNearbyDeck(TbQwXfbb tbQwXfbb);
+
+    @ApiOperation("查询巡防报备")
+    IPage<TbQwXfbbVo> queryPage(TbQwXfbbQuery xfbb);
+
+    @ApiOperation("开始、结束报备")
+    int startOrEndBb(TbQwXfbbStartOrEndBbDto dto);
+
+    @ApiOperation("大屏-计划街面巡组列表-分页")
+    IPage<TbQwXfpbZq> selectJhjmxzList(TbQwXzSearchDto dto);
+
+    @ApiOperation("大屏-实际街面巡组列表-分页")
+    IPage<TbQwXfbb> selectSjjmxzList(TbQwXzSearchDto dto);
+
+    @ApiOperation("大屏-街面力量-分页")
+    IPage<TbQwJl> selectJmllList(TbQwJmllSearchDto dto);
+
+    @ApiOperation("查询我今天的报备信息")
+    TbQwXfbb getMybbTodayNew(String bblx);
+
+    @ApiOperation("判断派出所、巡防区范围内是否有巡组")
+    List<TbQwXfbb> getFjbbByYsId(String ysid);
+
+    @ApiOperation("根据身份证号获取最后一次报备的数据")
+    TbQwXfbb getMybbLastBySfzh(String sfzh);
+
+    @ApiOperation("每半个小时查询已报备的状态，结束当前报备")
+    void authJsbb();
+
+    @ApiOperation("每周一凌晨结束特殊报备")
+    void authJsbbTs();
+
+    @ApiOperation("根据用户ID查询巡组下的人员列表")
+    List<TbQwJlDto> getJlxxByBbid(String id);
+
+    @ApiOperation("查询范围内的最近的巡组信息")
+    TbQwXfbb getBbxxByJi(TbQwXfbbQueryByJlDto dto);
+
+    @ApiOperation("app查询界面警力民警辅警数量")
+    Map<String, Object> selectMfjCount(String bbrq);
+
+    @ApiOperation("根据设备ID查询该设备所在的巡组")
+    List<TbQwXfbb> getBbList(String sbid);
+
+    @ApiOperation("根据车辆gpsID查询该设备所在的巡组")
+    List<TbQwXfbb> getClBbList(String sbid);
+
+    @ApiOperation("查询街面巡组")
+    IPage<TbQwXfbb> selectJmxz(TbQwJmxzSearchDto dto);
+
+    @ApiOperation("新增巡防报备打卡")
+    void addXfbbDk(TbQwXfbbDkDto dto);
+
+    @ApiOperation("判断当前位置是否再报备的巡防区内")
+    boolean isDdWz(TbQwXfbbDkWzDto dto);
+
+    @ApiOperation("根据ID查询报备信息")
+    TbQwXfbb getBbxxInfo(String id);
+
+    @ApiOperation("高新领导段-查询街面警力数量")
+    Map<String, Object> getJmjlCount();
+
+    @ApiOperation("计算巡防报备时长")
+    void checkXfbbSc();
+
+    @ApiOperation("查询巡组信息第三方")
+    IPage<TbQwXfbb> selectDeckListOther(TbQwXfbbJmxzQuery dto);
+
+    @ApiOperation("泸州态势统计-各区县巡防时长和里程")
+    Map<String, Object> getXfscAndLc(XfbbQuery dto);
+
+    @ApiOperation("查询部门的报备的数量")
+    Integer getBbCount(String ssbmdm, String time);
+
+    @ApiOperation("查询部门时长、里程")
+    Map<String,Integer> getScLc(String ssbmdm, String time);
+
+    @ApiOperation("根据警情信息 修改巡防状态")
+    void updateXfzt();
+
+    @ApiOperation("大屏巡防报备统计")
+    Map<String, Integer> xfbbTj();
+
+    @ApiOperation("部门统计")
+    IPage<Object> bmtj(XfbbTjQuery query);
+
+    @ApiOperation("部门统计")
+    Object bmtjAll(XfbbTjQuery query);
+
+    @ApiOperation("巡区统计")
+    IPage<Object> xqtj(XfbbTjQuery query);
+
+    @ApiOperation("巡区统计")
+    IPage<Object> grtj(XfbbTjQuery query);
+
+    @ApiOperation("根据巡区获取报备id")
+    List<TbQwXfbb> getBbidByXq(String xqid);
+
+    void delRedisXfwz();
+
+    @ApiOperation("更新巡防里程")
+    Integer updateXflc(String bbid);
+
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfpbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfpbService.java
new file mode 100644
index 0000000..98b36be
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfpbService.java
@@ -0,0 +1,72 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbAddAndEditDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbZqDto;
+import com.mosty.base.model.dto.qwzx.TbQwXzSearchDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.query.qwzx.TbQwXfpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfpbSearchMyQuery;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+public interface TbQwXfpbService {
+
+    @ApiOperation("新增巡防排班")
+    int addEntity(TbQwXfpbAddAndEditDto dto);
+
+    @ApiOperation("巡防排班修改")
+    Integer editEntity(TbQwXfpbAddAndEditDto dto);
+
+    @ApiOperation("删除单条巡防排班")
+    Integer delEntity(String id);
+
+    @ApiOperation("批量删除巡防排班")
+    void delBatch(List<String> ids);
+
+    @ApiOperation("查询巡防排班分页")
+    IPage<TbQwXfpbAddAndEditDto> getPageList(TbQwXfpbQuery dto);
+
+    @ApiOperation("查询巡防排班详细信息")
+    TbQwXfpbAddAndEditDto getInfo(String id);
+
+    @ApiOperation("分页查询我的巡防排班")
+    IPage<TbQwXfpbAddAndEditDto> getMyXfpb(TbQwXfpbSearchMyQuery dto);
+
+    @ApiOperation("APP获取我的排班信息")
+    TbQwXfpbZqMyVo getMyXfpbToday();
+
+    @ApiOperation("查询本月的巡防排班信息")
+    IPage<TbQwXfpbZqVo> getThisMonthPbList(TbQwXzSearchDto dto);
+
+    @ApiOperation("查询当前时间的巡防排班情况，发送消息提醒报备")
+    void checkThisTimeXfpb();
+
+    @ApiOperation("根据周期Id查询排班信息")
+    TbQwXfpbZqMyVo getPbZq(String id,String time);
+
+    @ApiOperation("每月一日添加每日警力")
+    void addMrjl();
+
+    @ApiOperation("根据时间查询月份排班、报备情况")
+    List<Map<String, Object>> getPbbbByMonth(String time);
+
+    @ApiOperation("根据时间查询月份巡防排班、巡防报备情况")
+    List<Map<String, Object>> getXfbbByMonth(String time);
+
+
+    @ApiOperation("根据时间查询部门月份排班、报备情况")
+    List<Map<String, Object>> getPbbbByMonthBm(String time,String ssbmdm);
+
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbbbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbbbService.java
new file mode 100644
index 0000000..2fd525a
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbbbService.java
@@ -0,0 +1,54 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbStartOrEndBbDto;
+import com.mosty.base.model.entity.qwzx.TbQwZbbb;
+import com.mosty.base.model.query.qwzx.TbQwZbbbQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbbbVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022-10-09
+ */
+public interface TbQwZbbbService {
+
+    @ApiOperation("值班报备新增")
+    String addQwzb(TbQwZbbbVo zbVo);
+
+    @ApiOperation("查询勤务装备")
+    IPage<TbQwZbbbVo> queryList(TbQwZbbbQuery zb);
+
+    @ApiOperation("根据ID查询")
+    TbQwZbbbVo selectById(String id);
+
+    @ApiOperation("删除勤务装备")
+    boolean deleteBatch(List<String> list);
+
+    @ApiOperation("分页查询值班报备列表")
+    IPage<TbQwZbbbVo> queryPage(TbQwZbbbQuery zb);
+
+    @ApiOperation("APP获取我当前的报备信息")
+    TbQwZbbb getMyBbInfoToday();
+
+    @ApiOperation("开始、结束报备")
+    Integer startOrEndBb(TbQwXfbbStartOrEndBbDto dto);
+
+    @ApiOperation("自动结束报备")
+    void authJsbb();
+
+    @ApiOperation("APP根据时间统计报备数量")
+    Map<String, Object> getBbCountByDept(String time);
+
+    @ApiOperation("APP根据时间统计报备列表")
+    List<Map<String, Object>> getBbListByDept(String time);
+
+    @ApiOperation("查询值班领导")
+    Map<String, Object> getZbld();
+
+    @ApiOperation("查询值班领导")
+    Map<String, Object> getJlByBm(String time, String ssbmdm);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbpbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbpbService.java
new file mode 100644
index 0000000..c129253
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwZbpbService.java
@@ -0,0 +1,62 @@
+package com.mosty.qwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbInsertOrUpdateDto;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbZqDto;
+import com.mosty.base.model.entity.qwzx.TbQwZbpbZq;
+import com.mosty.base.model.query.qwzx.TbQwZbpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwZbpbSearchMyQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbpbZqMyVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+public interface TbQwZbpbService {
+
+    @ApiOperation("新增值班排班")
+    Integer addEntity(TbQwZbpbInsertOrUpdateDto dto);
+
+    @ApiOperation("修改值班报备信息")
+    Integer updateEntity(TbQwZbpbInsertOrUpdateDto dto);
+
+    @ApiOperation("删除值班报备信息")
+    void deleteBatch(List<String> ids);
+
+    @ApiOperation("删除单条值班报备信息")
+    void deleteEntity(String id);
+
+    @ApiOperation("查询值班排班列表信息--分页")
+    IPage<TbQwZbpbInsertOrUpdateDto> selectPage(TbQwZbpbQuery dto);
+
+    @ApiOperation("查询值班排班详情信息")
+    TbQwZbpbInsertOrUpdateDto getInfo(String id);
+
+    @ApiOperation("分页查询我的值班排班")
+    IPage<TbQwZbpbInsertOrUpdateDto> getMyZbpb(TbQwZbpbSearchMyQuery dto);
+
+    @ApiOperation("查询当前时间的值班排班情况，发送定时任务(定时任务)")
+    void checkThisTimeZbpb();
+
+    @ApiOperation("APP获取我的值班排班信息")
+    TbQwZbpbZqMyVo getMyZbpbToday();
+
+    @ApiOperation("根据周期ID查询周期详细信息")
+    TbQwZbpbZqDto getZbpbZqInfo(String id);
+
+    @ApiOperation("每月一日添加每日警力")
+    void addMrjl();
+
+    @ApiOperation("根据时间查询月份排班、报备情况")
+    List<Map<String, Object>> getZbbbByMonth(String time);
+
+    @ApiOperation("根据月份导出值班排班表情况")
+    List<Map<String, Object>> exportData(String time, String pbid);
+
+    @ApiOperation("查询部门月排班情况")
+    List<Map<String, Object>> getDeptByMonth(String time);
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxQwlbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxQwlbServiceImpl.java
new file mode 100644
index 0000000..5059f1d
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxQwlbServiceImpl.java
@@ -0,0 +1,54 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.qwzx.mapper.QwzxQwlbMapper;
+import com.mosty.qwzx.mapper.QwzxStatisticsMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.QwzxQwlbService;
+import com.mosty.qwzx.service.QwzxStatisticsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class QwzxQwlbServiceImpl implements QwzxQwlbService {
+
+    private final QwzxQwlbMapper qwzxQwlbMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public List<Map<String, Object>> bzgjlqd(TbQwMfjSearchDto dto) {
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        dto.setSsbmdm(tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        map.put("dto", dto);
+        return this.qwzxQwlbMapper.qxjMjlb(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> jmxz(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        List<Map<String, Object>> list = this.qwzxQwlbMapper.jmxz(map);
+        int count = this.qwzxQwlbMapper.jmxzCount(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxStatisticsServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxStatisticsServiceImpl.java
new file mode 100644
index 0000000..7b4e62c
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/QwzxStatisticsServiceImpl.java
@@ -0,0 +1,621 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.TbQwMfjSearchDto;
+import com.mosty.base.model.entity.qwzx.TbQwQxj;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.qwzx.mapper.QwzxStatisticsMapper;
+import com.mosty.qwzx.mapper.TbQwQxjMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.QwzxStatisticsService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.swing.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class QwzxStatisticsServiceImpl implements QwzxStatisticsService {
+
+    private final QwzxStatisticsMapper qwzxStatisticsMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwQxjMapper tbQwQxjMapper;
+
+    @Override
+    public Integer qbfj(TbQwMfjSearchDto dto) {
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getQbfjCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qbfjList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQbfjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.getQbfjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    /**
+     * 查询全部列表 qblb
+     * 警力情况-辅警-全部列表
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public IPage<Map<String, Object>> qblb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQblbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qblb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    /**
+     * 警力情况-辅警-全部在岗统计 qbzgtj
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public IPage<Map<String, Object>> qbzgtj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQbzgtjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qbzgtj(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Integer zgfj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getZgfjCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zgfjList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getZgfjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.getZgfjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zglb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getZglbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.zglb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> fjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getFjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.fjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getMjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Integer qb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getQbCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qbList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qbList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Integer zg(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getZgCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zgList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getZgCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.zgList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> kcdFjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getKcdFjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.kcdFjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> zbtj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getZbtjCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> kcdMjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.kcdMjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.kcdMjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjfjzh(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+//        map.put("useDept", user.getUserPermissionsInfo() == null ? "" : user.getUserPermissionsInfo().getIds());
+        map.put("dto", dto);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjfjzh(map);
+        int count = this.qwzxStatisticsMapper.mjfjzhCount(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjQblb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSqlOfCode("a", user));
+        map.put("dto", dto);
+//        map.put("useDept", user.getUserPermissionsInfo() == null ? "" : user.getUserPermissionsInfo().getIds());
+        int count = this.qwzxStatisticsMapper.mjQblbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjQblb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public Integer qbmj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getQbmjCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qbmjList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQbmjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qbmjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public Integer mjQbzgtj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+//        map.put("useDept", user.getUserPermissionsInfo() == null ? "" : user.getUserPermissionsInfo().getIds());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getQbzgCount(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjZglb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSqlOfCode("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getmMjzglbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjZglb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public Integer zgmj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.getZgmj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zgmjfjzh(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.fjlb(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zgmjList(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSqlOfCode("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.kcdMjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.zgmjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qxFjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.qxFjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qxFjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> mjfjtj(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSqlOfCode("a", user));
+        map.put("dto", dto);
+        return this.qwzxStatisticsMapper.mjfjtj(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qxjMjlb(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.qxjMjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qxjMjlb(map);
+        list.forEach(item -> {
+            SysUser sysUser = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(String.valueOf(item.get("sfzh")));
+            if (sysUser != null) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(sysUser.getId()));
+                item.put("orgcode", dept.getDeptcode());
+                item.put("orgid", dept.getDeptid());
+                item.put("orgname", dept.getDeptname());
+                TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                        new LambdaQueryWrapper<TbQwQxj>()
+                                .ge(StringUtils.isNotBlank(dto.getKssj()), TbQwQxj::getKssj, dto.getKssj())
+                                .le(StringUtils.isNotBlank(dto.getJssj()), TbQwQxj::getJssj, dto.getJssj())
+                                .orderByDesc(TbQwQxj::getKssj)
+                                .last(" limit 1")
+                );
+                if (qxj != null) {
+                    item.put("kssj", DateUtils.getQueryDateString(qxj.getKssj(), "01"));
+                    item.put("jssj", DateUtils.getQueryDateString(qxj.getJssj(), "01"));
+                }
+            }
+        });
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjQblbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.mjQblbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjQblb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> mjlbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getMjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.mjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zgmjListOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.kcdMjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.zgmjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qxjMjlbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.qxjMjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qxjMjlb(map);
+        list.forEach(item -> {
+            SysUser sysUser = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(String.valueOf(item.get("sfzh")));
+            if (sysUser != null) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(sysUser.getId()));
+                item.put("orgcode", dept.getDeptcode());
+                item.put("orgid", dept.getDeptid());
+                item.put("orgname", dept.getDeptname());
+                TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                        new LambdaQueryWrapper<TbQwQxj>()
+                                .ge(StringUtils.isNotBlank(dto.getKssj()), TbQwQxj::getKssj, dto.getKssj())
+                                .le(StringUtils.isNotBlank(dto.getJssj()), TbQwQxj::getJssj, dto.getJssj())
+                                .orderByDesc(TbQwQxj::getKssj)
+                                .last(" limit 1")
+                );
+                if (qxj != null) {
+                    item.put("kssj", DateUtils.getQueryDateString(qxj.getKssj(), "01"));
+                    item.put("jssj", DateUtils.getQueryDateString(qxj.getJssj(), "01"));
+                }
+            }
+        });
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+
+    @Override
+    public IPage<Map<String, Object>> qblbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getQblbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qblb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> fjlbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getFjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.fjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> zgfjListOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.getZgfjCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.getZgfjList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<Map<String, Object>> qxFjlbOther(TbQwMfjSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        int count = this.qwzxStatisticsMapper.qxFjlbCount(map);
+        List<Map<String, Object>> list = this.qwzxStatisticsMapper.qxFjlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwBmjlbbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwBmjlbbServiceImpl.java
new file mode 100644
index 0000000..16000b8
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwBmjlbbServiceImpl.java
@@ -0,0 +1,512 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.dto.qwzx.TbQwSearchJlqdDto;
+import com.mosty.base.model.entity.jcgl.TbJcglXfll;
+import com.mosty.base.model.entity.qwzx.*;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.qwzx.Gzqk;
+import com.mosty.base.model.vo.yszx.TbYsGajgGlbmVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.qwzx.mapper.*;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.remote.TbJcglAdaptRemoteService;
+import com.mosty.qwzx.remote.TbYszxAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwBmjlbbService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 部门每日警力报备表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@AllArgsConstructor
+@Service
+public class TbQwBmjlbbServiceImpl extends ServiceImpl<TbQwBmjlbbMapper, TbQwBmjlbb>
+        implements TbQwBmjlbbService {
+
+
+    private final TbQwBmjlbbJlmxMapper tbQwBmjlbbJlmxMapper;
+    private final TbQwJjrMapper tbQwJjrMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwQxjMapper tbQwQxjMapper;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbYszxAdaptRemoteService tbYszxAdaptRemoteService;
+    private final TbQwZbbbMapper tbQwzbbbMapper;
+    private final TbQwZbpbZqMapper tbQwZbpbZqMapper;
+    private final RedisService redisService;
+    private final TbQwXfbbMapper tbQwXfbbMapper;
+    private final TbQwZbpbMapper tbQwZbpbMapper;
+    private final TbQwJlMapper tbQwJlMapper;
+    private final TbQwXfpbMapper tbQwXfpbMapper;
+
+    @Override
+    public Gzqk selectOnCop() {
+//        UserInfo userInfo = UserInfoManager.get();
+        String ssbmdm = tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.baseMapper.selectOnCop(ssbmdm);
+    }
+
+    @Override
+    public void setBmjlbbInfo(String time) {
+        // 查询所有的部门信息
+//        List<DeptInfoVo> deptList = this.tbBaseAdaptRemoteService.getDeptAll();
+        //获取所有巡防里面表的部门
+        List<TbJcglXfll> bmAll = this.tbJcglAdaptRemoteService.getBmAll();
+        if (!CollectionUtils.isEmpty(bmAll)) {
+            for (TbJcglXfll xfll : bmAll) {
+                DeptInfoVo item = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfll.getSsbmdm());
+                TbQwBmjlbb bb = new TbQwBmjlbb();
+                bb.setBbrq(DateUtils.dateTime("yyyy-MM-dd", time));
+                bb.setId(UUIDGenerator.getUUID());
+                // 查询是否节假日
+                TbQwJjr jjr = this.tbQwJjrMapper.selectOne(
+                        new LambdaQueryWrapper<TbQwJjr>()
+                                .eq(TbQwJjr::getJjrq, new Date())
+                );
+                if (jjr != null) {
+                    bb.setSfjjr("1");
+                    bb.setJjrmc(jjr.getJjrmc());
+                } else {
+                    bb.setSfjjr("0");
+                }
+                String date = DateUtils.getDate();
+                try {
+                    bb.setKssj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date + " 00:00:00"));
+                    bb.setJssj(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date + " 23:59:59"));
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                bb.setSsbm(item.getDeptname());
+                bb.setSsbmid(item.getDeptid());
+                bb.setSsbmdm(item.getDeptcode());
+                bb.setSsxgajdm(item.getFxjcode());
+                bb.setSsxgajid(item.getFxjid());
+                bb.setSsxgaj(item.getFxjname());
+                bb.setSssgaj(item.getDszname());
+                bb.setSssgajdm(item.getDszcode());
+                bb.setSssgajid(item.getDszid());
+                // 查询部门下的人员信息(民警)
+                if (item.getDeptid() != null) {
+//                    List<SysUserDeptVO> userList = this.tbBaseAdaptRemoteService.getUserAll(item.getDeptid());
+                    TbJcglXfllQueryAllDto dto = new TbJcglXfllQueryAllDto();
+                    dto.setFl("01");
+                    dto.setSsbmdm(item.getDeptcode());
+                    //查询巡逻民警数据
+                    List<TbJcglXfllVo> mjList = this.tbJcglAdaptRemoteService.getXfll(dto);
+                    bb.setBmmjsl(mjList.size());
+                    int zgmjsl = mjList.size();
+                    List<String> zgmj = mjList.stream().map(it -> String.valueOf(it.getId())).collect(Collectors.toList());
+                    List<String> bzgmj = new ArrayList<>();
+                    int bzmjsl = 0;
+                    for (TbJcglXfllVo user : mjList) {
+                        // 查询是否在岗（是否请休假）
+                        TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                                new LambdaQueryWrapper<TbQwQxj>()
+                                        .eq(TbQwQxj::getSqrlx, "01")
+                                        .eq(TbQwQxj::getSqrSfzh, user.getSfzh())
+                                        .le(TbQwQxj::getKssj, DateUtils.getDate())
+                                        .ge(TbQwQxj::getJssj, DateUtils.getDate())
+                        );
+                        if (qxj == null) {
+                            // 保存子表数据
+                            this.setJlmx(user, bb.getId(), "1", "1", DateUtils.dateTime("yyyy-MM-dd", time));
+                        } else {
+                            zgmjsl--;
+                            zgmj = zgmj.stream().filter(it -> !it.equals(String.valueOf(user.getId()))).collect(Collectors.toList());
+                            bzmjsl++;
+                            bzgmj.add(String.valueOf(user.getId()));
+                            this.setJlmx(user, bb.getId(), "0", "4", DateUtils.dateTime("yyyy-MM-dd", time));
+                        }
+                    }
+                    // 查询部门下的辅警
+                    dto.setFl("02");
+                    List<TbJcglXfllVo> fjList = this.tbJcglAdaptRemoteService.getXfll(dto);
+                    bb.setBmfjsl(fjList.size());
+                    int zgfjsl = fjList.size();
+                    int bzfjsl = 0;
+                    List<String> zgfj = fjList.stream().map(TbJcglXfllVo::getId).collect(Collectors.toList());
+                    List<String> bzgfj = new ArrayList<>();
+                    for (TbJcglXfllVo fj : fjList) {
+                        // 查询是否在岗（是否请休假）
+                        TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                                new LambdaQueryWrapper<TbQwQxj>()
+                                        .eq(TbQwQxj::getSqrlx, "02")
+                                        .eq(TbQwQxj::getSqrId, fj.getId())
+                                        .le(TbQwQxj::getKssj, DateUtils.getDate())
+                                        .ge(TbQwQxj::getJssj, DateUtils.getDate())
+                        );
+                        if (qxj == null) {
+                            // 保存子表数据
+                            this.setJlmxFj(fj, bb.getId(), "1", "2", DateUtils.dateTime("yyyy-MM-dd", time));
+                        } else {
+                            zgfjsl--;
+                            zgfj = zgfj.stream().filter(it -> !it.equals(fj.getId())).collect(Collectors.toList());
+                            bzfjsl++;
+                            bzgfj.add(fj.getId());
+                            this.setJlmxFj(fj, bb.getId(), "0", "5", DateUtils.dateTime("yyyy-MM-dd", time));
+                        }
+                    }
+                    bb.setZgfjsl(zgfjsl);
+                    bb.setBzgfjsl(bzfjsl);
+                    bb.setZgmjsl(zgmjsl);
+                    bb.setBzmjlsl(bzmjsl);
+                    bb.setXtSjly("1");
+                    bb.setZgmj(JSONArray.toJSONString(zgmj));
+                    bb.setBzgmj(JSONArray.toJSONString(bzgmj));
+                    bb.setZgfj(JSONArray.toJSONString(zgfj));
+                    bb.setBzgfj(JSONArray.toJSONString(bzgfj));
+                    this.baseMapper.insert(bb);
+                }
+            }
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getJlqdListToRedis(TbQwSearchJlqdDto dto) {
+        List<Map<String, Object>> resList = new ArrayList<>();
+//        TbYsGajgQuery query = new TbYsGajgQuery();
+//        query.setYsxl("001001003,001001004");
+//        query.setJd(dto.getJd());
+//        query.setWd(dto.getWd());
+//        query.setRadius(dto.getDistance());
+//        List<TbYsGajgGlbmVo> list = this.tbYszxAdaptRemoteService.getGajgList(query);
+
+        List<TbJcglXfll> list = this.tbJcglAdaptRemoteService.getBmAll();
+        if (!CollectionUtils.isEmpty(list)) {
+            for (TbJcglXfll item : list) {
+                SysDept org = this.tbBaseAdaptRemoteService.getSysDeptBySsbmdm(item.getSsbmdm());
+                Map<String, Object> map = new HashMap<>();
+                map.put("ssbmdm", org.getOrgCode());
+                map.put("ssbmid", org.getId());
+                map.put("ssbmmc", org.getOrgName());
+                map.put("ssbmjc", org.getOrgJc());
+                map.put("wzXz", org.getAddress());
+//                String ssbm = this.tbBaseAdaptRemoteService.getSsbm(org.getOrgCode(), null);
+                // 查询在岗警力数
+                int mj = this.tbQwBmjlbbJlmxMapper.selectCount(
+                        new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                                .eq(TbQwBmjlbbJlmx::getBbrq, dto.getBbrq())
+                                .eq(TbQwBmjlbbJlmx::getJllx, "01")
+                                .ne(TbQwBmjlbbJlmx::getJlzt, "0")
+                                .eq(StringUtils.isNotBlank(org.getOrgCode()),TbQwBmjlbbJlmx::getSsbmdm,org.getOrgCode())
+//                                .in(TbQwBmjlbbJlmx::getSsbmid, item.getGlbmSsbmdmList())
+                );
+                int fj = this.tbQwBmjlbbJlmxMapper.selectCount(
+                        new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                                .eq(TbQwBmjlbbJlmx::getBbrq, dto.getBbrq())
+                                .eq(TbQwBmjlbbJlmx::getJllx, "02")
+                                .ne(TbQwBmjlbbJlmx::getJlzt, "0")
+                                .eq(StringUtils.isNotBlank(org.getOrgCode()),TbQwBmjlbbJlmx::getSsbmdm,org.getOrgCode())
+//                                .in(TbQwBmjlbbJlmx::getSsbmid, item.getGlbmSsbmdmList())
+                );
+                map.put("mj", mj);
+                map.put("fj", fj);
+                map.put("jl", mj + fj);
+                // 查询该部门的值班排班或值班报备情况
+                this.getZbpb(map, item.getSsbmid());
+                resList.add(map);
+            }
+        }
+        if (dto != null) {
+            // 删除之前的数据
+            redisService.deleteObject(Constant.BMJLBB + dto.getBbrq());
+            if (!CollectionUtils.isEmpty(resList)) {
+                redisService.setCacheList(Constant.BMJLBB + dto.getBbrq(), resList);
+            }
+        }
+        return resList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getJlqdList(TbQwSearchJlqdDto dto) {
+        List<Map<String, Object>> list = redisService.getCacheList(Constant.BMJLBB + dto.getBbrq());
+        if (CollectionUtils.isEmpty(list)) return new ArrayList<>();
+        if (dto.getJd() != null && dto.getWd() != null && dto.getDistance() != null) {
+            list = list.stream().filter(item -> {
+                double jl = Kit.getDistance(Double.parseDouble(String.valueOf(item.get("jd"))),
+                        Double.parseDouble(String.valueOf(item.get("wd"))),
+                        dto.getJd().doubleValue(), dto.getWd().doubleValue());
+                item.put("distance", jl);
+                return jl <= dto.getDistance().doubleValue();
+            }).collect(Collectors.toList());
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> getZgjlCount() {
+        String ssbmdm = tbBaseAdaptRemoteService.getSsbm(null, null);
+//        UserInfo user = UserInfoManager.get();
+        TbQwBmjlbb bb = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbQwBmjlbb>()
+                        .eq(TbQwBmjlbb::getBbrq, com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01"))
+//                        .eq(TbQwBmjlbb::getSsbmid, String.valueOf(user.getDeptId()))
+                        .likeRight(StringUtils.isNotBlank(ssbmdm), TbQwBmjlbb::getSsbmdm, ssbmdm)
+                        .last(" limit 1")
+        );
+        if (bb == null) return null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgcode", bb.getSsbmdm());
+        map.put("orgid", bb.getSsbmid());
+        map.put("orgname", bb.getSsbm());
+        map.put("zgfj", bb.getZgfjsl());
+        map.put("zgmj", bb.getZgmjsl());
+        map.put("zgjl", bb.getZgfjsl() + bb.getZgmjsl());
+        return map;
+    }
+
+    private void getZbpb(Map<String, Object> map, String ssbmid) {
+        // 过去,有值班展示值班信息，没有就不展示
+        List<TbQwZbbb> bbList = this.tbQwzbbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwZbbb>()
+                        .eq(TbQwZbbb::getZbrq, com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01"))
+                        .eq(TbQwZbbb::getXtSjzt, "1")
+                        .eq(TbQwZbbb::getSsbmid, ssbmid)
+        );
+        if (bbList != null && bbList.size() != 0) {
+            map.put("zbld", bbList.get(0).getZbldXm());
+            map.put("zbldDh", bbList.get(0).getZbldDh());
+        } else {
+            List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.getDeptByMonth(new Date(), ssbmid);
+            if (zqList != null && zqList.size() > 0) {
+                map.put("zbld", zqList.get(0).getZbldXm());
+                map.put("zbldDh", zqList.get(0).getZbldDh());
+            } else {
+                map.put("zbld", "暂无");
+                map.put("zbldDh", "暂无");
+            }
+        }
+    }
+
+    // 保存警力表的数据
+    public void setJlmxFj(TbJcglXfllVo fj, String bbid, String jlzt, String bblx, Date date) {
+        // 查询是否保存了该人员今天的数据
+        TbQwBmjlbbJlmx jlmx = this.tbQwBmjlbbJlmxMapper.selectOne(
+                new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                        .eq(TbQwBmjlbbJlmx::getJlId, fj.getId())
+                        .eq(TbQwBmjlbbJlmx::getBbrq, DateUtils.dateTime(date))
+        );
+        if (jlmx != null) {
+            return;
+        }
+        // 查询该人员是否报备了值班报备
+        jlmx = new TbQwBmjlbbJlmx();
+        jlmx.setJlzt(jlzt);
+        jlmx.setBblx(bblx);
+        jlmx.setId(UUIDGenerator.getUUID());
+        jlmx.setJlbbId(bbid);
+        jlmx.setJlId(String.valueOf(fj.getId()));
+        jlmx.setJlxm(fj.getXm());
+        jlmx.setSfzh(fj.getSfzh());
+        jlmx.setJh(fj.getJh());
+        jlmx.setXbdm(fj.getXbdm());
+        jlmx.setLxdh(fj.getLxdh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(String.valueOf(fj.getSsbmdm()));
+        if (dept != null) {
+            jlmx.setSsbm(dept.getDeptname());
+            jlmx.setSsbmid(dept.getDeptid());
+            jlmx.setSsbmdm(dept.getDeptcode());
+            jlmx.setSsxgajdm(dept.getFxjcode());
+            jlmx.setSsxgajid(dept.getFxjid());
+            jlmx.setSsxgaj(dept.getFxjname());
+            jlmx.setSssgaj(dept.getDszname());
+            jlmx.setSssgajdm(dept.getDszcode());
+            jlmx.setSssgajid(dept.getDszid());
+        }
+        jlmx.setJllx("02");
+        jlmx.setBbrq(date);
+        jlmx.setXtSjly("1");
+        this.tbQwBmjlbbJlmxMapper.insert(jlmx);
+    }
+
+
+    // 保存警力表的数据
+    public void setJlmx(TbJcglXfllVo user, String bbid, String jlzt, String bblx, Date date) {
+        // 查询是否保存了该人员今天的数据
+        TbQwBmjlbbJlmx jlmx = this.tbQwBmjlbbJlmxMapper.selectOne(
+                new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                        .eq(TbQwBmjlbbJlmx::getJlId, String.valueOf(user.getId()))
+                        .eq(TbQwBmjlbbJlmx::getBbrq, DateUtils.dateTime(date))
+        );
+        if (jlmx != null) {
+            return;
+        }
+        // 查询该人员是否报备了值班报备
+        jlmx = new TbQwBmjlbbJlmx();
+        jlmx.setJlzt(jlzt);
+        jlmx.setBblx(bblx);
+        jlmx.setId(UUIDGenerator.getUUID());
+        jlmx.setJlbbId(bbid);
+        jlmx.setJlId(String.valueOf(user.getId()));
+        jlmx.setJlxm(user.getXm());
+        jlmx.setSfzh(user.getSfzh());
+        jlmx.setJh(user.getJh());
+        jlmx.setXbdm(user.getXbdm());
+        jlmx.setLxdh(user.getLxdh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(user.getSsbmdm());
+        if (dept != null) {
+            jlmx.setSsbm(dept.getDeptname());
+            jlmx.setSsbmid(dept.getDeptid());
+            jlmx.setSsbmdm(dept.getDeptcode());
+            jlmx.setSsxgajdm(dept.getFxjcode());
+            jlmx.setSsxgajid(dept.getFxjid());
+            jlmx.setSsxgaj(dept.getFxjname());
+            jlmx.setSssgaj(dept.getDszname());
+            jlmx.setSssgajdm(dept.getDszcode());
+            jlmx.setSssgajid(dept.getDszid());
+        }
+        jlmx.setJllx("01");
+        jlmx.setXtSjly("1");
+        jlmx.setBbrq(date);
+        this.tbQwBmjlbbJlmxMapper.insert(jlmx);
+    }
+
+    @Override
+    public List<Map<String, Object>> countCdepTree(String ssbmdm) {
+
+        List<Map<String, Object>> resList = new ArrayList<>();
+        ssbmdm = tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        if (StringUtils.isNotBlank(ssbmdm) && ssbmdm.length() == 2) {
+            ssbmdm = Constant.SSDSZ;
+        }
+        ssbmdm = StringUtils.rightPad(ssbmdm, 12, "0");
+        SysDept dept = this.tbBaseAdaptRemoteService.getSysDeptBySsbmdm(ssbmdm);
+        if (ObjectUtils.isNotEmpty(dept)) {
+            GetDeptListDTO dto = new GetDeptListDTO();
+            dto.setDeptid(String.valueOf(dept.getId()));
+            List<String> levle = new ArrayList<>();
+//            levle.add("30");
+//            levle.add("31");
+//            levle.add("40");
+//            levle.add("21");
+            dto.setLevels(levle);
+            List<DeptInfoVo> deptList = this.tbBaseAdaptRemoteService.getChildDept(dto);
+            if (!CollectionUtils.isEmpty(deptList)) {
+                for (DeptInfoVo item : deptList) {
+                    if (StringUtils.isNotBlank(item.getOrgLevel()) && Integer.valueOf(item.getOrgLevel()) > 20) {
+                        Map<String, Object> resMap = new HashMap<>();
+                        String ssbm = tbBaseAdaptRemoteService.getSsbm(item.getDeptcode(), null);
+                        //查询报备数据
+                        List<TbQwXfbb> xfbbList = this.tbQwXfbbMapper.selectList(new LambdaQueryWrapper<TbQwXfbb>()
+                                .likeRight(StringUtils.isNotBlank(ssbm), TbQwXfbb::getSsbmdm, ssbm)
+                                .eq(TbQwXfbb::getBbzt, "0")
+                        );
+                        int bbmj = 0;
+                        int bbfj = 0;
+
+                        if (!CollectionUtils.isEmpty(xfbbList)) {
+                            //获取人员数据
+                            bbmj = xfbbList.stream().collect(Collectors.summingInt(TbQwXfbb::getMjsl));
+                            bbfj = xfbbList.stream().collect(Collectors.summingInt(TbQwXfbb::getFjsl));
+                        }
+                        //获取未在岗数据
+                        List<TbQwQxj> qxjList = this.tbQwQxjMapper.selectList(new LambdaQueryWrapper<TbQwQxj>()
+                                .le(TbQwQxj::getKssj, new Date())
+                                .ge(TbQwQxj::getJssj, new Date())
+                                .likeRight(StringUtils.isNotBlank(ssbm), TbQwQxj::getSsbmdm, ssbm)
+                        );
+                        int qjmj = 0;
+                        int qjfj = 0;
+                        if (!CollectionUtils.isEmpty(qxjList)) {
+                            qjmj = qxjList.stream().filter(s -> s.getSqrlx().equals("1")).collect(Collectors.toList()).size();
+                            qjfj = qxjList.stream().filter(s -> s.getSqrlx().equals("2")).collect(Collectors.toList()).size();
+                        }
+                        //值班数据
+                        List<TbQwZbpb> tbQwZbpbs = this.tbQwZbpbMapper.selectList(new LambdaQueryWrapper<TbQwZbpb>()
+                                .likeRight(StringUtils.isNotBlank(ssbm), TbQwZbpb::getSsbmdm, ssbm)
+                                .le(TbQwZbpb::getZbpbksrq, new Date())
+                                .ge(TbQwZbpb::getZbpbjsrq, new Date())
+                        );
+                        int zbmj = 0;
+                        int zbfj = 0;
+                        if (!CollectionUtils.isEmpty(tbQwZbpbs)) {
+                            for (TbQwZbpb zbpb : tbQwZbpbs) {
+                                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, zbpb.getId())
+                                );
+                                if (!CollectionUtils.isEmpty(jlList)) {
+                                    zbmj += jlList.stream().filter(s -> s.getJllx().equals("01")).collect(Collectors.toList()).size();
+                                    zbfj += jlList.stream().filter(s -> s.getJllx().equals("02")).collect(Collectors.toList()).size();
+                                }
+                            }
+                        }
+                        //获取排班数据
+                        List<TbQwXfpb> xfpbList = this.tbQwXfpbMapper.selectList(new LambdaQueryWrapper<TbQwXfpb>()
+                                .likeRight(StringUtils.isNotBlank(ssbm), TbQwXfpb::getSsbmdm, ssbm)
+                                .le(TbQwXfpb::getPbksrq, new Date())
+                                .ge(TbQwXfpb::getPbjsrq, new Date())
+                        );
+                        int pbmj = 0;
+                        int pbfj = 0;
+                        if (!CollectionUtils.isEmpty(xfpbList)) {
+                            for (TbQwXfpb xfpb : xfpbList) {
+                                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, xfpb.getId())
+                                );
+                                if (!CollectionUtils.isEmpty(jlList)) {
+                                    pbmj += jlList.stream().filter(s -> s.getJllx().equals("01")).collect(Collectors.toList()).size();
+                                    pbfj += jlList.stream().filter(s -> s.getJllx().equals("02")).collect(Collectors.toList()).size();
+                                }
+                            }
+                        }
+                        //获取总民辅警
+                        TbJcglXfllQueryAllDto jcglXfllQueryAllDto = new TbJcglXfllQueryAllDto();
+                        jcglXfllQueryAllDto.setSsbmdm(item.getDeptcode());
+                        List<TbJcglXfllVo> xfll = tbJcglAdaptRemoteService.getXfll(jcglXfllQueryAllDto);
+                        int mjAll = 0;
+                        int fjAll = 0;
+                        if (!CollectionUtils.isEmpty(xfll)) {
+                            mjAll = xfll.stream().filter(s -> s.getFl().equals("01")).collect(Collectors.toList()).size();
+                            fjAll = xfll.stream().filter(s -> s.getFl().equals("02")).collect(Collectors.toList()).size();
+                        }
+                        //可抽调
+                        int kcdmj = (mjAll - pbmj - zbmj - bbmj) < 0 ? 0 : mjAll - pbmj - zbmj - bbmj;
+                        int kcdfj = (fjAll - pbfj - zbfj - bbfj) < 0 ? 0 : fjAll - pbfj - zbfj - bbfj;
+                        resMap.put("kcdmj", kcdmj);
+                        resMap.put("kcdfj", kcdfj);
+                        resMap.put("fjAll", fjAll);
+                        resMap.put("mjAll", mjAll);
+                        resMap.put("pbmj", pbmj);
+                        resMap.put("pbfj", pbfj);
+                        resMap.put("zbmj", zbmj);
+                        resMap.put("zbfj", zbfj);
+                        resMap.put("qjmj", qjmj);
+                        resMap.put("qjfj", qjfj);
+                        resMap.put("bbmj", bbmj);
+                        resMap.put("bbfj", bbfj);
+                        resMap.put("ssbmmc", item.getDeptname());
+                        resMap.put("ssbmdm", item.getDeptcode());
+                        resMap.put("ssbmid", item.getDeptid());
+                        resList.add(resMap);
+                    }
+                }
+            }
+        }
+        return resList;
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwFaServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwFaServiceImpl.java
new file mode 100644
index 0000000..325b112
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwFaServiceImpl.java
@@ -0,0 +1,108 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.jcgl.TbJcglXf;
+import com.mosty.base.model.entity.qwzx.TbQwFa;
+import com.mosty.base.model.query.jcgl.TbJcglXfQuery;
+import com.mosty.base.model.query.qwzx.TbQwFaQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.qwzx.mapper.TbQwFaMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwFaService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@Service
+public class TbQwFaServiceImpl extends ServiceImpl<TbQwFaMapper, TbQwFa>
+        implements TbQwFaService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public TbQwFa queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbQwFa> paginQuery(TbQwFaQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        Page<TbQwFa> tbJcglXfPage = this.baseMapper.selectPage(new Page<>(query.getPageCurrent(), query.getPageSize()), new LambdaQueryWrapper<TbQwFa>()
+                .likeRight(StringUtils.isNotBlank(query.getSsbmdm()), TbQwFa::getSsbmdm, query.getSsbmdm())
+                .like(StringUtils.isNotBlank(query.getFamc()), TbQwFa::getFamc, query.getFamc())
+        );
+        return tbJcglXfPage;
+    }
+
+    @Override
+    public Integer insert(TbQwFa fa) {
+
+        if (StringUtils.isEmpty(fa.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            fa.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(fa.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            fa.setSsbm(dept.getDeptname());
+            fa.setSsbmid(dept.getDeptid());
+            fa.setSsbmdm(dept.getDeptcode());
+            fa.setSsxgajdm(dept.getFxjcode());
+            fa.setSsxgajid(dept.getFxjid());
+            fa.setSsxgaj(dept.getFxjname());
+            fa.setSssgaj(dept.getDszname());
+            fa.setSssgajdm(dept.getDszcode());
+            fa.setSssgajid(dept.getDszid());
+        }
+        fa.setId(UUIDGenerator.getUUID());
+        return this.baseMapper.insert(fa);
+    }
+
+    @Override
+    public Integer update(TbQwFa fa) {
+
+        if (StringUtils.isEmpty(fa.getSsbmdm())) {
+            UserInfo userInfo = UserInfoManager.get();
+            fa.setSsbmdm(userInfo.getDeptCode());
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(fa.getSsbmdm());
+        if (ObjectUtils.isNotEmpty(dept)) {
+            fa.setSsbm(dept.getDeptname());
+            fa.setSsbmid(dept.getDeptid());
+            fa.setSsbmdm(dept.getDeptcode());
+            fa.setSsxgajdm(dept.getFxjcode());
+            fa.setSsxgajid(dept.getFxjid());
+            fa.setSsxgaj(dept.getFxjname());
+            fa.setSssgaj(dept.getDszname());
+            fa.setSssgajdm(dept.getDszcode());
+            fa.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.updateById(fa);
+    }
+
+    @Override
+    public Boolean deleteById(String id) {
+        int total = this.baseMapper.deleteById(id);
+        return total > 0;
+    }
+
+    @Override
+    public Boolean deleteByIds(List<String> id) {
+        if (!CollectionUtils.isEmpty(id)) {
+            int total = this.baseMapper.deleteBatchIds(id);
+            return total > 0;
+        }
+        return false;
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwJjrServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwJjrServiceImpl.java
new file mode 100644
index 0000000..8d38649
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwJjrServiceImpl.java
@@ -0,0 +1,62 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.qwzx.TbQwJjr;
+import com.mosty.base.model.query.qwzx.TbQwJjrQuery;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.qwzx.mapper.TbQwJjrMapper;
+import com.mosty.qwzx.service.TbQwJjrService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TbQwJjrServiceImpl extends ServiceImpl<TbQwJjrMapper, TbQwJjr>
+        implements TbQwJjrService {
+
+    @Override
+    public void add(TbQwJjr jjr) {
+        jjr.setId(UUIDGenerator.getUUID());
+        jjr.setXtSjly("1");
+        this.baseMapper.insert(jjr);
+    }
+
+    @Override
+    public void update(TbQwJjr jjr) {
+        this.baseMapper.updateById(jjr);
+    }
+
+    @Override
+    public void deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            this.baseMapper.deleteBatch(ids);
+        }
+    }
+
+    @Override
+    public void deleteByIds(String id) {
+        List<String> list = new ArrayList<String>() {{
+            this.add(id);
+        }};
+        this.baseMapper.deleteBatch(list);
+    }
+
+    @Override
+    public IPage<TbQwJjr> getPageList(TbQwJjrQuery dto) {
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbQwJjr>()
+                        .eq(StringUtils.isNotBlank(dto.getRqlx()), TbQwJjr::getRqlx, dto.getRqlx())
+                        .like(StringUtils.isNotBlank(dto.getJjrmc()), TbQwJjr::getJjrmc, dto.getJjrmc())
+                        .eq(dto.getJjrq() != null, TbQwJjr::getJjrq, dto.getJjrq())
+                        .orderByDesc(TbQwJjr::getJjrq)
+        );
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwbcServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwbcServiceImpl.java
new file mode 100644
index 0000000..fa90754
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwbcServiceImpl.java
@@ -0,0 +1,165 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.qwzx.AppSearchQuery;
+import com.mosty.base.model.dto.qwzx.TbQwQwbcEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwbc;
+import com.mosty.base.model.query.qwzx.TbQwQwbcQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.qwzx.mapper.TbQwQwbcMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwQwbcService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务班次表- 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@AllArgsConstructor
+@Service
+public class TbQwQwbcServiceImpl implements TbQwQwbcService {
+
+    private final TbQwQwbcMapper tbQwQwbcMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int addQwbc(TbQwQwbc qwbc) {
+        qwbc.setId(UUIDGenerator.getUUID());
+        qwbc.setXtSjly("1");
+        if (StringUtils.isBlank(qwbc.getSsbmdm())) throw new BusinessException("请选择部门！！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qwbc.getSsbmdm());
+        if (dept != null) {
+            qwbc.setSsbm(dept.getDeptname());
+            qwbc.setSsbmid(dept.getDeptid());
+            qwbc.setSsbmdm(dept.getDeptcode());
+            qwbc.setSsxgajdm(dept.getFxjcode());
+            qwbc.setSsxgajid(dept.getFxjid());
+            qwbc.setSsxgaj(dept.getFxjname());
+            qwbc.setSssgaj(dept.getDszname());
+            qwbc.setSssgajdm(dept.getDszcode());
+            qwbc.setSssgajid(dept.getDszid());
+        }
+//        UserInfo user = UserInfoManager.get();
+//        qwbc.setSsbm(user.getDeptName());
+//        qwbc.setSsbmid(String.valueOf(user.getDeptId()));
+//        qwbc.setSsbmdm(user.getDeptCode());
+//        qwbc.setSsxgaj(user.getFxjDeptName());
+//        qwbc.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+//        qwbc.setSsxgajdm(user.getFxjDeptCode());
+//        qwbc.setSssgaj(user.getDszDeptName());
+//        qwbc.setSssgajid(String.valueOf(user.getDszDeptId()));
+//        qwbc.setSssgajdm(user.getDszDeptCode());
+        return tbQwQwbcMapper.insert(qwbc);
+    }
+
+    @Override
+    public IPage<TbQwQwbc> getQwbc(TbQwQwbcQuery qwbc, IPage<TbQwQwbc> page) {
+        QueryWrapper<TbQwQwbc> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        qwbc.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(qwbc.getSsbmdm(), null));
+        if (qwbc != null) {
+            queryWrapper.lambda()
+                    .like(StringUtils.isNotBlank(qwbc.getBcmc()), TbQwQwbc::getBcmc, qwbc.getBcmc())
+                    .likeRight(StringUtils.isNotBlank(qwbc.getSsbmdm()), TbQwQwbc::getSsbmdm, qwbc.getSsbmdm())
+                    .ge(qwbc.getKssj() != null, TbQwQwbc::getKssj, qwbc.getKssj())
+                    .le(qwbc.getJssj() != null, TbQwQwbc::getJssj, qwbc.getJssj())
+                    .eq(StringUtils.isNotBlank(qwbc.getPbjb()), TbQwQwbc::getPbjb, qwbc.getPbjb())
+                    .eq(StringUtils.isNotBlank(qwbc.getBclx()), TbQwQwbc::getBclx, qwbc.getBclx());
+        }
+        return tbQwQwbcMapper.selectPage(page, queryWrapper);
+    }
+
+    @Override
+    public int editQwbc(TbQwQwbcEditDto qwbc) {
+        TbQwQwbc bc = new TbQwQwbc();
+        BeanUtils.copyProperties(qwbc, bc);
+        if (StringUtils.isBlank(qwbc.getSsbmdm())) throw new BusinessException("请选择部门！！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qwbc.getSsbmdm());
+        if (dept != null) {
+            bc.setSsbm(dept.getDeptname());
+            bc.setSsbmid(dept.getDeptid());
+            bc.setSsbmdm(dept.getDeptcode());
+            bc.setSsxgajdm(dept.getFxjcode());
+            bc.setSsxgajid(dept.getFxjid());
+            bc.setSsxgaj(dept.getFxjname());
+            bc.setSssgaj(dept.getDszname());
+            bc.setSssgajdm(dept.getDszcode());
+            bc.setSssgajid(dept.getDszid());
+        }
+//        UserInfo user = UserInfoManager.get();
+//        qwbc.setSsbm(user.getDeptName());
+//        qwbc.setSsbmid(String.valueOf(user.getDeptId()));
+//        qwbc.setSsbmdm(user.getDeptCode());
+//        qwbc.setSsxgaj(user.getFxjDeptName());
+//        qwbc.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+//        qwbc.setSsxgajdm(user.getFxjDeptCode());
+//        qwbc.setSssgaj(user.getDszDeptName());
+//        qwbc.setSssgajid(String.valueOf(user.getDszDeptId()));
+//        qwbc.setSssgajdm(user.getDszDeptCode());
+        return tbQwQwbcMapper.updateById(bc);
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            int rs = tbQwQwbcMapper.deleteQwbc(ids);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        int rs = tbQwQwbcMapper.deleteQwbc(ids);
+        return rs > 0;
+    }
+
+    @Override
+    public TbQwQwbc selectById(String id) {
+        return tbQwQwbcMapper.selectById(id);
+    }
+
+    @Override
+    public Page<TbQwQwbc> getBcList(AppSearchQuery dto) {
+        UserInfo user = UserInfoManager.get();
+
+        LambdaQueryWrapper<TbQwQwbc> wrapper = new LambdaQueryWrapper<TbQwQwbc>()
+                .eq(StringUtils.isNotBlank(dto.getBclx()), TbQwQwbc::getBclx, dto.getBclx())
+                .eq(TbQwQwbc::getXtSjzt, "1");
+
+        if ("1".equals(dto.getType())) {
+            wrapper.like(StringUtils.isNotBlank(dto.getKeyword()), TbQwQwbc::getBcmc, dto.getKeyword())
+                    .eq(TbQwQwbc::getSsbmdm, String.valueOf(user.getDeptCode()));
+        } else {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null);
+            wrapper.likeRight(StringUtils.isNotBlank(ssbm), TbQwQwbc::getSsbmdm, ssbm)
+                    .and(StringUtils.isNotBlank(dto.getKeyword()),
+                            it -> it.like(TbQwQwbc::getBcmc, dto.getKeyword())
+                                    .or()
+                                    .like(TbQwQwbc::getSsbm, dto.getKeyword())
+                    );
+        }
+        return this.tbQwQwbcMapper.selectPage(new Page<>(dto.getPageCurrent(), dto.getPageSize()), wrapper);
+
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwdjServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwdjServiceImpl.java
new file mode 100644
index 0000000..40623b9
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQwdjServiceImpl.java
@@ -0,0 +1,195 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.base.SysMessageInfoInsertDto;
+import com.mosty.base.model.dto.base.SysMessageItemInsertDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.dto.qwzx.TbQwQwdjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQwdj;
+import com.mosty.base.model.query.qwzx.TbQwQwdjQuery;
+import com.mosty.qwzx.mapper.TbQwQwdjMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwQwdjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 勤务等级表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@AllArgsConstructor
+@Service
+public class TbQwQwdjServiceImpl extends ServiceImpl<TbQwQwdjMapper, TbQwQwdj>
+        implements TbQwQwdjService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int addQwdj(TbQwQwdj qwdj) {
+        UserInfo user = UserInfoManager.get();
+        qwdj.setId(UUIDGenerator.getUUID());
+        qwdj.setPzrId(String.valueOf(user.getUserId()));
+        qwdj.setPzrSfzh(user.getIdEntityCard());
+        qwdj.setPzrSsbmid(String.valueOf(user.getDeptId()));
+        qwdj.setPzrSsbmdm(user.getDeptCode());
+        qwdj.setPzrSsbm(user.getDeptName());
+        qwdj.setPzrXm(user.getUserName());
+        qwdj.setFbzt("0");
+        qwdj.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qwdj.getSsbmdm());
+        if (dept != null) {
+            qwdj.setSsbm(dept.getDeptname());
+            qwdj.setSsbmid(dept.getDeptid());
+            qwdj.setSsbmdm(dept.getDeptcode());
+            qwdj.setSsxgajdm(dept.getFxjcode());
+            qwdj.setSsxgajid(dept.getFxjid());
+            qwdj.setSsxgaj(dept.getFxjname());
+            qwdj.setSssgaj(dept.getDszname());
+            qwdj.setSssgajdm(dept.getDszcode());
+            qwdj.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.insert(qwdj);
+    }
+
+    @Override
+    public IPage<TbQwQwdj> getQwdj(TbQwQwdjQuery qwdj, IPage<TbQwQwdj> page) {
+        QueryWrapper<TbQwQwdj> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        qwdj.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(qwdj.getSsbmdm(), null));
+        if (qwdj != null) {
+            queryWrapper.lambda()
+                    .likeRight(StringUtils.isNotBlank(qwdj.getSsbmdm()), TbQwQwdj::getSsbmdm, qwdj.getSsbmdm())
+                    .eq(StringUtils.isNotBlank(qwdj.getQwdj()), TbQwQwdj::getQwdj, qwdj.getQwdj())
+                    .eq(StringUtils.isNotBlank(qwdj.getZxfw()), TbQwQwdj::getZxfw, qwdj.getZxfw())
+                    .eq(StringUtils.isNotBlank(qwdj.getFbzt()), TbQwQwdj::getFbzt, qwdj.getFbzt())
+                    .eq(qwdj.getKssj() != null && qwdj.getJssj() == null, TbQwQwdj::getQwkssj, qwdj.getKssj())
+                    .eq(qwdj.getKssj() == null && qwdj.getJssj() != null, TbQwQwdj::getQwjssj, qwdj.getJssj())
+                    .between(qwdj.getKssj() != null && qwdj.getJssj() != null, TbQwQwdj::getQwkssj, qwdj.getKssj(), qwdj.getJssj())
+//                    .between(qwdj.getKssj() != null && qwdj.getJssj() != null, TbQwQwdj::getQwjssj, qwdj.getKssj(), qwdj.getJssj())
+                    .eq(TbQwQwdj::getXtScbz, "0");
+        }
+        return this.baseMapper.selectPage(page, queryWrapper);
+    }
+
+    @Override
+    public int editQwdj(TbQwQwdjEditDto qwdj) {
+        TbQwQwdj item = new TbQwQwdj();
+        BeanUtils.copyProperties(qwdj, item);
+//        UserInfo user = UserInfoManager.get();
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qwdj.getSsbmdm());
+        if (dept != null) {
+            qwdj.setSsbm(dept.getDeptname());
+            qwdj.setSsbmid(dept.getDeptid());
+            qwdj.setSsbmdm(dept.getDeptcode());
+            qwdj.setSsxgajdm(dept.getFxjcode());
+            qwdj.setSsxgajid(dept.getFxjid());
+            qwdj.setSsxgaj(dept.getFxjname());
+            qwdj.setSssgaj(dept.getDszname());
+            qwdj.setSssgajdm(dept.getDszcode());
+            qwdj.setSssgajid(dept.getDszid());
+        }
+//        item.setSsbm(user.getDeptName());
+//        item.setSsbmid(String.valueOf(user.getDeptId()));
+//        item.setSsbmdm(user.getDeptCode());
+//        item.setSsxgaj(user.getFxjDeptName());
+//        item.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+//        item.setSsxgajdm(user.getFxjDeptCode());
+//        item.setSssgaj(user.getDszDeptName());
+//        item.setSssgajid(String.valueOf(user.getDszDeptId()));
+//        item.setSssgajdm(user.getDszDeptCode());
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            int rs = this.baseMapper.deleteQwdj(ids);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        int rs = this.baseMapper.deleteQwdj(ids);
+        return rs > 0;
+    }
+
+    @Override
+    public TbQwQwdj selectById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public boolean publishQwdj(String id) {
+        TbQwQwdj qwdj = this.baseMapper.selectById(id);
+        qwdj.setFbsj(new Date());
+        qwdj.setFbzt("1");
+        int rs = this.baseMapper.updateById(qwdj);
+        if (rs > 0) {
+            //发布任务以后通知人员信息 数据较多 使用线程方式下发
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    //获取部门下面的所有人员
+                    List<SysUserDeptVO> list = new ArrayList<>();
+                    if (StringUtils.isNotEmpty(qwdj.getSfxj()) && qwdj.getSfxj().equals("1")) {
+                        list = tbBaseAdaptRemoteService.getUserAll(qwdj.getSsbmid());
+                    } else {
+                        list = tbBaseAdaptRemoteService.getUserList(qwdj.getSsbmid());
+                    }
+                    if (!CollectionUtils.isEmpty(list)) {
+                        SysMessageInfoInsertDto dto = new SysMessageInfoInsertDto();
+                        List<SysMessageItemInsertDto> itemList = new ArrayList<>();
+                        list.forEach(item -> {
+                            SysMessageItemInsertDto itemDto = new SysMessageItemInsertDto();
+                            itemDto.setXxjsrXm(item.getUserName());
+                            itemDto.setXxjsrSfzh(item.getIdEntityCard());
+                            itemDto.setXxjsrId(String.valueOf(item.getId()));
+                            itemDto.setXxjsbm(qwdj.getSsbm());
+                            itemDto.setXxjsbmId(qwdj.getSsbmid());
+                            itemList.add(itemDto);
+                        });
+                        if (itemList.size() > 0) {
+                            dto.setItemList(itemList);
+                            String xxnr = qwdj.getPzrSsbm() + "（" + qwdj.getPzrXm() + "）下发:" + qwdj.getQwdjmc() + ",勤务时间：" + DateUtils.getQueryDateString(qwdj.getQwkssj(), "02") + "-" + DateUtils.getQueryDateString(qwdj.getQwjssj(), "02") + ",请注意查收！";
+                            dto.setXxnr(xxnr);
+                            dto.setXxlx("1");
+                            dto.setXxzt("2");
+                            tbBaseAdaptRemoteService.sendMsg(dto);
+                        }
+                    }
+                }
+            }).start();
+        }
+        return rs > 0;
+    }
+
+    @Override
+    public TbQwQwdj queryCurrentQwdj(String dateTime) {
+        return this.baseMapper.queryCurrentQwdj(dateTime);
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQxjServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQxjServiceImpl.java
new file mode 100644
index 0000000..06754cf
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwQxjServiceImpl.java
@@ -0,0 +1,324 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.entity.bkzx.TbBkRy;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbb;
+import com.mosty.base.model.entity.qwzx.TbQwBmjlbbJlmx;
+import com.mosty.base.model.query.qwzx.TbQwQxjMyQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.dto.qwzx.TbQwQxjEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwQxj;
+import com.mosty.base.model.query.qwzx.TbQwQxjQuery;
+import com.mosty.qwzx.mapper.TbQwBmjlbbJlmxMapper;
+import com.mosty.qwzx.mapper.TbQwBmjlbbMapper;
+import com.mosty.qwzx.mapper.TbQwQxjMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwQxjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@AllArgsConstructor
+@Service
+public class TbQwQxjServiceImpl implements TbQwQxjService {
+
+    private final TbQwQxjMapper tbQwQxjMapper;
+    private final TbQwBmjlbbJlmxMapper tbQwBmjlbbJlmxMapper;
+    private final TbQwBmjlbbMapper tbQwBmjlbbMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    @Transactional
+    public int addQxj(TbQwQxj qxj) {
+        if (StringUtils.isBlank(qxj.getSqbmdm())) throw new BusinessException("请选择申请人部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qxj.getSqbmdm());
+//        if (dept != null) {
+//            qxj.setSsbmid(dept.getDeptid());
+//            qxj.setSqbmdm(dept.getDeptcode());
+//            qxj.setSqbm(dept.getDeptname());
+//        }
+        // 查询该人员同时段是否有请修改数据
+        List<TbQwQxj> list = this.tbQwQxjMapper.selectList(
+                new LambdaQueryWrapper<TbQwQxj>()
+                        .eq(TbQwQxj::getSqrId, qxj.getSqrId())
+                        .eq(TbQwQxj::getXtScbz, "0")
+                        .eq(TbQwQxj::getXtSjzt, "1")
+                        .and(
+                                t -> t.between(TbQwQxj::getKssj, qxj.getKssj(), qxj.getJssj()).or()
+                                        .between(TbQwQxj::getJssj, qxj.getKssj(), qxj.getJssj())
+                        )
+        );
+        if (list.size() > 0) {
+            throw new BusinessException("该人员同时段有请休假数据，添加失败！");
+        }
+        qxj.setId(UUIDGenerator.getUUID());
+        qxj.setXtSjly("1");
+        int time = (int) ((qxj.getJssj().getTime() - qxj.getKssj().getTime()) / 24 / 60 / 60 / 1000) + 1;
+        qxj.setQjsc(time);
+        if (dept != null) {
+            qxj.setSsbm(dept.getDeptname());
+            qxj.setSsbmid(dept.getDeptid());
+            qxj.setSsbmdm(dept.getDeptcode());
+            qxj.setSsxgajdm(dept.getFxjcode());
+            qxj.setSsxgajid(dept.getFxjid());
+            qxj.setSsxgaj(dept.getFxjname());
+            qxj.setSssgaj(dept.getDszname());
+            qxj.setSssgajdm(dept.getDszcode());
+            qxj.setSssgajid(dept.getDszid());
+        }
+        this.setBmjlbb(qxj);
+        return tbQwQxjMapper.insert(qxj);
+    }
+
+    private void setBmjlbb(TbQwQxj qxj) {
+        // 更新部门警力报备数据
+        Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+        if (now.getTime() >= qxj.getKssj().getTime() && now.getTime() <= qxj.getJssj().getTime()) {
+            TbQwBmjlbbJlmx jlmx = this.tbQwBmjlbbJlmxMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                            .eq(TbQwBmjlbbJlmx::getJlId, qxj.getSqrId())
+                            .eq(TbQwBmjlbbJlmx::getBbrq, DateUtils.getQueryDateString(now, "01"))
+                            .eq(TbQwBmjlbbJlmx::getJllx, qxj.getSqrlx())
+            );
+            if (jlmx != null) {
+                jlmx.setJlzt("0");
+                jlmx.setBblx("01".equals(qxj.getSqrlx()) ? "4" : "5");
+                this.tbQwBmjlbbJlmxMapper.updateById(jlmx);
+            }
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qxj.getSsbmdm());
+            List<TbQwBmjlbb> bbList = this.tbQwBmjlbbMapper.selectList(
+                    new LambdaQueryWrapper<TbQwBmjlbb>()
+                            .eq(TbQwBmjlbb::getBbrq, DateUtils.getQueryDateString(now, "01"))
+                            .and(
+                                    it -> it.eq(TbQwBmjlbb::getSsbmdm, dept.getDeptcode()).or()
+                                            .eq(TbQwBmjlbb::getSsbmdm, dept.getFxjcode()).or()
+                                            .eq(TbQwBmjlbb::getSsbmdm, dept.getDszcode())
+                            )
+            );
+            bbList.forEach(item -> {
+                if ("01".equals(qxj.getSqrlx())) {
+                    // 删除在岗民警
+                    item.setZgmjsl(item.getZgmjsl() - 1);
+                    List<String> zgmjList = JSON.parseArray(item.getZgmj()).toJavaList(String.class);
+                    zgmjList.remove(qxj.getSqrId());
+                    item.setZgmj(JSON.toJSONString(zgmjList));
+                    // 添加不在岗民警
+                    List<String> bzgmjList = JSON.parseArray(item.getBzgmj()).toJavaList(String.class);
+                    bzgmjList.add(qxj.getSqrId());
+                    item.setBzgmj(JSON.toJSONString(bzgmjList));
+                } else {
+                    // 删除在岗辅警
+                    item.setZgfjsl(item.getZgfjsl() - 1);
+                    List<String> zgfjList = JSON.parseArray(item.getZgfj()).toJavaList(String.class);
+                    zgfjList.remove(qxj.getSqrId());
+                    item.setZgfj(JSON.toJSONString(zgfjList));
+                    // 添加在岗辅警
+                    List<String> bzgfjList = JSON.parseArray(item.getBzgfj()).toJavaList(String.class);
+                    bzgfjList.add(qxj.getSqrId());
+                    item.setBzgfj(JSON.toJSONString(bzgfjList));
+                }
+                this.tbQwBmjlbbMapper.updateById(item);
+            });
+        }
+    }
+
+    @Override
+    public IPage<TbQwQxj> getQxj(TbQwQxjQuery qxj, IPage<TbQwQxj> page) {
+        QueryWrapper<TbQwQxj> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        qxj.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(qxj.getSsbmdm(), null));
+        if (qxj != null) {
+            queryWrapper.lambda().eq(StringUtils.isNotBlank(qxj.getSqrlx()), TbQwQxj::getSqrlx, qxj.getSqrlx())
+                    .eq(StringUtils.isNotBlank(qxj.getSqbmdm()), TbQwQxj::getSqbmdm, qxj.getSqbmdm())
+                    .eq(StringUtils.isNotBlank(qxj.getSqbmid()), TbQwQxj::getSqbmid, qxj.getSqbmid())
+                    .likeRight(StringUtils.isNotBlank(qxj.getSsbmdm()), TbQwQxj::getSsbmdm, qxj.getSsbmdm())
+                    .eq(StringUtils.isNotBlank(qxj.getQjlx()), TbQwQxj::getQjlx, qxj.getQjlx())
+                    .like(StringUtils.isNotBlank(qxj.getSqrXm()), TbQwQxj::getSqrXm, qxj.getSqrXm())
+                    .like(StringUtils.isNotBlank(qxj.getLxdh()), TbQwQxj::getLxdh, qxj.getLxdh())
+                    .orderByDesc(TbQwQxj::getXtCjsj);
+            if (qxj.getKssj() != null) {
+                queryWrapper.lambda().le(TbQwQxj::getKssj, qxj.getKssj());
+            }
+            if (qxj.getJssj() != null) {
+                queryWrapper.lambda().ge(TbQwQxj::getJssj, qxj.getJssj());
+            }
+        }
+        return tbQwQxjMapper.selectPage(page, queryWrapper);
+    }
+
+    @Override
+    @Transactional
+    public int editQxj(TbQwQxjEditDto qxj) {
+        if (StringUtils.isBlank(qxj.getSqbmdm())) throw new BusinessException("请选择申请人部门！");
+        // 暂时规定，时间开始不能删除和修改
+        Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+        if (now.getTime() >= qxj.getKssj().getTime() && now.getTime() <= qxj.getJssj().getTime()) {
+            throw new BusinessException("请假设置时间已到，不能修改数据");
+        }
+        // 查询该人员同时段是否有请修改数据
+        List<TbQwQxj> list = this.tbQwQxjMapper.selectList(
+                new LambdaQueryWrapper<TbQwQxj>()
+                        .eq(TbQwQxj::getSqrId, qxj.getSqrId())
+                        .eq(TbQwQxj::getXtSjzt, "1")
+                        .ne(TbQwQxj::getId, qxj.getId())
+                        .and(
+                                t -> t.between(TbQwQxj::getKssj, qxj.getKssj(), qxj.getJssj()).or()
+                                        .between(TbQwQxj::getJssj, qxj.getKssj(), qxj.getJssj())
+                        )
+        );
+        if (list.size() > 0) {
+            throw new BusinessException("该人员同时段有请休假数据，添加失败！");
+        }
+        int time = (int) ((qxj.getJssj().getTime() - qxj.getKssj().getTime()) / 24 / 60 / 60 / 1000) + 1;
+        qxj.setQjsc(time);
+        TbQwQxj item = new TbQwQxj();
+        BeanUtils.copyProperties(qxj, item);
+        // 清除之前的人的数据
+        this.deleteOldBmjlbb(qxj.getId());
+        // 添加新的数据
+        this.setBmjlbb(item);
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSqbmdm());
+        if (dept != null) {
+            qxj.setSsbm(dept.getDeptname());
+            qxj.setSsbmid(dept.getDeptid());
+            qxj.setSsbmdm(dept.getDeptcode());
+            qxj.setSsxgajdm(dept.getFxjcode());
+            qxj.setSsxgajid(dept.getFxjid());
+            qxj.setSsxgaj(dept.getFxjname());
+            qxj.setSssgaj(dept.getDszname());
+            qxj.setSssgajdm(dept.getDszcode());
+            qxj.setSssgajid(dept.getDszid());
+        }
+        return tbQwQxjMapper.updateById(item);
+    }
+
+    private void deleteOldBmjlbb(String id) {
+        TbQwQxj qxj = this.tbQwQxjMapper.selectById(id);
+        Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+        if (now.getTime() >= qxj.getKssj().getTime() && now.getTime() <= qxj.getJssj().getTime()) {
+            TbQwBmjlbbJlmx jlmx = this.tbQwBmjlbbJlmxMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwBmjlbbJlmx>()
+                            .eq(TbQwBmjlbbJlmx::getJlId, qxj.getSqrId())
+                            .eq(TbQwBmjlbbJlmx::getBbrq, DateUtils.getQueryDateString(now, "01"))
+                            .eq(TbQwBmjlbbJlmx::getJllx, qxj.getSqrlx())
+            );
+            if (jlmx != null) {
+                jlmx.setJlzt("1");
+                jlmx.setBblx("01".equals(qxj.getSqrlx()) ? "1" : "2");
+                this.tbQwBmjlbbJlmxMapper.updateById(jlmx);
+            }
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(qxj.getSqbmdm());
+            List<TbQwBmjlbb> bbList = this.tbQwBmjlbbMapper.selectList(
+                    new LambdaQueryWrapper<TbQwBmjlbb>()
+                            .eq(TbQwBmjlbb::getBbrq, DateUtils.getQueryDateString(now, "01"))
+                            .and(it -> it.eq(TbQwBmjlbb::getSsbmdm, dept.getDeptcode()).or()
+                                    .eq(TbQwBmjlbb::getSsbmdm, dept.getFxjcode()).or()
+                                    .eq(TbQwBmjlbb::getSsbmdm, dept.getDszcode())
+                            )
+            );
+            bbList.forEach(item -> {
+                if ("01".equals(qxj.getSqrlx())) {
+                    // 添加在岗民警
+                    item.setZgmjsl(item.getZgmjsl() + 1);
+                    List<String> zgmjList = JSON.parseArray(item.getZgmj()).toJavaList(String.class);
+                    zgmjList.add(qxj.getSqrId());
+                    item.setZgmj(JSON.toJSONString(zgmjList));
+                    // 删除不在岗民警
+                    List<String> bzgmjList = JSON.parseArray(item.getBzgmj()).toJavaList(String.class);
+                    bzgmjList.remove(qxj.getSqrId());
+                    item.setBzgmj(JSON.toJSONString(bzgmjList));
+                } else {
+                    // 删除在岗辅警
+                    item.setZgfjsl(item.getZgfjsl() + 1);
+                    List<String> zgfjList = JSON.parseArray(item.getZgfj()).toJavaList(String.class);
+                    zgfjList.add(qxj.getSqrId());
+                    item.setZgfj(JSON.toJSONString(zgfjList));
+                    // 添加在岗辅警
+                    List<String> bzgfjList = JSON.parseArray(item.getBzgfj()).toJavaList(String.class);
+                    bzgfjList.remove(qxj.getSqrId());
+                    item.setBzgfj(JSON.toJSONString(bzgfjList));
+                }
+                this.tbQwBmjlbbMapper.updateById(item);
+            });
+        }
+    }
+
+    @Override
+    @Transactional
+    public boolean deleteBatch(List<String> ids) {
+        List<TbQwQxj> list = this.tbQwQxjMapper.selectList(
+                new LambdaQueryWrapper<TbQwQxj>()
+                        .in(TbQwQxj::getId, ids)
+        );
+        list.forEach(item -> {
+            Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+            if (now.getTime() >= item.getKssj().getTime() && now.getTime() <= item.getJssj().getTime()) {
+                throw new BusinessException("请假设置时间已到，不能删除数据");
+            }
+            // 清除之前的人的数据
+            this.deleteOldBmjlbb(item.getId());
+        });
+        if (ids.size() > 0) {
+            int rs = tbQwQxjMapper.deleteQxj(ids);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        TbQwQxj qxj = this.tbQwQxjMapper.selectById(id);
+        Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+        if (now.getTime() >= qxj.getKssj().getTime() && now.getTime() <= qxj.getJssj().getTime()) {
+            throw new BusinessException("请假设置时间已到，不能删除数据");
+        }
+        this.deleteOldBmjlbb(id);
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        return tbQwQxjMapper.deleteQxj(ids) > 0;
+    }
+
+    @Override
+    public TbQwQxj selectById(String id) {
+        return tbQwQxjMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbQwQxj> getMyQxjList(TbQwQxjMyQuery dto) {
+        UserInfo user = UserInfoManager.get();
+        return this.tbQwQxjMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbQwQxj>()
+                        .eq(TbQwQxj::getSqrId, String.valueOf(user.getUserId()))
+                        .eq(StringUtils.isNotBlank(dto.getQjlx()), TbQwQxj::getQjlx, dto.getQjlx())
+                        .and(dto.getKssj() != null && dto.getJssj() != null,
+                                t -> t.between(TbQwQxj::getKssj, dto.getKssj(), dto.getJssj()).or()
+                                        .between(TbQwQxj::getJssj, dto.getKssj(), dto.getJssj())
+                        )
+                        .orderByDesc(TbQwQxj::getXtCjsj)
+        );
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwSpsCsdwServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwSpsCsdwServiceImpl.java
new file mode 100644
index 0000000..5dff373
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwSpsCsdwServiceImpl.java
@@ -0,0 +1,129 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwSpsHdgjChangeDto;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdw;
+import com.mosty.base.model.entity.qwzx.TbQwSpsCsdwhdgj;
+import com.mosty.base.model.query.qwzx.TbQwSpsCsdwQuery;
+import com.mosty.base.model.vo.qwzx.TbQwSpsCsdwVo;
+import com.mosty.base.model.vo.qwzx.TbQwSpsCsdwhdgjVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.qwzx.mapper.TbQwSpsCsdwMapper;
+import com.mosty.qwzx.mapper.TbQwSpsCsdwhdgjMapper;
+import com.mosty.qwzx.service.TbQwSpsCsdwService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/17
+ **/
+@Service
+@AllArgsConstructor
+public class TbQwSpsCsdwServiceImpl extends ServiceImpl<TbQwSpsCsdwMapper, TbQwSpsCsdw>
+        implements TbQwSpsCsdwService {
+
+    private final TbQwSpsCsdwhdgjMapper tbQwSpsCsdwhdgjMapper;
+
+    @Override
+    public Object getList(TbQwSpsCsdwQuery dto) {
+        List<String> dqwzList = null;
+        if (dto.getDqwzs() != null) {
+            dqwzList = Arrays.asList(dto.getDqwzs().split(","));
+        }
+        if (dto.getPageCurrent() == null || dto.getPageSize() == null) {
+            return this.baseMapper.selectList(
+                    new LambdaQueryWrapper<TbQwSpsCsdw>()
+                            .in(!CollectionUtils.isEmpty(dqwzList), TbQwSpsCsdw::getDqwz, dqwzList)
+                            .like(StringUtils.isNotBlank(dto.getCddwmc()), TbQwSpsCsdw::getCddwmc, dto.getCddwmc())
+                            .eq(StringUtils.isNotBlank(dto.getSsxz()), TbQwSpsCsdw::getSsxz, dto.getSsxz())
+            );
+        } else {
+            return this.baseMapper.selectPage(
+                    new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                    new LambdaQueryWrapper<TbQwSpsCsdw>()
+                            .in(!CollectionUtils.isEmpty(dqwzList), TbQwSpsCsdw::getDqwz, dqwzList)
+                            .like(StringUtils.isNotBlank(dto.getCddwmc()), TbQwSpsCsdw::getCddwmc, dto.getCddwmc())
+                            .eq(StringUtils.isNotBlank(dto.getSsxz()), TbQwSpsCsdw::getSsxz, dto.getSsxz())
+            );
+        }
+    }
+
+    @Override
+    public TbQwSpsCsdwVo getCsdwInfo(String id) {
+        TbQwSpsCsdw dw = this.baseMapper.selectById(id);
+        if (dw == null) {
+            throw new BusinessException("没有查询到参赛队伍信息");
+        }
+        TbQwSpsCsdwVo vo = new TbQwSpsCsdwVo();
+        BeanUtils.copyProperties(dw, vo);
+        TbQwSpsCsdwhdgj gj = this.tbQwSpsCsdwhdgjMapper.selectOne(
+                new LambdaQueryWrapper<TbQwSpsCsdwhdgj>()
+                        .eq(TbQwSpsCsdwhdgj::getCddwid, id)
+                        .orderByDesc(TbQwSpsCsdwhdgj::getHdsj)
+                        .last(" limit 1")
+        );
+        if (gj != null) {
+            TbQwSpsCsdwhdgjVo gjVo = new TbQwSpsCsdwhdgjVo();
+            BeanUtils.copyProperties(gj, gjVo);
+            vo.setGjVo(gjVo);
+        }
+        return vo;
+    }
+
+    @Override
+    @Transactional
+    public void changeHdgj(TbQwSpsHdgjChangeDto dto) {
+        UserInfo user = UserInfoManager.get();
+        List<String> ids = dto.getIds();
+        ids.forEach(id -> {
+            TbQwSpsCsdw dw = this.baseMapper.selectById(id);
+            if (dw != null) {
+                dw.setDqwz(dto.getHdlx());
+                dw.setDqwzsj(new Date());
+                if (user != null) {
+                    dw.setSsbmdm(String.valueOf(user.getDeptId()));
+                    dw.setSsbm(user.getDeptName());
+                    dw.setSsxgaj(user.getFxjDeptName());
+                    dw.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                    dw.setSssgaj(user.getDszDeptName());
+                    dw.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                }
+                dw.setXtSjly("2");
+                this.baseMapper.updateById(dw);
+                TbQwSpsCsdwhdgj gj = new TbQwSpsCsdwhdgj();
+                gj.setCddwid(id);
+                gj.setCddwmc(dw.getCddwmc());
+                gj.setSsxz(dw.getSsxz());
+                gj.setHdlx(dto.getHdlx());
+                gj.setHdrq(new Date());
+                gj.setHdsj(new Date());
+                if (user != null) {
+                    gj.setSsbmdm(String.valueOf(user.getDeptId()));
+                    gj.setSsbm(user.getDeptName());
+                    gj.setSsxgaj(user.getFxjDeptName());
+                    gj.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                    gj.setSssgaj(user.getDszDeptName());
+                    gj.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                }
+                gj.setXtSjly("2");
+                this.tbQwSpsCsdwhdgjMapper.insert(gj);
+            }
+        });
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfBxfsqServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfBxfsqServiceImpl.java
new file mode 100644
index 0000000..f0ce4e9
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfBxfsqServiceImpl.java
@@ -0,0 +1,127 @@
+package com.mosty.qwzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.dto.qwzx.TbQwBxfsqEditDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.mosty.base.model.query.qwzx.TbQwXfBxfsqQuery;
+import com.mosty.qwzx.mapper.TbQwXfBxfsqMapper;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwXfBxfsqService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class TbQwXfBxfsqServiceImpl extends ServiceImpl<TbQwXfBxfsqMapper, TbQwXfBxfsq>
+        implements TbQwXfBxfsqService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int addBxfsq(TbQwXfBxfsq bxfsq) {
+        bxfsq.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isBlank(bxfsq.getSqbmid())) throw new BusinessException("请选择申请部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bxfsq.getSqbmid());
+        bxfsq.setSsbm(dept.getDeptname());
+        bxfsq.setSsbmid(dept.getDeptid());
+        bxfsq.setSsbmdm(dept.getDeptcode());
+        bxfsq.setSsxgajdm(dept.getFxjcode());
+        bxfsq.setSsxgajid(dept.getFxjid());
+        bxfsq.setSsxgaj(dept.getFxjname());
+        bxfsq.setSssgaj(dept.getDszname());
+        bxfsq.setSssgajdm(dept.getDszcode());
+        bxfsq.setSssgajid(dept.getDszid());
+        bxfsq.setXtSjly("1");
+        bxfsq.setSqsj(new Date());
+        bxfsq.setShzt("0");
+        return this.baseMapper.insert(bxfsq);
+    }
+
+    @Override
+    public IPage<TbQwXfBxfsq> getBxfsq(TbQwXfBxfsqQuery bxfsq, IPage<TbQwXfBxfsq> page) {
+        QueryWrapper<TbQwXfBxfsq> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        bxfsq.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(bxfsq.getSsbmdm(), null));
+
+        qw.lambda().eq(StringUtils.isNotBlank(bxfsq.getXfpbId()), TbQwXfBxfsq::getXfpbId, bxfsq.getXfpbId())
+                .like(StringUtils.isNotBlank(bxfsq.getSqrXm()), TbQwXfBxfsq::getSqrXm, bxfsq.getSqrXm())
+                .likeRight(StringUtils.isNotBlank(bxfsq.getSsbmdm()), TbQwXfBxfsq::getSsbmdm, bxfsq.getSsbmdm())
+                .eq(StringUtils.isNotBlank(bxfsq.getSqbmdm()), TbQwXfBxfsq::getSqbmdm, bxfsq.getSqbmdm())
+                .eq(StringUtils.isNotBlank(bxfsq.getSqbmid()), TbQwXfBxfsq::getSqbmid, bxfsq.getSqbmid())
+                .eq(StringUtils.isNotBlank(bxfsq.getShbmdm()), TbQwXfBxfsq::getShbmdm, bxfsq.getShbmdm())
+                .eq(StringUtils.isNotBlank(bxfsq.getShbmid()), TbQwXfBxfsq::getShbmid, bxfsq.getShbmid())
+                .eq(StringUtils.isNotBlank(bxfsq.getShzt()), TbQwXfBxfsq::getShzt, bxfsq.getShzt())
+                .ge(bxfsq.getKssj() != null, TbQwXfBxfsq::getBxfsj, bxfsq.getKssj())
+                .le(bxfsq.getJssj() != null, TbQwXfBxfsq::getBxfsj, bxfsq.getJssj());
+        return this.baseMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public int editBxfsq(TbQwXfBxfsq bxfsq) {
+        TbQwXfBxfsq item = new TbQwXfBxfsq();
+        BeanUtils.copyProperties(bxfsq, item);
+        if (StringUtils.isBlank(bxfsq.getSqbmid())) throw new BusinessException("请选择申请部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bxfsq.getSqbmid());
+        item.setSsbm(dept.getDeptname());
+        item.setSsbmid(dept.getDeptid());
+        item.setSsbmdm(dept.getDeptcode());
+        item.setSsxgajdm(dept.getFxjcode());
+        item.setSsxgajid(dept.getFxjid());
+        item.setSsxgaj(dept.getFxjname());
+        item.setSssgaj(dept.getDszname());
+        item.setSssgajdm(dept.getDszcode());
+        item.setSssgajid(dept.getDszid());
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            int rs = this.baseMapper.deleteBxfsq(ids);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        int rs = this.baseMapper.deleteBxfsq(ids);
+        return rs > 0;
+    }
+
+    @Override
+    public TbQwXfBxfsq selectById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int judge(TbQwBxfsqEditDto dto) {
+        TbQwXfBxfsq item = new TbQwXfBxfsq();
+        BeanUtils.copyProperties(dto, item);
+        UserInfo user = UserInfoManager.get();
+        item.setShrId(String.valueOf(user.getUserId()));
+        item.setShrXm(user.getUserName());
+        item.setShbm(user.getDeptName());
+        item.setShbmid(String.valueOf(user.getDeptId()));
+        item.setShbmdm(user.getDeptCode());
+        item.setSpsj(new Date());
+        return this.baseMapper.updateById(item);
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java
new file mode 100644
index 0000000..c57573c
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java
@@ -0,0 +1,1247 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.dto.qwzx.*;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.base.model.entity.lzother.BphJlxx;
+import com.mosty.base.model.entity.qwzx.*;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
+import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbQuery;
+import com.mosty.base.model.query.sjzx.XfbbTjQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.qwzx.mapper.*;
+import com.mosty.qwzx.remote.*;
+import com.mosty.qwzx.service.TbQwXfbbService;
+import com.vividsolutions.jts.algorithm.PointLocator;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.operation.buffer.BufferOp;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.zip.Inflater;
+
+
+/**
+ * <p>
+ * 巡防报备表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@AllArgsConstructor
+@Service
+public class TbQwXfbbServiceImpl extends ServiceImpl<TbQwXfbbMapper, TbQwXfbb> implements TbQwXfbbService {
+
+    private final TbQwXfbbMapper tbQwXfbbMapper;
+    private final TbQwJlMapper tbQwJlMapper;
+    private final TbQwClMapper tbQwClMapper;
+    private final TbQwZnzbMapper tbQwZnzbMapper;
+    private final TbQwJyqxMapper tbQwJyqxMapper;
+    private final TbYszxAdaptRemoteService tbYszxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwxfbbDkMapper tbQwxfbbDkMapper;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final RedisService redisService;
+    private final TbQwXffwMapper tbQwXffwMapper;
+    private final TbLzotherAdaptRemoteService tbLzotherAdaptRemoteService;
+    private final TbWebSocketAdaptRemoteService tbWebSocketAdaptRemoteService;
+
+    @Override
+    public IPage<TbQwXfbbVo> queryList(TbQwXfbbQuery xfbb) {
+//        UserInfo userInfo = UserInfoManager.get();
+        IPage<TbQwXfbbVo> page = PageUtils.buildPage(xfbb.getPageSize(), xfbb.getPageCurrent());
+//         tbQwXfbbMapper.queryList(page, xfbb, PermissionsUtil.createSql("a", userInfo));
+        xfbb.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(xfbb.getSsbmdm(), null));
+        return tbQwXfbbMapper.queryList(page, xfbb);
+
+    }
+
+    @Override
+    public TbQwXfbbVo selectById(String id) {
+        TbQwXfbbVo vo = new TbQwXfbbVo();
+        TbQwXfbb xfbb = this.tbQwXfbbMapper.selectById(id);
+        BeanUtils.copyProperties(xfbb, vo);
+        List<TbQwJl> jlList = this.tbQwJlMapper.queryListByYwid(Collections.singletonList(id));
+        List<TbQwCl> clList = this.tbQwClMapper.queryListByYwid(Collections.singletonList(id));
+        List<TbQwZnzb> znzbList = this.tbQwZnzbMapper.queryListByYwid(Collections.singletonList(id));
+        List<TbQwJyqx> jyqxList = this.tbQwJyqxMapper.queryListByYwid(Collections.singletonList(id));
+        List<TbQwXffw> xffwList = this.tbQwXffwMapper.selectList(
+                new LambdaQueryWrapper<TbQwXffw>()
+                        .eq(TbQwXffw::getYwid, id)
+                        .eq(TbQwXffw::getXtSjzt, "1")
+        );
+        if (!CollectionUtils.isEmpty(xffwList)) {
+            List<TbQwXffwDto> xffwDtoList = new ArrayList<>();
+            xffwList.forEach(item -> {
+                TbQwXffwDto dto = new TbQwXffwDto();
+                BeanUtils.copyProperties(item, dto);
+                xffwDtoList.add(dto);
+            });
+            vo.setXffwList(xffwDtoList);
+        }
+        vo.setJlList(jlList);
+        vo.setClList(clList);
+        vo.setZnzbList(znzbList);
+        vo.setJyqxList(jyqxList);
+        return vo;
+    }
+
+    @Override
+    public String addXfbb(TbQwXfbbVo xfbbVo) {
+        if (StringUtils.isBlank(xfbbVo.getSsbmdm())) throw new BusinessException("请选择巡防部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xfbbVo.getSsbmdm());
+        if (xfbbVo.getJd() == null || xfbbVo.getWd() == null) {
+            xfbbVo.setJd(Constant.JD);
+            xfbbVo.setWd(Constant.WD);
+        }
+        TbQwXfbb xfbb = new TbQwXfbb();
+        BeanUtils.copyProperties(xfbbVo, xfbb);
+        if (StringUtils.isBlank(xfbb.getBblx())) {
+            xfbb.setBblx("01");
+        }
+        if (StringUtils.isBlank(xfbb.getQwlx())) {
+            xfbb.setQwlx("00");
+        }
+        xfbb.setZb(JtsUtils.getPoint(xfbb.getJd(), xfbb.getWd()));
+        xfbb.setZbhash(GeoHashKit.encode(xfbb.getJd(), xfbb.getWd()));
+        xfbb.setId(UUIDGenerator.getUUID());
+        saveRelevanceData(xfbb, xfbbVo, xfbb.getId(), dept);
+        xfbb.setXfbm(dept.getDeptname());
+        xfbb.setXfbmid(dept.getDeptid());
+        xfbb.setXfbmdm(dept.getDeptcode());
+        xfbb.setSsbm(dept.getDeptname());
+        xfbb.setSsbmid(dept.getDeptid());
+        xfbb.setSsbmdm(dept.getDeptcode());
+        xfbb.setSsxgajdm(dept.getFxjcode());
+        xfbb.setSsxgajid(dept.getFxjid());
+        xfbb.setSsxgaj(dept.getFxjname());
+        xfbb.setSssgaj(dept.getDszname());
+        xfbb.setSssgajdm(dept.getDszcode());
+        xfbb.setSssgajid(dept.getDszid());
+        xfbb.setXfsc(0);
+        xfbb.setXflc(0);
+        xfbb.setZbsj(new Date());
+        xfbb.setXtSjly("2");
+        tbQwXfbbMapper.insertEntity(xfbb);
+        return xfbb.getId();
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            for (String id : ids) {
+                deleteRelevanceData(id);
+            }
+            int rs = tbQwXfbbMapper.deleteXfbb(ids);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        deleteRelevanceData(id);
+        List<String> ids = new ArrayList<>();
+        ids.add(id);
+        int rs = tbQwXfbbMapper.deleteXfbb(ids);
+        return rs > 0;
+    }
+
+    @Override
+    public Map<String, Integer> selectDeck() {
+//        UserInfo userInfo = UserInfoManager.get();
+
+        TbQwXzSearchDto dto = new TbQwXzSearchDto();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        // 查询街面巡组计划数
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("dto", dto);
+//        mp.put("useSql", PermissionsUtil.createSql("b", userInfo));
+        Integer jhsl = tbQwXfbbMapper.selectJhsl(mp);
+        // 查询街面巡组实际数量（已报备的数量）
+        Integer sjsl = tbQwXfbbMapper.selectSjsl(mp);
+        Map<String, Integer> map = tbQwXfbbMapper.selectPowerAndDayLength(dto.getSsbmdm());
+        map.put("jhsl", jhsl);
+        map.put("sjsl", sjsl);
+        return map;
+    }
+
+    @Override
+    public IPage<TbQwXfbb> selectDeckList(TbQwXfbbJmxzQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        List<String> ztList = new ArrayList<>();
+        List<String> qwList = new ArrayList<>();
+        IPage<TbQwXfbb> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+
+        if (StringUtils.isNotBlank(dto.getXfzt())) {
+            ztList = Arrays.asList(dto.getXfzt().split(","));
+        }
+        if (StringUtils.isNotBlank(dto.getQwlx())) {
+            qwList = Arrays.asList(dto.getQwlx().split(","));
+        }
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        map.put("list", ztList);
+        map.put("qwList", qwList);
+        int count = this.tbQwXfbbMapper.getCountZbxz(map);
+        List<TbQwXfbb> list = this.tbQwXfbbMapper.getListZbxz(map);
+
+        if (!CollectionUtils.isEmpty(list)) {
+            for (TbQwXfbb xfbb : list) {
+                if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) {
+                    SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                    xfbb.setLx(user1.getType());
+                }
+            }
+        }
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<TbQwXfbb> selectNearbyDeck(TbQwXfbb tbQwXfbb) {
+        return tbQwXfbbMapper.selectNearbyDeck(tbQwXfbb);
+    }
+
+    @Override
+    public IPage<TbQwXfbbVo> queryPage(TbQwXfbbQuery xfbb) {
+        IPage<TbQwXfbb> xfbbIPage = queryXfbb(xfbb);
+        IPage<TbQwXfbbVo> voIPage = new Page<>(xfbb.getPageCurrent(), xfbb.getPageSize());
+        voIPage.setTotal(xfbbIPage.getTotal());
+        List<TbQwXfbb> records = xfbbIPage.getRecords();
+        List<TbQwXfbbVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> ids = records.stream().map(TbQwXfbb::getId).collect(Collectors.toList());
+            List<TbQwJl> jlList = tbQwJlMapper.queryListByYwid(ids);
+            List<TbQwCl> clList = tbQwClMapper.queryListByYwid(ids);
+            List<TbQwZnzb> znzbList = tbQwZnzbMapper.queryListByYwid(ids);
+            List<TbQwJyqx> jyqxList = tbQwJyqxMapper.queryListByYwid(ids);
+            List<TbQwXffw> xffwList = this.tbQwXffwMapper.selectList(
+                    new LambdaQueryWrapper<TbQwXffw>()
+                            .in(TbQwXffw::getYwid, ids)
+                            .eq(TbQwXffw::getXtSjzt, "1")
+            );
+            for (TbQwXfbb record : records) {
+                TbQwXfbbVo vo = new TbQwXfbbVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbQwJl> jl = jlList.stream().filter(item -> item.getYwid().equals(record.getId())).collect(Collectors.toList());
+                List<TbQwCl> cl = clList.stream().filter(item -> item.getYwid().equals(record.getId())).collect(Collectors.toList());
+                List<TbQwZnzb> znzb = znzbList.stream().filter(item -> item.getYwid().equals(record.getId())).collect(Collectors.toList());
+                List<TbQwJyqx> jyqx = jyqxList.stream().filter(item -> item.getYwid().equals(record.getId())).collect(Collectors.toList());
+                List<TbQwXffwDto> xffwDtoList = xffwList.stream().map(item -> {
+                    TbQwXffwDto dto = new TbQwXffwDto();
+                    BeanUtils.copyProperties(item, dto);
+                    return dto;
+                }).collect(Collectors.toList());
+                vo.setXffwList(xffwDtoList);
+                vo.setJlList(jl);
+                vo.setClList(cl);
+                vo.setZnzbList(znzb);
+                vo.setJyqxList(jyqx);
+                vos.add(vo);
+            }
+        }
+        voIPage.setRecords(vos);
+        return voIPage;
+    }
+
+    @Override
+    public int startOrEndBb(TbQwXfbbStartOrEndBbDto dto) {
+        TbQwXfbb bb = this.tbQwXfbbMapper.selectById(dto.getId());
+        if (bb == null) return 0;
+        if ("0".equals(dto.getBbzt())) {
+            bb.setBbkssj(new Date());
+            bb.setXfzt("0");
+        } else {
+            bb.setBbjssj(new Date());
+            // 清除redis中缓存的巡防报备的位置
+            String key = Constant.WZ_XFWZ + dto.getId();
+            redisService.deleteObject(key);
+            List<TbWzLswz> bbgj = tbQwXfbbMapper.getBbgj(bb.getId());
+            if (!CollectionUtils.isEmpty(bbgj)) {
+                int lc = 0;
+                for (int i = 0; i < bbgj.size() - 1; i++) {
+                    lc = DistanceUtils.getLc(lc, bbgj.get(i).getJd(), bbgj.get(i).getWd(), bbgj.get(i + 1).getJd(), bbgj.get(i + 1).getWd());
+                }
+                bb.setXflc(lc);
+            }
+        }
+        bb.setBbzt(dto.getBbzt());
+        bb.setBz("手动结束");
+        this.tbQwXfbbMapper.updateById(bb);
+        WebSocketObject obj;
+        if (StringUtils.isNotBlank(bb.getFzrSfzh())) {
+            SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(bb.getFzrSfzh());
+            bb.setLx(user1.getType());
+        }
+        if ("1".equals(dto.getBbzt())) {
+            // 将结束报备信息推送到前端
+            obj = new WebSocketObject("05", bb, null);
+            bb.setZb(null);
+            this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+        } else if ("0".equals(dto.getBbzt())) {
+            obj = new WebSocketObject("03", bb, null);
+            bb.setZb(null);
+            this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+        }
+        return 1;
+    }
+
+    @Override
+    public IPage<TbQwXfpbZq> selectJhjmxzList(TbQwXzSearchDto dto) {
+//        UserInfo userInfo = UserInfoManager.get();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbQwXfpbZq> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+//        String useSql = PermissionsUtil.createSql("b", userInfo);
+//        map.put("useSql", useSql);
+        // 查询街面巡组计划列表
+        List<TbQwXfpbZq> list = this.tbQwXfbbMapper.selectJhslList(map);
+        // 查询街面巡组计划数
+        int count = this.tbQwXfbbMapper.selectJhsl(map);
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<TbQwXfbb> selectSjjmxzList(TbQwXzSearchDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+//        UserInfo userInfo = UserInfoManager.get();
+        IPage<TbQwXfbb> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("b", userInfo));
+        map.put("dto", dto);
+        // 查询街面巡组计划列表
+        List<TbQwXfbb> list = tbQwXfbbMapper.selectSjslList(map);
+        // 查询街面巡组计划数
+        int count = tbQwXfbbMapper.selectSjsl(map);
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public IPage<TbQwJl> selectJmllList(TbQwJmllSearchDto dto) {
+//        UserInfo userInfo = UserInfoManager.get();
+        dto.setXfbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getXfbmdm(), null));
+        IPage<TbQwJl> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+//        map.put("useSql", userInfo != null ? PermissionsUtil.createSql("a", userInfo) : "id");
+        List<TbQwJl> list = this.tbQwJlMapper.getList(map);
+        int count = this.tbQwJlMapper.getCount(map);
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public TbQwXfbb getMybbTodayNew(String bblx) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("登录过期！！");
+        }
+//        if (StringUtils.isBlank(bblx)) {
+//            bblx = "01";
+//        }
+        TbQwXfbb xfbb = this.tbQwXfbbMapper.getMybbTodayNew(String.valueOf(user.getIdEntityCard()), bblx);
+        // 查询是否打卡
+        if (xfbb != null) {
+            TbQwxfbbDk dk = this.tbQwxfbbDkMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwxfbbDk>()
+                            .eq(TbQwxfbbDk::getBbid, xfbb.getId())
+                            .eq(TbQwxfbbDk::getXtSjzt, "1")
+            );
+            xfbb.setSfDk(dk != null);
+            return xfbb;
+        }
+        return null;
+    }
+
+    @Override
+    public TbQwXfbb getMybbLastBySfzh(String sfzh) {
+        UserInfo user = UserInfoManager.get();
+        String deptCode = user.getDeptCode();
+        TbQwXfbb xfbb = this.baseMapper.selectOne(new LambdaQueryWrapper<TbQwXfbb>()
+                .eq(TbQwXfbb::getFzrSfzh, sfzh)
+                .eq(TbQwXfbb::getXtSjzt, "1")
+                .eq(TbQwXfbb::getXtScbz, "0")
+                .eq(StringUtils.isNotBlank(deptCode), TbQwXfbb::getSsbmdm, deptCode)
+                .orderByDesc(TbQwXfbb::getBbkssj)
+                .last(" limit 1")
+        );
+        if (!ObjectUtils.isEmpty(xfbb)) {
+            xfbb.setZb(null);
+            xfbb.setJd(null);
+            xfbb.setWd(null);
+            xfbb.setBbzt(null);
+            xfbb.setBbjssj(null);
+        }
+        return xfbb;
+    }
+
+    @Override
+    public List<TbQwXfbb> getFjbbByYsId(String ysid) {
+        // 获取派出所的经纬度范围
+        TbYsGajgVo pcs = this.tbYszxAdaptRemoteService.getInfo(ysid);
+        // 查询所有的报备信息，在范围内的
+        List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfbb>()
+                        .eq(TbQwXfbb::getXtSjzt, "1")
+                        .eq(TbQwXfbb::getBbzt, "0")
+        );
+        List<TbQwXfbb> newList = new ArrayList<>();
+        bbList.forEach(item -> {
+            List<Coordinate> coorList = new ArrayList<>();
+            pcs.getDtm().forEach(d -> {
+                Coordinate coor = new Coordinate(d[0].doubleValue(), d[1].doubleValue());
+                coorList.add(coor);
+            });
+            Coordinate[] coordinates = coorList.toArray(new Coordinate[0]);
+            if (this.isInGeometry(coordinates, item.getJd() + "," + item.getWd())) {
+                newList.add(item);
+            }
+        });
+        return newList;
+    }
+
+    public void authJsbbTs() {
+        List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfbb>()
+                        .eq(TbQwXfbb::getBbzt, "0")
+                        .eq(TbQwXfbb::getBblx, "02")
+                        .eq(TbQwXfbb::getXtSjzt, "1")
+        );
+        if (!CollectionUtils.isEmpty(bbList)) {
+            bbList.forEach(bb -> {
+                bb.setBbzt("1");
+                bb.setBbjssj(new Date());
+                this.tbQwXfbbMapper.updateById(bb);
+                // 清除redis中缓存的巡防报备的位置
+                String key = Constant.WZ_XFWZ + bb.getId();
+                redisService.deleteObject(key);
+                //自动结束报备 ws通知前端
+                WebSocketObject obj = new WebSocketObject("05", bb, null);
+                bb.setZb(null);
+                this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+
+            });
+        }
+    }
+
+    @Override
+    public void authJsbb() {
+        // 查询所有的已经报备的报备信息
+        List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfbb>()
+                        .eq(TbQwXfbb::getBbzt, "0")
+                        .eq(TbQwXfbb::getXtSjzt, "1")
+        );
+        // (使用remove容易出问题 所以使用list)
+        List<TbQwXfbb> zxBbList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(bbList)) {
+            for (TbQwXfbb bb : bbList) {
+                Date jssj;
+                if (ObjectUtils.isNotEmpty(bb.getKssj()) && ObjectUtils.isNotEmpty(bb.getJssj())) {
+                    if (bb.getKssj().getTime() > bb.getJssj().getTime()) {
+                        String jssjString = DateUtils.getQueryDateString(
+                                DateUtils.getNextDate(bb.getXfrq(), "D", +1), "01") + " "
+                                + DateUtils.getQueryDateString(bb.getJssj(), "10");
+                        jssj = DateUtils.strToDate(jssjString, "02");
+                        System.out.println("--->>>>>>>>>>>>>>>>>>>>>" + jssjString);
+                    } else {
+                        String jssjString = DateUtils.getQueryDateString(bb.getXfrq(), "01") + " "
+                                + DateUtils.getQueryDateString(bb.getJssj(), "10");
+                        jssj = DateUtils.strToDate(jssjString, "02");
+                        System.out.println("--->>>>>>>>>>>>>>>>>>>>>" + jssjString);
+                    }
+                    if (new Date().getTime() >= jssj.getTime()) {
+                        bb.setBbzt("1");
+                        bb.setBbjssj(new Date());
+                        this.tbQwXfbbMapper.updateById(bb);
+                        // 清除redis中缓存的巡防报备的位置
+                        String key = Constant.WZ_XFWZ + bb.getId();
+                        redisService.deleteObject(key);
+                        //自动结束报备 ws通知前端
+                        WebSocketObject obj = new WebSocketObject("05", bb, null);
+                        bb.setZb(null);
+                        this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+                    } else {
+                        zxBbList.add(bb);
+                    }
+                } else {
+                    zxBbList.add(bb);
+                }
+                //巡逻计算有问题  结束报备的时候 修改
+//                new Thread(new Runnable() {
+//                    @Override
+//                    public void run() {
+                //获取报备轨迹 不使用fen
+                List<TbWzLswz> bbgj = tbQwXfbbMapper.getBbgj(bb.getId());
+                if (!CollectionUtils.isEmpty(bbgj)) {
+                    int lc = 0;
+                    for (int i = 0; i < bbgj.size() - 1; i++) {
+                        lc = DistanceUtils.getLc(lc, bbgj.get(i).getJd(), bbgj.get(i).getWd(), bbgj.get(i + 1).getJd(), bbgj.get(i + 1).getWd());
+                    }
+                    tbQwXfbbMapper.update(new TbQwXfbb().setXflc(lc), new LambdaQueryWrapper<TbQwXfbb>().eq(TbQwXfbb::getId, bb.getId()));
+                }
+//                    }
+//                }).start();
+            }
+
+
+        }
+        if (!CollectionUtils.isEmpty(zxBbList)) {
+            //三十分钟
+            String lxsc = tbBaseAdaptRemoteService.getValue("XFBB_LXSC");
+            long lxTime = (StringUtils.isEmpty(lxsc) ? 30 : Integer.parseInt(lxsc)) * 60;
+            for (TbQwXfbb xfbb : zxBbList) {
+                //已经是离线的就不在推送
+                if (!xfbb.getXfzt().equals("2")) {
+                    String key = Constant.WZ_XFWZ + xfbb.getId();
+                    TbWzXfwz xfwz = redisService.getCacheObject(key);
+                    if (ObjectUtils.isEmpty(xfwz)) {
+                        //没有数据直接离线
+                        xfbb.setXfzt("2");
+                        this.tbQwXfbbMapper.updateById(xfbb);
+
+                        if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) {
+                            SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                            xfbb.setLx(user1.getType());
+                        }
+
+                        WebSocketObject obj = new WebSocketObject("04", xfbb, null);
+                        xfbb.setZb(null);
+                        this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+                    } else {
+                        //有数据
+                        long l = (new Date().getTime() - xfwz.getZhgxsj().getTime()) / 1000;
+                        //数据大于了三十分钟 直接离线
+                        if (lxTime < l) {
+                            xfbb.setXfzt("2");
+                            this.tbQwXfbbMapper.updateById(xfbb);
+                            if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) {
+                                SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                                xfbb.setLx(user1.getType());
+                            }
+                            WebSocketObject obj = new WebSocketObject("04", xfbb, null);
+                            xfbb.setZb(null);
+                            this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+                        }
+                    }
+                }
+            }
+        }
+
+
+    }
+
+    @Override
+    public List<TbQwJlDto> getJlxxByBbid(String id) {
+        TbQwXfbb bb = this.tbQwXfbbMapper.selectById(id);
+        if (bb == null) {
+            throw new BusinessException("报备信息不存在");
+        }
+        List<TbQwJlDto> list = new ArrayList<>();
+        TbQwJlDto dto = new TbQwJlDto();
+        dto.setJlId(bb.getFzrId());
+        dto.setJllx("01");
+        dto.setJlxm(bb.getFzrXm());
+        dto.setSfzh(bb.getFzrSfzh());
+        list.add(dto);
+        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                new LambdaQueryWrapper<TbQwJl>()
+                        .eq(TbQwJl::getYwid, id)
+                        .eq(TbQwJl::getXtSjzt, "1")
+                        .eq(TbQwJl::getZblx, "3")
+        );
+        jlList.forEach(jl -> {
+            TbQwJlDto vo = new TbQwJlDto();
+            BeanUtils.copyProperties(jl, vo);
+            list.add(vo);
+        });
+        return list;
+    }
+
+    @Override
+    public TbQwXfbb getBbxxByJi(TbQwXfbbQueryByJlDto dto) {
+        return this.tbQwXfbbMapper.getBbxxByJi(dto);
+    }
+
+    @Override
+    public Map<String, Object> selectMfjCount(String bbrq) {
+        Map<String, Object> map = new HashMap<>();
+        // 如果查询时间为当天，则标志只查询报备中的数据
+//        if (bbrq.equals(DateUtils.getQueryDateString(new Date(), "01"))) {
+//            map.put("isToday", "1");
+//        }
+        TbQwXfbbJmxzQuery dto = new TbQwXfbbJmxzQuery();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        dto.setBbrq(bbrq);
+        map.put("dto", dto);
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("a", user));
+        List<TbQwXfbb> list = this.tbQwXfbbMapper.getListZbxz(map);
+        Map<String, Object> resMap = new HashMap<>();
+        AtomicInteger mj = new AtomicInteger();
+        AtomicInteger fj = new AtomicInteger();
+        list.forEach(item -> {
+            mj.addAndGet(item.getMjsl() == null ? 0 : item.getMjsl());
+            fj.addAndGet(item.getFjsl() == null ? 0 : item.getFjsl());
+        });
+        resMap.put("mj", mj.intValue());
+        resMap.put("fj", fj.intValue());
+        return resMap;
+    }
+
+    @Override
+    public List<TbQwXfbb> getBbList(String sbid) {
+        return this.tbQwXfbbMapper.getBbList(sbid);
+    }
+
+    @Override
+    public List<TbQwXfbb> getClBbList(String sbid) {
+        return this.tbQwXfbbMapper.getClBbList(sbid);
+    }
+
+    @Override
+    public IPage<TbQwXfbb> selectJmxz(TbQwJmxzSearchDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if ("1".equals(dto.getType())) {
+            return this.tbQwXfbbMapper.selectPage(
+                    new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                    new LambdaQueryWrapper<TbQwXfbb>()
+                            .eq(TbQwXfbb::getXtSjzt, "1")
+                            .eq(TbQwXfbb::getBbzt, "0")
+                            .like(StringUtils.isNotBlank(dto.getKeyword()), TbQwXfbb::getJzMc, dto.getKeyword())
+                            .eq(TbQwXfbb::getSsbmid, String.valueOf(user.getDeptId()))
+            );
+        } else {
+            return this.tbQwXfbbMapper.selectPage(
+                    new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                    new LambdaQueryWrapper<TbQwXfbb>()
+                            .eq(TbQwXfbb::getXtSjzt, "1")
+                            .eq(TbQwXfbb::getBbzt, "0")
+                            .and(StringUtils.isNotBlank(dto.getKeyword()),
+                                    it -> it.like(TbQwXfbb::getJzMc, dto.getKeyword())
+                                            .or()
+                                            .like(TbQwXfbb::getSsbm, dto.getKeyword())
+                            )
+            );
+        }
+    }
+
+    @Override
+    public void addXfbbDk(TbQwXfbbDkDto dto) {
+        UserInfo user = UserInfoManager.get();
+
+        TbQwxfbbDk dk = new TbQwxfbbDk();
+        BeanUtils.copyProperties(dto, dk);
+        dk.setDkrid(String.valueOf(user.getUserId()));
+        dk.setDkrsfzh(user.getIdEntityCard());
+        dk.setDkrxm(user.getUserName());
+        this.tbQwxfbbDkMapper.insert(dk);
+    }
+
+    @Override
+    public boolean isDdWz(TbQwXfbbDkWzDto dto) {
+        TbQwXfbb bb = this.tbQwXfbbMapper.selectById(dto.getBbid());
+        if (bb == null || StringUtils.isBlank(bb.getXffwlx()) || StringUtils.isBlank(bb.getXffwid())) {
+            return false;
+        }
+        List<BigDecimal[]> list;
+        if ("1".equals(bb.getXffwlx())) {
+            // 巡防区
+            TbJcglXfqyDto xfqy = this.tbJcglAdaptRemoteService.getxfqById(bb.getXffwid());
+            if (CollectionUtils.isEmpty(xfqy.getPgis())) return false;
+            list = xfqy.getPgis();
+            Coordinate[] coors = new Coordinate[list.size()];
+            for (int i = 0; i < xfqy.getPgis().size(); i++) {
+                Coordinate c = new Coordinate();
+                c.x = xfqy.getPgis().get(i)[0].doubleValue();
+                c.y = xfqy.getPgis().get(i)[1].doubleValue();
+                coors[i] = c;
+            }
+            return this.isInGeometry(coors, dto.getJd() + "," + dto.getWd());
+        } else if ("2".equals(bb.getXffwlx())) {
+            // 快反点
+            TbJcglKfdDto kfd = this.tbJcglAdaptRemoteService.getKfdById(bb.getXffwid());
+            if (CollectionUtils.isEmpty(kfd.getWfzfw()) && CollectionUtils.isEmpty(kfd.getSfzfw())
+                    && CollectionUtils.isEmpty(kfd.getYfzfw())) {
+                return false;
+            }
+            list = kfd.getWfzfw();
+            if (CollectionUtils.isEmpty(list)) {
+                list = kfd.getSfzfw();
+            }
+            if (CollectionUtils.isEmpty(list)) {
+                list = kfd.getYfzfw();
+            }
+            Coordinate[] coors = new Coordinate[list.size()];
+            for (int i = 0; i < list.size(); i++) {
+                Coordinate c = new Coordinate();
+                c.x = list.get(i)[0].doubleValue();
+                c.y = list.get(i)[1].doubleValue();
+                coors[i] = c;
+            }
+            return this.isInGeometry(coors, dto.getJd() + "," + dto.getWd());
+        } else if ("3".equals(bb.getXffwlx())) {
+            // 警务站
+            TbJcglJwz jwz = this.tbJcglAdaptRemoteService.getJwzById(bb.getXffwid());
+            // 计算两点之间的距离
+            if (jwz.getJd() != null || jwz.getWd() != null) return false;
+            double jl = Kit.getDistance(jwz.getJd().doubleValue(), jwz.getWd().doubleValue(), dto.getJd(), dto.getWd());
+            return !(jl >= 200);
+        }
+        return false;
+    }
+
+    @Override
+    public TbQwXfbb getBbxxInfo(String id) {
+        return this.tbQwXfbbMapper.selectById(id);
+    }
+
+    @Override
+    public Map<String, Object> getJmjlCount() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) return null;
+        List<TbQwXfbb> list = this.tbQwXfbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfbb>()
+                        .eq(TbQwXfbb::getBbzt, "0")
+                        .eq(TbQwXfbb::getXfrq, DateUtils.getQueryDateString(new Date(), "01"))
+                        .and(it -> it.eq(TbQwXfbb::getSsbmid, String.valueOf(user.getDeptId())).or()
+                                .eq(TbQwXfbb::getSsxgajid, String.valueOf(user.getDeptId())).or()
+                                .eq(TbQwXfbb::getSssgajid, String.valueOf(user.getDeptId())).or()
+                        )
+        );
+        if (CollectionUtils.isEmpty(list)) return null;
+        // 负责人肯定是有的
+        int count = list.size();
+        count += list.stream().mapToInt(item -> ((item.getMjsl() != null ? item.getMjsl() : 0) +
+                (item.getFjsl() != null ? item.getFjsl() : 0))).sum();
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgid", String.valueOf(user.getDeptId()));
+        map.put("orgcode", user.getDeptCode());
+        map.put("orgname", user.getDeptName());
+        map.put("jmjl", count);
+        return map;
+    }
+
+    @Override
+    public void checkXfbbSc() {
+        List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfbb>()
+                        .eq(TbQwXfbb::getBbzt, "0")
+                        .eq(TbQwXfbb::getXtSjzt, "1")
+        );
+        bbList.forEach(item -> {
+            long now = new Date().getTime();
+            long kssk = item.getBbkssj().getTime();
+            item.setXfsc((int) ((now - kssk) / 1000));
+            this.tbQwXfbbMapper.updateXfscById(item);
+        });
+    }
+
+    @Override
+    public IPage<TbQwXfbb> selectDeckListOther(TbQwXfbbJmxzQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtils.isBlank(dto.getBbrq())) {
+            dto.setBbrq(DateUtils.getQueryDateString(new Date(), "01"));
+        }
+        // 如果查询时间为当天，则标志只查询报备中的数据
+        if (dto.getBbrq().equals(DateUtils.getQueryDateString(new Date(), "01"))) {
+            map.put("isToday", "1");
+        }
+        List<String> ztList = new ArrayList<>();
+        IPage<TbQwXfbb> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+//        if (StringUtils.isBlank(dto.getXfzt())) {
+//            return page;
+//        }
+        if (StringUtils.isNotBlank(dto.getXfzt())) {
+            String xfzt = dto.getXfzt();
+            if (xfzt.contains(",")) {
+                String[] arrays = xfzt.split(",");
+                ztList = Arrays.asList(arrays);
+            } else {
+                ztList.add(xfzt);
+            }
+        }
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        map.put("list", ztList);
+        map.put("ssbmdm", dto.getSsbmdm());
+        int count = this.tbQwXfbbMapper.getCountZbxz(map);
+        List<TbQwXfbb> list = this.tbQwXfbbMapper.getListZbxz(map);
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    /**
+     * 泸州态势统计-各区县巡防时长和里程
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, Object> getXfscAndLc(XfbbQuery dto) {
+        HashMap<Object, Object> ssxgajxx = new HashMap<>();
+        ssxgajxx.put("10111", "泸州机场");
+        ssxgajxx.put("10929", "江阳区");
+        ssxgajxx.put("11336", "龙马潭区");
+        ssxgajxx.put("11379", "纳溪区");
+        ssxgajxx.put("11382", "泸县");
+        ssxgajxx.put("11436", "合江县");
+        ssxgajxx.put("11503", "叙永县");
+        ssxgajxx.put("11531", "古蔺县");
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) { // 为空的提示
+            throw new BusinessException("请选择您要查询时间！");
+        }
+        Map<String, Object> map = new HashMap<>();
+        // 巡防时长
+        List<Map<String, Object>> sumXfsc = this.tbQwXfbbMapper.getSumXfsc(dto.getKssj(), dto.getJssj());
+        // 巡防里程
+        List<Map<String, Object>> sumXflc = this.tbQwXfbbMapper.getSumXflc(dto.getKssj(), dto.getJssj());
+
+        List<Map<String, Object>> xfscResList = new ArrayList<>();
+        List<Map<String, Object>> xflcResList = new ArrayList<>();
+        ssxgajxx.keySet().forEach(item -> {
+            Map<String, Object> resMap = new HashMap<>();
+            // 时长
+            List<Map<String, Object>> xfscList = sumXfsc.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (xfscList.size() == 1) {
+                resMap.put("sum", xfscList.get(0).get("sum"));
+            } else {
+                resMap.put("sum", 0);
+            }
+            xfscResList.add(resMap);
+            // 里程
+            resMap = new HashMap<>();
+            List<Map<String, Object>> xflcList = sumXflc.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (xflcList.size() == 1) {
+                resMap.put("sum", xflcList.get(0).get("sum"));
+            } else {
+                resMap.put("sum", 0);
+            }
+            xflcResList.add(resMap);
+        });
+        map.put("xfscResList", xfscResList);
+        map.put("xflcResList", xflcResList);
+        return map;
+    }
+
+    @Override
+    public Integer getBbCount(String ssbmdm, String time) {
+        try {
+//            ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(ssbmdm,null);
+            return this.tbQwXfbbMapper.selectCount(
+                    new LambdaQueryWrapper<TbQwXfbb>()
+                            .likeRight(!StringUtils.isEmpty(ssbmdm), TbQwXfbb::getSsbmdm, ssbmdm)
+                            .eq(TbQwXfbb::getXfrq, time)
+                            .isNotNull(TbQwXfbb::getBbzt)
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    @Override
+    public Map<String, Integer> getScLc(String ssbmdm, String time) {
+        return this.baseMapper.getScLc(ssbmdm, time);
+    }
+
+
+    // 判断点在范围内
+    private boolean isInGeometry(Coordinate[] coordinates, String isPoint) {
+        if (coordinates[0].x != coordinates[coordinates.length - 1].x || coordinates[0].y != coordinates[coordinates.length - 1].y) {
+            coordinates[coordinates.length - 1] = new Coordinate(coordinates[0].x, coordinates[0].y);
+        }
+        String[] sp = isPoint.split(",");
+        double xx = Double.parseDouble(sp[0]);
+        double yy = Double.parseDouble(sp[1]);
+        //点是否在多边形内判断
+        Coordinate point = new Coordinate(xx, yy);
+        PointLocator a = new PointLocator();
+        GeometryFactory gf = new GeometryFactory();
+        Geometry gfLineString = gf.createPolygon(coordinates);
+        double degree = 500 / (2 * Math.PI * 6371004) * 360;
+        BufferOp bufOp = new BufferOp(gfLineString);
+        bufOp.setEndCapStyle(BufferOp.CAP_ROUND);
+        Geometry bg = bufOp.getResultGeometry(degree);
+        return a.intersects(point, bg);
+    }
+
+
+    // 获取巡防报备数据
+    public IPage<TbQwXfbb> queryXfbb(TbQwXfbbQuery xfpb) {
+        List<String> qwlxList = StringUtils.isNotBlank(xfpb.getQwlxs()) ? Arrays.asList(xfpb.getQwlxs().split(",")) : null;
+        IPage<TbQwXfbb> page = new Page<>(xfpb.getPageCurrent(), xfpb.getPageSize());
+        QueryWrapper<TbQwXfbb> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(xfpb.getSsbmdm(), null);
+        queryWrapper.lambda()
+                .eq(StringUtils.isNotBlank(xfpb.getQwdjId()), TbQwXfbb::getQwdjId, xfpb.getQwdjId())
+                .eq(StringUtils.isNotBlank(xfpb.getQwbcId()), TbQwXfbb::getQwbcId, xfpb.getQwbcId())
+                .eq(StringUtils.isNotBlank(xfpb.getJzId()), TbQwXfbb::getJzId, xfpb.getJzId())
+                .eq(StringUtils.isNotBlank(xfpb.getBblx()), TbQwXfbb::getBblx, xfpb.getBblx())
+//                .eq(StringUtils.isNotBlank(xfpb.getXfbmdm()), TbQwXfbb::getXfbmdm, xfpb.getXfbmdm())
+//                .eq(StringUtils.isNotBlank(xfpb.getXfbmid()), TbQwXfbb::getXfbmid, xfpb.getXfbmid())
+                .eq(StringUtils.isNotBlank(xfpb.getBbzt()), TbQwXfbb::getBbzt, xfpb.getBbzt())
+                .like(StringUtils.isNotBlank(xfpb.getFzrXm()), TbQwXfbb::getFzrXm, xfpb.getFzrXm())
+                .like(StringUtils.isNotBlank(xfpb.getFzrSfzh()), TbQwXfbb::getFzrSfzh, xfpb.getFzrSfzh())
+                .likeRight(StringUtils.isNotBlank(ssbm), TbQwXfbb::getSsbmdm, ssbm)
+                .eq(StringUtils.isNotBlank(xfpb.getXtSjly()), TbQwXfbb::getXtSjly, xfpb.getXtSjly())
+                .in(qwlxList != null, TbQwXfbb::getQwlx, qwlxList)
+                .ge(ObjectUtils.isNotEmpty(xfpb.getBbkssj()), TbQwXfbb::getBbkssj, xfpb.getBbkssj())
+                .le(ObjectUtils.isNotEmpty(xfpb.getBbjssj()), TbQwXfbb::getBbjssj, xfpb.getBbjssj());
+        if (ObjectUtils.isNotEmpty(xfpb.getKsXfrq())) {
+            queryWrapper.lambda().ge(TbQwXfbb::getXfrq, xfpb.getKsXfrq());
+        }
+        if (ObjectUtils.isNotEmpty(xfpb.getJsXfrq())) {
+            queryWrapper.lambda().le(TbQwXfbb::getXfrq, xfpb.getJsXfrq());
+        }
+
+//        if (xfpb.getKsXfrq() != null && xfpb.getJsXfrq() != null) {
+//            queryWrapper.lambda().between(TbQwXfbb::getXfrq, xfpb.getKsXfrq(), xfpb.getJsXfrq());
+//        }
+        queryWrapper.lambda().orderByAsc(TbQwXfbb::getBbzt).orderByDesc(TbQwXfbb::getBbkssj);
+        return tbQwXfbbMapper.selectPage(page, queryWrapper);
+    }
+
+    // 保存关联数据
+    public void saveRelevanceData(TbQwXfbb xfbb, TbQwXfbbVo vo, String ywid, DeptInfoVo dept) {
+        if (vo != null) {
+            List<TbQwJl> jlList = vo.getJlList();
+            List<TbQwCl> clList = vo.getClList();
+            List<TbQwZnzb> znzbList = vo.getZnzbList();
+            List<TbQwJyqx> jyqxList = vo.getJyqxList();
+            List<TbQwXffwDto> xffwList = vo.getXffwList();
+            boolean fzr = true;
+            if (!CollectionUtils.isEmpty(jlList)) {
+                List<TbQwJl> collect = jlList.stream().filter(v -> v.getSfzh().equals(xfbb.getFzrSfzh())).collect(Collectors.toList());
+                fzr = CollectionUtils.isEmpty(collect);
+            } else {
+                jlList = new ArrayList<>();
+            }
+
+            if (fzr) {
+                SysUser userInfoBySfzh = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                TbQwJl tbQwJl = new TbQwJl();
+                tbQwJl.setYwid(xfbb.getId());
+                tbQwJl.setJlId(String.valueOf(userInfoBySfzh.getId()));
+                tbQwJl.setJllx(Constant.JLLX_MJ);
+                tbQwJl.setJlxm(xfbb.getFzrXm());
+                tbQwJl.setSfzh(xfbb.getFzrSfzh());
+                tbQwJl.setXbdm(userInfoBySfzh.getSex());
+                tbQwJl.setLxdh(userInfoBySfzh.getMobile());
+                tbQwJl.setZblx("3");
+                jlList.add(tbQwJl);
+            }
+
+            List<TbQwJl> mjLists = new ArrayList<>();
+            List<TbQwJl> fjLists = new ArrayList<>();
+
+            for (TbQwJl jl : jlList) {
+                if (Constant.JLLX_MJ.equals(jl.getJllx())) {
+                    mjLists.add(jl);
+                } else {
+                    fjLists.add(jl);
+                }
+            }
+
+
+            xfbb.setPbmj(JSONArray.toJSONString(mjLists));
+            xfbb.setPbfj(JSONArray.toJSONString(fjLists));
+            xfbb.setMjsl(mjLists.size());
+            xfbb.setFjsl(fjLists.size());
+            for (TbQwJl jl : jlList) {
+                jl.setId(UUIDGenerator.getUUID());
+                jl.setZblx("3");
+                jl.setYwid(ywid);
+                jl.setXtSjly(StringUtils.isBlank(jl.getXtSjly()) ? "1" : jl.getXtSjly());
+                jl.setSsbm(dept.getDeptname());
+                jl.setSsbmid(dept.getDeptid());
+                jl.setSsbmdm(dept.getDeptcode());
+                jl.setSsxgajdm(dept.getFxjcode());
+                jl.setSsxgajid(dept.getFxjid());
+                jl.setSsxgaj(dept.getFxjname());
+                jl.setSssgaj(dept.getDszname());
+                jl.setSssgajdm(dept.getDszcode());
+                jl.setSssgajid(dept.getDszid());
+                tbQwJlMapper.insert(jl);
+            }
+//            }
+            if (!CollectionUtils.isEmpty(clList)) {
+                xfbb.setPbcl(JSONArray.toJSONString(clList));
+                xfbb.setJcsl(clList.size());
+                for (TbQwCl cl : clList) {
+                    cl.setId(UUIDGenerator.getUUID());
+                    cl.setYwid(ywid);
+                    cl.setZblx("3");
+                    cl.setXtSjzt("1");
+                    cl.setXtSjly(StringUtils.isBlank(cl.getXtSjly()) ? "1" : cl.getXtSjly());
+                    cl.setXtScbz("0");
+                    cl.setSsbm(dept.getDeptname());
+                    cl.setSsbmid(dept.getDeptid());
+                    cl.setSsbmdm(dept.getDeptcode());
+                    cl.setSsxgajdm(dept.getFxjcode());
+                    cl.setSsxgajid(dept.getFxjid());
+                    cl.setSsxgaj(dept.getFxjname());
+                    cl.setSssgaj(dept.getDszname());
+                    cl.setSssgajdm(dept.getDszcode());
+                    cl.setSssgajid(dept.getDszid());
+                    tbQwClMapper.insert(cl);
+                }
+            }
+            if (!CollectionUtils.isEmpty(znzbList)) {
+                xfbb.setTxzb(JSONArray.toJSONString(znzbList));
+                xfbb.setTxzbsl(znzbList.size());
+                for (TbQwZnzb znzb : znzbList) {
+                    znzb.setId(UUIDGenerator.getUUID());
+                    znzb.setYwid(ywid);
+                    znzb.setZblx("3");
+                    znzb.setXtSjly(StringUtils.isBlank(znzb.getXtSjly()) ? "1" : znzb.getXtSjly());
+                    znzb.setSsbm(dept.getDeptname());
+                    znzb.setSsbmid(dept.getDeptid());
+                    znzb.setSsbmdm(dept.getDeptcode());
+                    znzb.setSsxgajdm(dept.getFxjcode());
+                    znzb.setSsxgajid(dept.getFxjid());
+                    znzb.setSsxgaj(dept.getFxjname());
+                    znzb.setSssgaj(dept.getDszname());
+                    znzb.setSssgajdm(dept.getDszcode());
+                    znzb.setSssgajid(dept.getDszid());
+                    tbQwZnzbMapper.insert(znzb);
+                }
+            }
+            if (!CollectionUtils.isEmpty(jyqxList)) {
+                int total = 0;
+                List<TbQwJyqx> qxList = new ArrayList<>();
+                for (TbQwJyqx jyqx : jyqxList) {
+                    if (ObjectUtils.isNotEmpty(jyqx.getQxsl()) && jyqx.getQxsl() > 0) {
+                        jyqx.setId(UUIDGenerator.getUUID());
+                        jyqx.setYwid(ywid);
+                        jyqx.setZblx("3");
+                        jyqx.setXtSjly(StringUtils.isBlank(jyqx.getXtSjly()) ? "1" : jyqx.getXtSjly());
+                        jyqx.setSsbm(dept.getDeptname());
+                        jyqx.setSsbmid(dept.getDeptid());
+                        jyqx.setSsbmdm(dept.getDeptcode());
+                        jyqx.setSsxgajdm(dept.getFxjcode());
+                        jyqx.setSsxgajid(dept.getFxjid());
+                        jyqx.setSsxgaj(dept.getFxjname());
+                        jyqx.setSssgaj(dept.getDszname());
+                        jyqx.setSssgajdm(dept.getDszcode());
+                        jyqx.setSssgajid(dept.getDszid());
+                        tbQwJyqxMapper.insert(jyqx);
+                        total = total + jyqx.getQxsl();
+                        qxList.add(jyqx);
+                    }
+                }
+                xfbb.setJyqx(JSONArray.toJSONString(qxList));
+                xfbb.setJyqxsl(total);
+
+            }
+            if (!CollectionUtils.isEmpty(xffwList)) {
+                xffwList.forEach(item -> {
+                    TbQwXffw xffw = new TbQwXffw();
+                    xffw.setId(UUIDGenerator.getUUID());
+                    xffw.setYwid(ywid);
+                    xffw.setGlbid(item.getGlbid());
+                    xffw.setQwlx("2");
+                    xffw.setXffwlx(item.getXffwlx());
+                    xffw.setFwMc(item.getFwMc());
+                    xffw.setSsbm(dept.getDeptname());
+                    xffw.setSsbmid(dept.getDeptid());
+                    xffw.setSsbmdm(dept.getDeptcode());
+                    xffw.setSsxgajdm(dept.getFxjcode());
+                    xffw.setSsxgajid(dept.getFxjid());
+                    xffw.setSsxgaj(dept.getFxjname());
+                    xffw.setSssgaj(dept.getDszname());
+                    xffw.setSssgajdm(dept.getDszcode());
+                    xffw.setSssgajid(dept.getDszid());
+                    this.tbQwXffwMapper.insert(xffw);
+                });
+                xfbb.setXffwid(xffwList.stream().map(TbQwXffwDto::getGlbid).collect(Collectors.joining(",")));
+            }
+        }
+    }
+
+    // 删除关联数据
+    public void deleteRelevanceData(String id) {
+        this.tbQwJlMapper.deleteByYwid(id);
+        this.tbQwClMapper.deleteByYwid(id);
+        this.tbQwZnzbMapper.deleteByYwid(id);
+        this.tbQwJyqxMapper.deleteByYwid(id);
+        this.tbQwXffwMapper.deleteByYwid(id);
+    }
+
+
+    @Override
+    public void updateXfzt() {
+        List<TbQwXfbb> bbAll = this.baseMapper.getBbAll();
+        if (!CollectionUtils.isEmpty(bbAll)) {
+            for (TbQwXfbb bb : bbAll) {
+                String pbmj = bb.getPbmj();
+                String xlzt = "0";
+                if (StringUtils.isNotBlank(pbmj)) {
+                    List<TbQwJl> mjList = JSONObject.parseArray(pbmj, TbQwJl.class);
+                    for (TbQwJl jl : mjList) {
+                        BphJlxx getjlxx = tbLzotherAdaptRemoteService.getjlxx(jl.getSfzh());
+                        if (getjlxx != null) {
+                            BphJlxx bphJlxx = tbLzotherAdaptRemoteService.getjlxxCz(getjlxx);
+                            if (bphJlxx != null) {
+                                xlzt = "0";
+                            } else {
+                                xlzt = "1";
+                                //停止循环
+                                break;
+                            }
+                        }
+
+                    }
+                }
+                this.baseMapper.updateByXlzt(xlzt, bb.getId());
+            }
+
+
+        }
+
+    }
+
+    @Override
+    public Map<String, Integer> xfbbTj() {
+        Map<String, Integer> xfMap = new HashMap();
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        List<TbQwXfbb> tbQwXfbbs = this.baseMapper.selectList(new LambdaQueryWrapper<TbQwXfbb>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbQwXfbb::getSsbmdm, ssbm)
+                .eq(TbQwXfbb::getBbzt, "0")
+        );
+        xfMap.put("xfbb", tbQwXfbbs.size());
+        int xlry = 0;
+        if (!CollectionUtils.isEmpty(tbQwXfbbs)) {
+            for (TbQwXfbb xfbb : tbQwXfbbs) {
+                xlry += xfbb.getMjsl() == null ? 0 : xfbb.getMjsl();
+                xlry += xfbb.getFjsl() == null ? 0 : xfbb.getFjsl();
+            }
+        }
+        xfMap.put("xlry", xlry);
+        return xfMap;
+    }
+
+
+    @Override
+    public IPage<Object> bmtj(XfbbTjQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        IPage<TbQwXfbbVo> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
+        return this.baseMapper.bmtj(page, query);
+    }
+
+    @Override
+    public Object bmtjAll(XfbbTjQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        return this.baseMapper.bmtjAll(query);
+    }
+
+    @Override
+    public IPage<Object> xqtj(XfbbTjQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        IPage<TbQwXfbbVo> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
+        return this.baseMapper.xqtj(page, query);
+    }
+
+
+    @Override
+    public IPage<Object> grtj(XfbbTjQuery query) {
+        query.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(query.getSsbmdm(), null));
+        IPage<TbQwXfbbVo> page = PageUtils.buildPage(query.getPageSize(), query.getPageCurrent());
+        return this.baseMapper.grtj(page, query);
+    }
+
+    @Override
+    public List<TbQwXfbb> getBbidByXq(String xqid) {
+        List<TbQwXfbb> bbidByXq = this.baseMapper.getBbidByXq(xqid);
+        return bbidByXq;
+    }
+
+    @Override
+    public void delRedisXfwz() {
+        Set<String> keys = (Set<String>) redisService.keys(Constant.WZ_XFWZ + "*");
+        for (String k : keys) {
+            k = k.replaceAll("xfwz:", "");
+            int i = baseMapper.selectCount(new LambdaQueryWrapper<TbQwXfbb>()
+                    .eq(TbQwXfbb::getId, k)
+                    .eq(TbQwXfbb::getBbzt, "0")
+                    .eq(TbQwXfbb::getXtScbz, "0")
+                    .eq(TbQwXfbb::getXtSjzt, "1")
+            );
+            if (i < 1) {
+                redisService.deleteObject(Constant.WZ_XFWZ + k);
+            }
+        }
+    }
+
+    @Override
+    public Integer updateXflc(String bbid) {
+        List<TbWzLswz> bbgj = tbQwXfbbMapper.getBbgj(bbid);
+        int lc = 0;
+        if (!CollectionUtils.isEmpty(bbgj)) {
+            for (int i = 0; i < bbgj.size() - 1; i++) {
+                lc = DistanceUtils.getLc(lc, bbgj.get(i).getJd(), bbgj.get(i).getWd(), bbgj.get(i + 1).getJd(), bbgj.get(i + 1).getWd());
+            }
+            tbQwXfbbMapper.update(new TbQwXfbb().setXflc(lc), new LambdaQueryWrapper<TbQwXfbb>().eq(TbQwXfbb::getId, bbid));
+        }
+        return lc;
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfpbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfpbServiceImpl.java
new file mode 100644
index 0000000..11da4eb
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfpbServiceImpl.java
@@ -0,0 +1,1126 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwXffwDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbAddAndEditDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfpbZqDto;
+import com.mosty.base.model.dto.qwzx.TbQwXzSearchDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskUserDto;
+import com.mosty.base.model.entity.qwzx.*;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.query.qwzx.TbQwXfpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwXfpbSearchMyQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo;
+import com.mosty.base.model.vo.qwzx.TbQwXfpbZqVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.service.SysDeptService;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.qwzx.mapper.*;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.remote.TbRwzxAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwXfpbService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@AllArgsConstructor
+@Service
+public class TbQwXfpbServiceImpl extends ServiceImpl<TbQwXfpbMapper, TbQwXfpb>
+        implements TbQwXfpbService {
+
+    private final TbQwJlMapper tbQwJlMapper;
+    private final TbQwXfpbMrjlMapper tbQwXfpbMrjlMapper;
+    private final TbQwClMapper tbQwClMapper;
+    private final TbQwZnzbMapper tbQwZnzbMapper;
+    private final TbQwJyqxMapper tbQwJyqxMapper;
+    private final TbQwXfpbZqMapper tbQwXfpbZqMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwXfbbMapper tbQwXfbbMapper;
+    private final TbRwzxAdaptRemoteService tbRwzxAdaptRemoteService;
+    private final TbQwQxjMapper tbQwQxjMapper;
+    private final TbQwXffwMapper tbQwXffwMapper;
+    private final SysRoleService sysRoleService;
+    private final SysDeptService sysDeptService;
+
+    @Override
+    @Transactional
+    public int addEntity(TbQwXfpbAddAndEditDto dto) {
+        String year = DateUtils.getQueryDateString(new Date(), "13");
+        if (!DateUtils.getQueryDateString(dto.getPbksrq(), "13").equals(year) || (
+                dto.getPbjsrq() != null && !DateUtils.getQueryDateString(dto.getPbjsrq(), "13").equals(year)
+        )) {
+            throw new BusinessException("排班开始日期和结束日期必须为本年度！！");
+        }
+        TbQwXfpb entity = new TbQwXfpb();
+        BeanUtils.copyProperties(dto, entity);
+        UserInfo user = UserInfoManager.get();
+
+        entity.setId(UUIDGenerator.getUUID());
+        entity.setPbrid(String.valueOf(user.getUserId()));
+        entity.setPbr(user.getUserName());
+        entity.setPbrsfzh(user.getIdEntityCard());
+        if ("0".equals(entity.getJsrqlx())) {
+            try {
+                entity.setPbjsrq(new SimpleDateFormat("yyyy-MM-dd").parse("2099-12-31"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+                throw new BusinessException("时间格式转换异常！！");
+            }
+        }
+        if (StringUtils.isBlank(entity.getSsbmdm())) throw new BusinessException("请选择巡防部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(entity.getSsbmdm());
+        if (dept != null) {
+            entity.setSsbm(dept.getDeptname());
+            entity.setSsbmid(dept.getDeptid());
+            entity.setSsbmdm(dept.getDeptcode());
+            entity.setSsxgajdm(dept.getFxjcode());
+            entity.setSsxgajid(dept.getFxjid());
+            entity.setSsxgaj(dept.getFxjname());
+            entity.setSssgaj(dept.getDszname());
+            entity.setSssgajdm(dept.getDszcode());
+            entity.setSssgajid(dept.getDszid());
+        }
+        entity.setXtSjly("1");
+        // 保存周期表信息和其他信息
+        this.setXfpbzq(dto, entity, dept, null);
+        return this.baseMapper.insert(entity);
+    }
+
+    // 判断是否有时间重合、任务重合的情况，如果存在，则提示给前端
+    private void checkPbxx(TbQwXfpbAddAndEditDto dto) {
+        // 查询所有的人员，根据人员查询该时间段是否有排班信息
+        List<TbQwXfpbZqDto> zqList = dto.getZqList();
+        if (zqList == null || zqList.size() == 0) {
+            throw new BusinessException("请配置周期信息");
+        }
+        for (int i = 0; i < zqList.size(); i++) {
+            TbQwXfpbZqDto zq = zqList.get(i);
+            this.checkUserPb(zq, dto, zq.getFzrId(), "01", zq.getFzrXm());
+            List<TbQwJl> jlList = zq.getJlList();
+            if (jlList == null || jlList.size() == 0) {
+                throw new BusinessException("请配置第" + (i + 1) + "班的警力信息");
+            }
+            jlList.forEach(jl -> this.checkUserPb(zq, dto, jl.getJlId(), jl.getJllx(), jl.getJlxm()));
+        }
+    }
+
+    // 检查用户信息是否重合
+    private void checkUserPb(TbQwXfpbZqDto zq, TbQwXfpbAddAndEditDto dto, String jlId,
+                             String jlLx, String jlxm) {
+        // 查询重合的排班信息
+        String kssj = DateUtils.getQueryDateString(zq.getKssj(), "02");
+        String jssj = "";
+        if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+            jssj = "1970-01-02" + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+        }
+        List<TbQwXfpb> pbTempList = this.baseMapper.getPbBySjAndJl
+                (DateUtils.getQueryDateString(dto.getPbksrq(), "01"),
+                        DateUtils.getQueryDateString(dto.getPbjsrq(), "01"),
+                        jlId, kssj, jssj, dto.getId());
+        pbTempList.forEach(pbTemp -> {
+            throw new BusinessException(("01".equals(jlLx) ? "民警" : "辅警") + "(" + jlxm + ")在" +
+                    "其他排班中时间冲突，冲突排班名称：" + pbTemp.getPbmc());
+        });
+    }
+
+
+    @Override
+    @Transactional
+    public Integer editEntity(TbQwXfpbAddAndEditDto dto) {
+        // 判断是否有时间重合、任务重合的情况，如果存在，则提示给前端
+        // this.checkPbxx(dto);
+        String year = DateUtils.getQueryDateString(new Date(), "13");
+        if (!DateUtils.getQueryDateString(dto.getPbksrq(), "13").equals(year) || (
+                dto.getPbjsrq() != null && !DateUtils.getQueryDateString(dto.getPbjsrq(), "13").equals(year)
+        )) {
+            throw new BusinessException("排班开始日期和结束日期必须为本年度！！");
+        }
+        TbQwXfpb pb = new TbQwXfpb();
+        BeanUtils.copyProperties(dto, pb);
+        if ("0".equals(pb.getJsrqlx())) {
+            try {
+                pb.setPbjsrq(new SimpleDateFormat("yyyy-MM-dd").parse("2099-12-31"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+                throw new BusinessException("时间格式转换异常！！");
+            }
+        }
+        if (StringUtils.isBlank(pb.getSsbmdm())) throw new BusinessException("请选择巡防部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(pb.getSsbmdm());
+        if (dept != null) {
+            pb.setSsbm(dept.getDeptname());
+            pb.setSsbmid(dept.getDeptid());
+            pb.setSsbmdm(dept.getDeptcode());
+            pb.setSsxgajdm(dept.getFxjcode());
+            pb.setSsxgajid(dept.getFxjid());
+            pb.setSsxgaj(dept.getFxjname());
+            pb.setSssgaj(dept.getDszname());
+            pb.setSssgajdm(dept.getDszcode());
+            pb.setSssgajid(dept.getDszid());
+        }
+        // 删除排班表的数据
+        this.deleteXfpb(pb.getId());
+        // 添加排班表数据
+        this.setXfpbzq(dto, pb, dept, dto.getId());
+        return this.baseMapper.updateById(pb);
+    }
+
+    @Override
+    @Transactional
+    public Integer delEntity(String id) {
+        // 删除巡防排班周期和警力信息
+        this.deleteXfpb(id);
+        // 删除排班信息
+        return this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    @Transactional
+    public void delBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            ids.forEach(id -> {
+                // 删除值班排班周期和警力信息
+                this.deleteXfpb(id);
+                // 删除排班信息
+                this.baseMapper.deleteById(id);
+            });
+        }
+    }
+
+    @Override
+    public IPage<TbQwXfpbAddAndEditDto> getPageList(TbQwXfpbQuery dto) {
+        QueryWrapper<TbQwXfpb> qw = new QueryWrapper<>();
+        UserInfo userInfo = UserInfoManager.get();
+//      PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        qw.lambda().eq(StringUtils.isNotBlank(dto.getJsrqlx()), TbQwXfpb::getJsrqlx, dto.getJsrqlx())
+                .eq(dto.getXhzq() != null, TbQwXfpb::getXhzq, dto.getXhzq())
+                .eq(StringUtils.isNotBlank(dto.getXhlx()), TbQwXfpb::getXhlx, dto.getXhlx())
+                .eq(dto.getMrbc() != null, TbQwXfpb::getMrbc, dto.getMrbc())
+                .like(dto.getPbmc() != null, TbQwXfpb::getPbmc, dto.getPbmc())
+                .eq(StringUtils.isNotBlank(dto.getPbr()), TbQwXfpb::getPbr, dto.getPbr())
+                .eq(StringUtils.isNotBlank(dto.getSsbmdm()), TbQwXfpb::getSsbmdm, dto.getSsbmdm())
+                .eq(StringUtils.isNotBlank(dto.getSsbmid()), TbQwXfpb::getSsbmid, dto.getSsbmid());
+        if (dto.getPbksrq() != null && dto.getPbjsrq() != null) {
+            qw.lambda().and(
+                    it -> it.last("'" + DateUtils.getQueryDateString(dto.getPbksrq(), "01") + "' between DATE_FORMAT(pbksrq,'%y-%m-%d') and DATE_FORMAT(pbjsrq,'%y-%m-%d')" +
+                            " or '" + DateUtils.getQueryDateString(dto.getPbjsrq(), "01") + "' between DATE_FORMAT(pbksrq,'%y-%m-%d') and DATE_FORMAT(pbjsrq,'%y-%m-%d')")
+            );
+        }
+        qw.last(StringUtils.isNotBlank(dto.getFzrXm()), " and id in (select pb_id from tb_qw_xfpb_zq where " +
+                "fzr_xm like concat('%','" + dto.getFzrXm() + "','%'))");
+        IPage<TbQwXfpb> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page = this.baseMapper.selectPage(page, qw);
+        IPage<TbQwXfpbAddAndEditDto> rPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbQwXfpb> list = page.getRecords();
+        List<TbQwXfpbAddAndEditDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbQwXfpbAddAndEditDto entity = new TbQwXfpbAddAndEditDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwXfpbZq>().eq(TbQwXfpbZq::getPbId, item.getId())
+            );
+            List<TbQwXfpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwXfpbZqDto zqDto = new TbQwXfpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                // 查询车辆列表
+                List<TbQwCl> clList = this.tbQwClMapper.selectList(
+                        new LambdaQueryWrapper<TbQwCl>().eq(TbQwCl::getYwid, zqDto.getId())
+                );
+                zqDto.setClList(clList);
+                // 查询通讯装备列表
+                List<TbQwZnzb> znzbList = this.tbQwZnzbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZnzb>().eq(TbQwZnzb::getYwid, zqDto.getId())
+                );
+                zqDto.setZnzbList(znzbList);
+                // 查询警用器械列表
+                List<TbQwJyqx> jyqxList = this.tbQwJyqxMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJyqx>().eq(TbQwJyqx::getYwid, zqDto.getId())
+                );
+                zqDto.setJyqxList(jyqxList);
+                // 查询巡防范围
+                List<TbQwXffw> xffwList = this.tbQwXffwMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXffw>().eq(TbQwXffw::getYwid, zqItem.getId())
+                );
+                List<TbQwXffwDto> xffwDtoList = new ArrayList<>();
+                xffwList.forEach(x -> {
+                    TbQwXffwDto d = new TbQwXffwDto();
+                    BeanUtils.copyProperties(x, d);
+                    xffwDtoList.add(d);
+                });
+                zqDto.setXffwList(xffwDtoList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setZqList(zqDtoList);
+            rList.add(entity);
+        });
+        rPage.setRecords(rList);
+        rPage.setTotal(page.getTotal());
+        return rPage;
+    }
+
+    @Override
+    public TbQwXfpbAddAndEditDto getInfo(String id) {
+        TbQwXfpb item = this.baseMapper.selectById(id);
+        if (item != null) {
+            TbQwXfpbAddAndEditDto entity = new TbQwXfpbAddAndEditDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwXfpbZq>().eq(TbQwXfpbZq::getPbId, item.getId())
+            );
+            List<TbQwXfpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwXfpbZqDto zqDto = new TbQwXfpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                // 查询车辆列表
+                List<TbQwCl> clList = this.tbQwClMapper.selectList(
+                        new LambdaQueryWrapper<TbQwCl>().eq(TbQwCl::getYwid, zqDto.getId())
+                );
+                zqDto.setClList(clList);
+                // 查询通讯装备列表
+                List<TbQwZnzb> znzbList = this.tbQwZnzbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZnzb>().eq(TbQwZnzb::getYwid, zqDto.getId())
+                );
+                zqDto.setZnzbList(znzbList);
+                // 查询警用器械列表
+                List<TbQwJyqx> jyqxList = this.tbQwJyqxMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJyqx>().eq(TbQwJyqx::getYwid, zqDto.getId())
+                );
+                zqDto.setJyqxList(jyqxList);
+                // 查询巡防范围
+                List<TbQwXffw> xffwList = this.tbQwXffwMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXffw>().eq(TbQwXffw::getYwid, zqItem.getId())
+                );
+                List<TbQwXffwDto> xffwDtoList = new ArrayList<>();
+                xffwList.forEach(x -> {
+                    TbQwXffwDto d = new TbQwXffwDto();
+                    BeanUtils.copyProperties(x, d);
+                    xffwDtoList.add(d);
+                });
+                zqDto.setXffwList(xffwDtoList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setZqList(zqDtoList);
+            return entity;
+        }
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public IPage<TbQwXfpbAddAndEditDto> getMyXfpb(TbQwXfpbSearchMyQuery dto) {
+        IPage<TbQwXfpbAddAndEditDto> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        UserInfo userInfo = UserInfoManager.get();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("ryid", String.valueOf(userInfo.getUserId()));
+        int count = this.baseMapper.getCount(map);
+        List<TbQwXfpb> list = this.baseMapper.getList(map);
+        List<TbQwXfpbAddAndEditDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbQwXfpbAddAndEditDto entity = new TbQwXfpbAddAndEditDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwXfpbZq>().eq(TbQwXfpbZq::getPbId, item.getId())
+            );
+            List<TbQwXfpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwXfpbZqDto zqDto = new TbQwXfpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                // 查询车辆列表
+                List<TbQwCl> clList = this.tbQwClMapper.selectList(
+                        new LambdaQueryWrapper<TbQwCl>().eq(TbQwCl::getYwid, zqDto.getId())
+                );
+                zqDto.setClList(clList);
+                // 查询通讯装备列表
+                List<TbQwZnzb> znzbList = this.tbQwZnzbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZnzb>().eq(TbQwZnzb::getYwid, zqDto.getId())
+                );
+                zqDto.setZnzbList(znzbList);
+                // 查询警用器械列表
+                List<TbQwJyqx> jyqxList = this.tbQwJyqxMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJyqx>().eq(TbQwJyqx::getYwid, zqDto.getId())
+                );
+                zqDto.setJyqxList(jyqxList);
+                // 查询巡防范围
+                List<TbQwXffw> xffwList = this.tbQwXffwMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXffw>().eq(TbQwXffw::getYwid, item.getId())
+                );
+                List<TbQwXffwDto> xffwDtoList = new ArrayList<>();
+                xffwList.forEach(x -> {
+                    TbQwXffwDto d = new TbQwXffwDto();
+                    BeanUtils.copyProperties(x, d);
+                    xffwDtoList.add(d);
+                });
+                zqDto.setXffwList(xffwDtoList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setZqList(zqDtoList);
+            rList.add(entity);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    public void checkThisTimeXfpb() {
+        List<TbQwXfpbMrjl> list = this.baseMapper.checkThisTimeXfpb();
+        TbRwTaskDto task = new TbRwTaskDto();
+        List<TbRwTaskUserDto> userDtoList = new ArrayList<>();
+        if (list.size() > 0) {
+            list.forEach(item -> {
+                // 查询是否发送消息，如果发送则无需发送了
+                TbRwTaskByYwidQuery query = new TbRwTaskByYwidQuery();
+                query.setYwid(item.getId());
+                query.setRwxl("03");
+                TbRwTask temp = this.tbRwzxAdaptRemoteService.getRwByYwid(query);
+                if (temp == null) {
+                    // 判断本次排班是否报备,如果没有报备就不需要提醒了
+                    int count = this.tbQwXfbbMapper.selectCount(
+                            new LambdaQueryWrapper<TbQwXfbb>()
+                                    .eq(TbQwXfbb::getXfpbId, item.getPbId())
+                                    .eq(TbQwXfbb::getBbzt, "0")
+                                    .eq(TbQwXfbb::getXfrq, new Date())
+                    );
+                    TbQwXfpbZq zq = this.tbQwXfpbZqMapper.selectById(item.getPbzqId());
+                    if (count == 0) {
+                        // 需要发出提醒
+                        TbRwTaskUserDto itemDto = new TbRwTaskUserDto();
+                        itemDto.setRwzflx("1");
+                        itemDto.setJsrid(zq.getFzrId());
+                        itemDto.setJsrmc(zq.getFzrXm());
+                        itemDto.setJsrsfzh(zq.getFzrSfzh());
+                        itemDto.setJsrlxdh(zq.getFzrLxdh());
+                        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(zq.getFzrId());
+                        if (dept != null) {
+                            itemDto.setSsbm(dept.getDeptname());
+                            itemDto.setSsbmid(dept.getDeptid());
+                        }
+                        userDtoList.add(itemDto);
+                        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                                new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, item.getPbzqId())
+                                        .eq(TbQwJl::getJllx, "01")
+                        );
+                        jlList.forEach(jl -> {
+                            TbRwTaskUserDto itemDtos = new TbRwTaskUserDto();
+                            itemDtos.setRwzflx("1");
+                            itemDtos.setJsrid(jl.getJlId());
+                            itemDtos.setJsrmc(jl.getJlxm());
+                            itemDtos.setJsrsfzh(jl.getSfzh());
+                            itemDtos.setJsrlxdh(jl.getLxdh());
+                            DeptInfoVo deptVo = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(jl.getJlId());
+                            if (deptVo != null) {
+                                itemDtos.setSsbm(deptVo.getDeptname());
+                                itemDtos.setSsbmid(deptVo.getDeptid());
+                            }
+                            // 判断重复数据
+                            List<TbRwTaskUserDto> tempList = userDtoList.stream().filter(t -> t.getJsrid().equals(jl.getJlId())).collect(Collectors.toList());
+                            if (tempList.size() == 0) {
+                                userDtoList.add(itemDtos);
+                            }
+                        });
+                    }
+                    if (userDtoList.size() > 0) {
+                        task.setSsbmid(zq.getSsbmid());
+                        task.setSsbmdm(zq.getSsbmdm());
+                        task.setRwmc("巡防报备提醒");
+                        task.setRwnr("根据巡防排班安排，请您于" + new SimpleDateFormat("HH:mm").format(zq.getKssj()) + "前，" +
+                                "进行巡防报备！！");
+                        task.setRwjsdx("01");
+                        task.setRwlx("2");
+                        task.setRwxl("03");
+                        task.setRwjjcd("3");
+                        task.setRwms("1");
+                        task.setSfaqwc("1");
+                        task.setCjrid("-1");
+                        task.setCjrxm("系统");
+                        task.setCjrlxdh("");
+                        Date sj;
+                        // 跨天
+                        if (zq.getJssj().getTime() <= zq.getKssj().getTime()) {
+                            sj = DateUtils.getNextDate(
+                                    DateUtils.strToDate(
+                                            DateUtils.getQueryDateString(
+                                                    DateUtils.getNextDate(new Date(), "D", +1), "01") + " " +
+                                                    DateUtils.getQueryDateString(zq.getJssj(), "10"), "02"
+                                    ), "H", +2
+                            );
+                        } else {
+                            sj = DateUtils.getNextDate(
+                                    DateUtils.strToDate(
+                                            DateUtils.getQueryDateString(new Date(), "01") + " " +
+                                                    DateUtils.getQueryDateString(zq.getJssj(), "10"), "02"
+                                    ), "H", +2
+                            );
+                        }
+                        task.setRwyqwcsj(sj);
+                        task.setYwid(item.getId());
+                        task.setUserDtoList(userDtoList);
+                        this.tbRwzxAdaptRemoteService.addRw(task);
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public TbQwXfpbZqMyVo getPbZq(String id, String time) {
+        TbQwXfpbZq zqItem = this.tbQwXfpbZqMapper.selectById(id);
+        if (zqItem == null) {
+            return null;
+        }
+        TbQwXfpbZqMyVo zqDto = new TbQwXfpbZqMyVo();
+        BeanUtils.copyProperties(zqItem, zqDto);
+        // 查询警力列表
+        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+        );
+        zqDto.setJlList(jlList);
+        // 查询车辆列表
+        List<TbQwCl> clList = this.tbQwClMapper.selectList(
+                new LambdaQueryWrapper<TbQwCl>().eq(TbQwCl::getYwid, zqDto.getId())
+        );
+        zqDto.setClList(clList);
+        // 查询通讯装备列表
+        List<TbQwZnzb> znzbList = this.tbQwZnzbMapper.selectList(
+                new LambdaQueryWrapper<TbQwZnzb>().eq(TbQwZnzb::getYwid, zqDto.getId())
+        );
+        zqDto.setZnzbList(znzbList);
+        // 查询警用器械列表
+        List<TbQwJyqx> jyqxList = this.tbQwJyqxMapper.selectList(
+                new LambdaQueryWrapper<TbQwJyqx>().eq(TbQwJyqx::getYwid, zqDto.getId())
+        );
+        zqDto.setJyqxList(jyqxList);
+        // 查询每日警力（获取每日警力ID完成任务）
+        TbQwXfpbMrjl mrjl = this.tbQwXfpbMrjlMapper.selectOne(
+                new LambdaQueryWrapper<TbQwXfpbMrjl>()
+                        .eq(TbQwXfpbMrjl::getPbzqId, zqDto.getId())
+                        .eq(TbQwXfpbMrjl::getXfrq, time)
+                        .last(" limit 1")
+        );
+        if (mrjl != null) {
+            zqDto.setMrjlid(mrjl.getId());
+        }
+        return zqDto;
+    }
+
+    @Override
+    public void addMrjl() {
+        // 查询巡防排班信息
+        List<TbQwXfpb> pbList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfpb>()
+                        .eq(TbQwXfpb::getXtSjzt, "1")
+                        .eq(TbQwXfpb::getJsrqlx, "0")
+        );
+        if (!CollectionUtils.isEmpty(pbList)) {
+            pbList.forEach(pb -> {
+                List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXfpbZq>()
+                                .eq(TbQwXfpbZq::getPbId, pb.getId())
+                                .eq(TbQwXfpbZq::getXtSjzt, "1")
+                );
+                zqList.forEach(zq -> {
+                    // 获取本年的第一天
+                    Date firstDay = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "13") + "-01-01", "01");
+                    pb.setPbksrq(firstDay);
+                    // 获取本年最后一天的数据
+                    Date lastDay = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "13") + "-12-31", "01");
+                    if (lastDay.getTime() >= pb.getPbjsrq().getTime()) {
+                        lastDay = pb.getPbjsrq();
+                    }
+                    pb.setPbjsrq(lastDay);
+                    this.setXfpbMrjlOther(pb, zq);
+                });
+            });
+        }
+    }
+
+
+    @Override
+    public List<Map<String, Object>> getPbbbByMonthBm(String time, String ssbmdm) {
+        if (StringUtils.isBlank(ssbmdm)) {
+            UserInfo user = UserInfoManager.get();
+            ssbmdm = user.getDeptCode();
+        }
+        Date kssj = DateUtils.strToDate(time + "-01", "01");
+        Date jssj = DateUtils.getThisMonthLastDay(time);
+        List<Map<String, Object>> rList = new ArrayList<>();
+        ssbmdm = tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+        while (kssj.getTime() <= jssj.getTime()) {
+            Map<String, Object> xfMap = new HashMap<>();
+            xfMap.put("day", DateUtils.getQueryDateString(kssj, "01"));
+            QueryWrapper<TbQwXfpb> tb = new QueryWrapper<>();
+            tb.lambda().likeRight(TbQwXfpb::getSsbmdm, ssbmdm);
+            tb.lambda().last("and DATE_FORMAT('" + DateUtils.getQueryDateString(kssj, "01") + "', '%Y-%m-%d') <= pbjsrq  AND DATE_FORMAT( '" + DateUtils.getQueryDateString(kssj, "01") + "', '%Y-%m-%d' ) >= pbksrq ");
+            List<TbQwXfpb> tbQwXfpbs = this.baseMapper.selectList(tb);
+            xfMap.put("tbQwXfpbs", tbQwXfpbs);
+            xfMap.put("pbs", tbQwXfpbs.size());
+            Set<String> mjSet = new HashSet<>();
+            Set<String> fjSet = new HashSet<>();
+            if (!CollectionUtils.isEmpty(tbQwXfpbs)) {
+                for (TbQwXfpb pb : tbQwXfpbs) {
+                    List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(new LambdaQueryWrapper<TbQwXfpbZq>().eq(TbQwXfpbZq::getPbId, pb.getId()));
+                    if (!CollectionUtils.isEmpty(zqList)) {
+                        for (TbQwXfpbZq zb : zqList) {
+                            String pbmj = zb.getPbmj();
+                            if (StringUtils.isNotBlank(pbmj)) {
+                                List<TbQwJl> mjList = JSONObject.parseArray(pbmj, TbQwJl.class);
+                                mjList.forEach(v -> {
+                                    mjSet.add(v.getSfzh());
+                                });
+                            }
+                            String pbfj = zb.getPbfj();
+                            if (StringUtils.isNotBlank(pbfj)) {
+                                List<TbQwJl> mjList = JSONObject.parseArray(pbfj, TbQwJl.class);
+                                mjList.forEach(v -> {
+                                    fjSet.add(v.getSfzh());
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            xfMap.put("mjSet", mjSet.size());
+            xfMap.put("fjSet", mjSet.size());
+            rList.add(xfMap);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+        return rList;
+    }
+
+    /**
+     * zt: 01.已排班 02.报备中 03.已报备 04.请假
+     *
+     * @param time
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPbbbByMonth(String time) {
+        UserInfo user = UserInfoManager.get();
+
+        String userId = String.valueOf(user.getUserId());
+        List<Map<String, Object>> rList = new ArrayList<>();
+        Date kssj = DateUtils.strToDate(time + "-01", "01");
+        Date jssj = DateUtils.getThisMonthLastDay(time);
+        while (kssj.getTime() <= jssj.getTime()) {
+            // 查询排班情况
+            List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.getMyXfpbByTime(kssj, userId);
+            Map<String, Object> map = new HashMap<>();
+            map.put("day", DateUtils.getQueryDateString(kssj, "12"));
+            List<Map<String, Object>> dayList = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(zqList)) {
+                Date finalKssj = kssj;
+                List<Map<String, Object>> finalDayList = dayList;
+                zqList.forEach(zq -> {
+                    Map<String, Object> dayMap = new HashMap<>();
+                    dayMap.put("zt", "01");
+                    dayMap.put("time", DateUtils.getQueryDateString(zq.getKssj(), "09") + "-"
+                            + DateUtils.getQueryDateString(zq.getJssj(), "09"));
+                    dayMap.put("id", zq.getId());
+                    // 查询是否报备，如果报备，则覆盖排班信息，改为报备信息
+                    TbQwXfbb xfbb = this.tbQwXfbbMapper.selectOne(
+                            new LambdaQueryWrapper<TbQwXfbb>()
+                                    .eq(TbQwXfbb::getXfpbId, zq.getId())
+                                    .eq(TbQwXfbb::getXfrq, finalKssj)
+                                    .orderByDesc(TbQwXfbb::getBbkssj)
+                                    .last(" limit 1")
+                    );
+                    if (xfbb != null) {
+                        if ("0".equals(xfbb.getBbzt())) {
+                            dayMap.put("zt", "02");
+                            dayMap.put("time", DateUtils.getQueryDateString(xfbb.getBbkssj(), "09") + "-当前");
+                            dayMap.put("id", xfbb.getId());
+                        } else if ("1".equals(xfbb.getBbzt())) {
+                            dayMap.put("zt", "03");
+                            dayMap.put("time", DateUtils.getQueryDateString(xfbb.getBbkssj(), "09") + "-" +
+                                    DateUtils.getQueryDateString(xfbb.getBbjssj(), "09"));
+                            dayMap.put("id", xfbb.getId());
+                        }
+                    }
+                    finalDayList.add(dayMap);
+                });
+            }
+            // 查询其他的报备信息
+            List<TbQwXfbb> bbList = this.tbQwXfbbMapper.getMybbTodayByTime(String.valueOf(user.getUserId()),
+                    null, DateUtils.getQueryDateString(kssj, "01"));
+            for (TbQwXfbb item : bbList) {
+                Map<String, Object> dayMap = new HashMap<>();
+                dayMap.put("zt", "0".equals(item.getBbzt()) ? "02" : "03");
+                dayMap.put("time", DateUtils.getQueryDateString(item.getKssj(), "09") + "-"
+                        + DateUtils.getQueryDateString(item.getJssj(), "09"));
+                dayMap.put("id", item.getId());
+                dayList.add(dayMap);
+            }
+            // 查询请休假信息
+            TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwQxj>()
+                            .eq(TbQwQxj::getSqrId, userId)
+                            .le(TbQwQxj::getKssj, kssj)
+                            .ge(TbQwQxj::getJssj, kssj)
+                            .last(" limit 1")
+            );
+            if (qxj != null) {
+                Map<String, Object> dayMap = new HashMap<>();
+                dayMap.put("zt", "04");
+                dayMap.put("time", "00:00-23:59");
+                dayList = new ArrayList<>();
+                dayList.add(dayMap);
+            }
+            map.put("list", dayList);
+            rList.add(map);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+        return rList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getXfbbByMonth(String time) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录！");
+        }
+        String ssbmdm = String.valueOf(user.getDeptCode());
+        List<Map<String, Object>> rList = new ArrayList<>();
+        Date kssj = DateUtils.strToDate(time + "-01", "01");
+        Date jssj = DateUtils.getThisMonthLastDay(time);
+        while (kssj.getTime() <= jssj.getTime()) {
+            // 查询排班情况
+            Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+            Map<String, Object> map = new HashMap<>();
+            map.put("time", DateUtils.getQueryDateString(kssj, "01"));
+            // 过去,有值班展示值班信息，没有就不展示
+            if (now.getTime() > kssj.getTime()) {
+                List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXfbb>()
+                                .eq(TbQwXfbb::getXfrq, kssj)
+                                .eq(TbQwXfbb::getXtSjzt, "1")
+                                .eq(TbQwXfbb::getSsbmdm, ssbmdm)
+                );
+                if (bbList != null && bbList.size() != 0) {
+                    map.put("type", "01");
+                    map.put("list", bbList);
+                } else {
+                    map.put("type", "00");
+                }
+                // 当天，有报备展示报备，没有报备展示排班
+            } else if (now.getTime() == kssj.getTime()) {
+                List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwXfbb>()
+                                .eq(TbQwXfbb::getXfrq, kssj)
+                                .eq(TbQwXfbb::getXtSjzt, "1")
+                                .eq(TbQwXfbb::getSsbmdm, ssbmdm)
+                );
+                if (bbList != null && bbList.size() != 0) {
+                    map.put("type", "02");
+                    map.put("list", bbList);
+                } else {
+                    List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.getDeptByMonth(kssj, ssbmdm);
+                    if (zqList != null && zqList.size() > 0) {
+                        map.put("type", "03");
+                        map.put("list", zqList);
+                    } else {
+                        map.put("type", "04");
+                    }
+                }
+            } else {
+                List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.getDeptByMonth(kssj, ssbmdm);
+                if (zqList != null && zqList.size() > 0) {
+                    map.put("type", "05");
+                    map.put("list", zqList);
+                } else {
+                    map.put("type", "06");
+                }
+            }
+            rList.add(map);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+        return rList;
+    }
+
+    @Override
+    public TbQwXfpbZqMyVo getMyXfpbToday() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("登录异常，请重新登录");
+        }
+        return this.tbQwXfpbZqMapper.getMyXfpbToday(String.valueOf(user.getUserId()));
+    }
+
+    @Override
+    public IPage<TbQwXfpbZqVo> getThisMonthPbList(TbQwXzSearchDto dto) {
+        IPage<TbQwXfpbMrjl> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        page = this.tbQwXfpbMrjlMapper.selectPage(page,
+                new LambdaQueryWrapper<TbQwXfpbMrjl>()
+                        .last(" where DATE_FORMAT(xfrq,'%y-%m') = DATE_FORMAT(now(),'%y-%m') order by xfrq desc")
+        );
+        IPage<TbQwXfpbZqVo> resPage = new Page<>(dto.getPageNum(), dto.getPageSize());
+        List<TbQwXfpbMrjl> zqList = page.getRecords();
+        List<TbQwXfpbZqVo> resList = new ArrayList<>();
+        zqList.forEach(item -> {
+            // 根据执勤周期Id查询执勤周期信息
+            TbQwXfpbZq zq = this.tbQwXfpbZqMapper.selectById(item.getPbzqId());
+            TbQwXfpbZqVo vo = new TbQwXfpbZqVo();
+            BeanUtils.copyProperties(zq, vo);
+            vo.setXfrq(item.getXfrq());
+            resList.add(vo);
+        });
+        resPage.setRecords(resList);
+        resPage.setTotal(page.getTotal());
+        return resPage;
+    }
+
+    // 删除排班表中的数据
+    private void deleteXfpb(String id) {
+        List<TbQwXfpbZq> zqList = this.tbQwXfpbZqMapper.selectList(
+                new LambdaQueryWrapper<TbQwXfpbZq>()
+                        .eq(TbQwXfpbZq::getPbId, id)
+        );
+        if (!CollectionUtils.isEmpty(zqList)) {
+            zqList.forEach(zq -> {
+                // 删除警力信息
+                this.tbQwJlMapper.deleteByYwid(zq.getId());
+                // 删除车辆信息
+                this.tbQwClMapper.deleteByYwid(zq.getId());
+                // 删除警用器械
+                this.tbQwJyqxMapper.deleteByYwid(zq.getId());
+                // 删除智能装备
+                this.tbQwZnzbMapper.deleteByYwid(zq.getId());
+                // 删除每日警力数据
+                this.tbQwXfpbMrjlMapper.deleteByYwid(id, zq.getId());
+                // 删除巡防范围
+                this.tbQwXffwMapper.deleteByYwid(zq.getId());
+            });
+        }
+        this.tbQwXfpbZqMapper.deleteByPbId(id);
+    }
+
+    // 保存周期表信息和其他信息
+    private void setXfpbzq(TbQwXfpbAddAndEditDto dto, TbQwXfpb entity, DeptInfoVo dept, String pbid) {
+        List<TbQwXfpbZqDto> zqList = dto.getZqList();
+        if (!CollectionUtils.isEmpty(zqList)) {
+            zqList.forEach(zqDto -> {
+                TbQwXfpbZq zq = new TbQwXfpbZq();
+                BeanUtils.copyProperties(zqDto, zq);
+                // 保存每一个周期
+                zq.setPbId(entity.getId());
+                zq.setId(UUIDGenerator.getUUID());
+                zq.setXtSjly("1");
+                if (dept != null) {
+                    zq.setSsbm(dept.getDeptname());
+                    zq.setSsbmid(dept.getDeptid());
+                    zq.setSsbmdm(dept.getDeptcode());
+                    zq.setSsxgajdm(dept.getFxjcode());
+                    zq.setSsxgajid(dept.getFxjid());
+                    zq.setSsxgaj(dept.getFxjname());
+                    zq.setSssgaj(dept.getDszname());
+                    zq.setSssgajdm(dept.getDszcode());
+                    zq.setSssgajid(dept.getDszid());
+                }
+                // 保存警力
+                List<TbQwJl> jlList = zqDto.getJlList();
+                List<TbQwJl> mjList = new ArrayList<>(), fjList = new ArrayList<>();
+                if (!CollectionUtils.isEmpty(jlList)) {
+                    for (TbQwJl jl : jlList) {
+                        if ("01".equals(jl.getJllx())) {
+                            mjList.add(jl);
+                        } else if ("02".equals(jl.getJllx())) {
+                            fjList.add(jl);
+                        }
+                        // 保存警力信息
+                        jl.setId(UUIDGenerator.getUUID());
+                        jl.setYwid(zq.getId());
+                        jl.setZblx("2");
+                        jl.setJlzt("1");
+                        jl.setXtSjly("1");
+                        if (dept != null) {
+                            jl.setSsbm(dept.getDeptname());
+                            jl.setSsbmid(dept.getDeptid());
+                            jl.setSsbmdm(dept.getDeptcode());
+                            jl.setSsxgajdm(dept.getFxjcode());
+                            jl.setSsxgajid(dept.getFxjid());
+                            jl.setSsxgaj(dept.getFxjname());
+                            jl.setSssgaj(dept.getDszname());
+                            jl.setSssgajdm(dept.getDszcode());
+                            jl.setSssgajid(dept.getDszid());
+                        }
+                        this.tbQwJlMapper.insert(jl);
+                    }
+                }
+                zq.setMjsl(mjList.size());
+                zq.setFjsl(fjList.size());
+                zq.setPbmj(JSONArray.toJSONString(mjList));
+                zq.setPbfj(JSONArray.toJSONString(fjList));
+                // 保存警车
+                List<TbQwCl> clList = zqDto.getClList();
+                // 车车巡步巡
+                zq.setXlfs(clList.size() > 0 ? "0" : "1");
+                if (!CollectionUtils.isEmpty(clList)) {
+                    clList.forEach(cl -> {
+                        cl.setYwid(zq.getId());
+                        cl.setId(UUIDGenerator.getUUID());
+                        cl.setXtSjly("1");
+                        cl.setZblx("2");
+                        if (dept != null) {
+                            cl.setSsbm(dept.getDeptname());
+                            cl.setSsbmid(dept.getDeptid());
+                            cl.setSsbmdm(dept.getDeptcode());
+                            cl.setSsxgajdm(dept.getFxjcode());
+                            cl.setSsxgajid(dept.getFxjid());
+                            cl.setSsxgaj(dept.getFxjname());
+                            cl.setSssgaj(dept.getDszname());
+                            cl.setSssgajdm(dept.getDszcode());
+                            cl.setSssgajid(dept.getDszid());
+                        }
+                        this.tbQwClMapper.insert(cl);
+                    });
+                }
+                zq.setPbcl(JSONArray.toJSONString(clList));
+                zq.setJcsl(clList.size());
+                // 智能装备
+                List<TbQwZnzb> znzbList = zqDto.getZnzbList();
+                if (!CollectionUtils.isEmpty(znzbList)) {
+                    znzbList.forEach(znzb -> {
+                        znzb.setYwid(zq.getId());
+                        znzb.setId(UUIDGenerator.getUUID());
+                        znzb.setXtSjly("1");
+                        znzb.setZblx("2");
+                        if (dept != null) {
+                            znzb.setSsbm(dept.getDeptname());
+                            znzb.setSsbmid(dept.getDeptid());
+                            znzb.setSsbmdm(dept.getDeptcode());
+                            znzb.setSsxgajdm(dept.getFxjcode());
+                            znzb.setSsxgajid(dept.getFxjid());
+                            znzb.setSsxgaj(dept.getFxjname());
+                            znzb.setSssgaj(dept.getDszname());
+                            znzb.setSssgajdm(dept.getDszcode());
+                            znzb.setSssgajid(dept.getDszid());
+                        }
+                        this.tbQwZnzbMapper.insert(znzb);
+                    });
+                }
+                zq.setTxzb(JSONArray.toJSONString(znzbList));
+                zq.setTxzbsl(znzbList.size());
+                // 警用器械
+                List<TbQwJyqx> jyqxList = zqDto.getJyqxList();
+                if (!CollectionUtils.isEmpty(jyqxList)) {
+                    jyqxList.forEach(jyqx -> {
+                        jyqx.setYwid(zq.getId());
+                        jyqx.setId(UUIDGenerator.getUUID());
+                        jyqx.setXtSjly("1");
+                        jyqx.setZblx("2");
+                        if (dept != null) {
+                            jyqx.setSsbm(dept.getDeptname());
+                            jyqx.setSsbmid(dept.getDeptid());
+                            jyqx.setSsbmdm(dept.getDeptcode());
+                            jyqx.setSsxgajdm(dept.getFxjcode());
+                            jyqx.setSsxgajid(dept.getFxjid());
+                            jyqx.setSsxgaj(dept.getFxjname());
+                            jyqx.setSssgaj(dept.getDszname());
+                            jyqx.setSssgajdm(dept.getDszcode());
+                            jyqx.setSssgajid(dept.getDszid());
+                        }
+                        this.tbQwJyqxMapper.insert(jyqx);
+                    });
+                }
+                // 保存巡防范围表的数据
+                this.setXffw(zqDto, entity, zq, dept);
+                this.tbQwXfpbZqMapper.insert(zq);
+                zq.setJyqx(JSONArray.toJSONString(jyqxList));
+                zq.setJyqxsl(jyqxList.size());
+                // 保存时间段内的所有的警力数据
+                List<String> jlIds = jlList.stream().map(TbQwJl::getJlId).collect(Collectors.toList());
+                jlIds.add(zq.getFzrId());
+                this.setXfpbMrjl(entity, zq, jlIds, pbid);
+            });
+        }
+    }
+
+    // 保存巡防范围表的数据
+    private void setXffw(TbQwXfpbZqDto zqDto, TbQwXfpb entity, TbQwXfpbZq zq, DeptInfoVo dept) {
+        List<TbQwXffwDto> fwList = zqDto.getXffwList();
+        String xffwlx = (fwList != null && fwList.size() > 0) ? fwList.get(0).getXffwlx() : "";
+        if (!CollectionUtils.isEmpty(fwList)) {
+            fwList.forEach(item -> {
+                if (!xffwlx.equals(item.getXffwlx())) {
+                    throw new BusinessException("巡防范围类型只能选择一种！！");
+                }
+                TbQwXffw xffw = new TbQwXffw();
+                xffw.setId(UUIDGenerator.getUUID());
+                xffw.setYwid(zq.getId());
+                xffw.setGlbid(item.getGlbid());
+                xffw.setQwlx("1");
+                xffw.setXffwlx(item.getXffwlx());
+                xffw.setFwMc(item.getFwMc());
+                if (dept != null) {
+                    xffw.setSsbm(dept.getDeptname());
+                    xffw.setSsbmid(dept.getDeptid());
+                    xffw.setSsbmdm(dept.getDeptcode());
+                    xffw.setSsxgajdm(dept.getFxjcode());
+                    xffw.setSsxgajid(dept.getFxjid());
+                    xffw.setSsxgaj(dept.getFxjname());
+                    xffw.setSssgaj(dept.getDszname());
+                    xffw.setSssgajdm(dept.getDszcode());
+                    xffw.setSssgajid(dept.getDszid());
+                }
+                this.tbQwXffwMapper.insert(xffw);
+            });
+            zq.setXffwid(fwList.stream().map(TbQwXffwDto::getGlbid).collect(Collectors.joining(",")));
+        }
+    }
+
+    // 保存时间段累的所有的警力的数据
+    private void setXfpbMrjlOther(TbQwXfpb pb, TbQwXfpbZq zq) {
+        Date kssj = DateUtils.getNextDate(pb.getPbksrq(), "D", zq.getXfzq() - 1);
+        Date jssj = pb.getPbjsrq();
+        int a = -1;
+        while (kssj.getTime() <= jssj.getTime()) {
+            a++;
+            if (a % pb.getXhzq() != 0) {
+                kssj = DateUtils.getNextDate(kssj, "D", +1);
+                continue;
+            }
+            TbQwXfpbMrjl mrjl = new TbQwXfpbMrjl();
+            mrjl.setPbId(pb.getId());
+            mrjl.setPbzqId(zq.getId());
+            String xfksskTime = DateUtils.getQueryDateString(kssj, "01") + " "
+                    + DateUtils.getQueryDateString(zq.getKssj(), "10");
+            mrjl.setXfkssj(DateUtils.strToDate(xfksskTime, "02"));
+            // 判断排班的开始时间是否大于排班的结束时间，如果大于 那么巡防的结束时间需要加一天
+            if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+                Date tempTime = DateUtils.getNextDate(kssj, "D", +1);
+                String xfjsskTime = DateUtils.getQueryDateString(tempTime, "01")
+                        + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                mrjl.setXfjssj(DateUtils.strToDate(xfjsskTime, "02"));
+            } else {
+                String xfjsskTime = DateUtils.getQueryDateString(kssj, "01")
+                        + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                mrjl.setXfjssj(DateUtils.strToDate(xfjsskTime, "02"));
+            }
+            mrjl.setXfrq(kssj);
+            this.tbQwXfpbMrjlMapper.insert(mrjl);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+    }
+
+    // 保存时间段内的所有的警力数据
+    private void setXfpbMrjl(TbQwXfpb pb, TbQwXfpbZq zq, List<String> jlIds, String pbid) {
+        Date kssj = DateUtils.getNextDate(pb.getPbksrq(), "D", zq.getXfzq() - 1);
+        Date jssj = pb.getPbjsrq();
+        if (kssj != null && jssj != null) {
+            // 判断结束时间和开始时间的月份是否一样，如果一样，保存所有数据
+            // 如果不一样暂时保存本月数据
+            if (!new SimpleDateFormat("yyyy-MM").format(kssj)
+                    .equals(new SimpleDateFormat("yyyy-MM").format(jssj))) {
+                jssj = DateUtils.getThisMonthLastDay();
+            }
+            int a = -1;
+            while (kssj.getTime() <= jssj.getTime()) {
+                a++;
+                if (a % pb.getXhzq() != 0) {
+                    kssj = DateUtils.getNextDate(kssj, "D", +1);
+                    continue;
+                }
+                TbQwXfpbMrjl mrjl = new TbQwXfpbMrjl();
+                mrjl.setPbId(pb.getId());
+                mrjl.setPbzqId(zq.getId());
+                String xfksskTime = DateUtils.getQueryDateString(kssj, "01") + " " + DateUtils.getQueryDateString(zq.getKssj(), "10");
+                mrjl.setXfkssj(DateUtils.strToDate(xfksskTime, "02"));
+                // 判断排班的开始时间是否大于排班的结束时间，如果大于 那么巡防的结束时间需要加一天
+                if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+                    Date tempTime = DateUtils.getNextDate(kssj, "D", +1);
+                    String xfjsskTime = DateUtils.getQueryDateString(tempTime, "01") + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                    mrjl.setXfjssj(DateUtils.strToDate(xfjsskTime, "02"));
+                } else {
+                    String xfjsskTime = DateUtils.getQueryDateString(kssj, "01") + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                    mrjl.setXfjssj(DateUtils.strToDate(xfjsskTime, "02"));
+                }
+                mrjl.setXfrq(kssj);
+                // 判断时间是否重合，如果重合则抛出异常给前端
+                this.checkTime(mrjl, jlIds, pbid);
+                this.tbQwXfpbMrjlMapper.insert(mrjl);
+                kssj = DateUtils.getNextDate(kssj, "D", +1);
+            }
+        }
+    }
+
+    private void checkTime(TbQwXfpbMrjl mrjl, List<String> jlIds, String pbid) {
+        List<TbQwXfpbMrjl> mrjlList = this.tbQwXfpbMrjlMapper.getMrjlByTime(DateUtils.getQueryDateString(mrjl.getXfkssj(), "02"),
+                DateUtils.getQueryDateString(mrjl.getXfjssj(), "02"), pbid);
+        if (mrjlList != null && mrjlList.size() > 0) {
+            mrjlList.forEach(m -> {
+                TbQwXfpbZq zq = this.tbQwXfpbZqMapper.selectById(m.getPbzqId());
+                if (zq != null) {
+                    TbQwXfpb xfpb = this.baseMapper.selectById(zq.getPbId());
+                    if (xfpb != null) {
+                        if (jlIds.indexOf(zq.getFzrId()) != -1) {
+                            throw new BusinessException(("负责人(" + zq.getFzrXm() + ")在" +
+                                    "其他排班中时间冲突，冲突排班名称：" + xfpb.getPbmc()));
+                        }
+                        // 其他警力
+                        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                                new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, zq.getId())
+                                        .eq(TbQwJl::getXtSjzt, "1")
+                        );
+                        jlList.forEach(jl -> {
+                            if (jlIds.indexOf(jl.getJlId()) != -1) {
+                                throw new BusinessException(("01".equals(jl.getJllx()) ? "民警" : "辅警") + "(" + jl.getJlxm() + ")在" +
+                                        "其他排班中时间冲突，冲突排班名称：" + xfpb.getPbmc());
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbbbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbbbServiceImpl.java
new file mode 100644
index 0000000..e5416fb
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbbbServiceImpl.java
@@ -0,0 +1,396 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbStartOrEndBbDto;
+import com.mosty.base.model.entity.qwzx.*;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.PageUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.service.SysDeptService;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.qwzx.TbQwZbbbQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbbbVo;
+import com.mosty.qwzx.mapper.*;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.remote.TbJcglAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwZbbbService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author dw
+ * @since 2022-10-09
+ */
+@AllArgsConstructor
+@Service
+public class TbQwZbbbServiceImpl extends ServiceImpl<TbQwZbbbMapper, TbQwZbbb>
+        implements TbQwZbbbService {
+
+    private final TbQwJlMapper tbQwJlMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwZbpbZqMapper tbQwZbpbZqMapper;
+    private final SysRoleService sysRoleService;
+    private TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbQwQxjMapper tbQwQxjMapper;
+    private final SysDeptService sysDeptService;
+
+    @Override
+    public Map<String, Object> getJlByBm(String time, String ssbmdm) {
+        if (StringUtils.isBlank(ssbmdm)) {
+            UserInfo user = UserInfoManager.get();
+            ssbmdm = user.getDeptCode();
+        }
+        Map<String, Object> ryMap = new HashMap<>();
+//        SysDept deptByParentid = sysDeptService.getDeptByParentid(ssbmid);
+//        ssbmdm = deptByParentid.getOrgCode();
+//        DeptInfo sysDeptLevel = sysRoleService.getSysDeptLevel(ssbmdm);
+        //查询部门下面所有警力
+        Integer rysl = tbJcglAdaptRemoteService.getRysl(ssbmdm);
+        ssbmdm = tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+
+
+        ryMap.put("all", rysl);
+        //查询值班警力
+        QueryWrapper<TbQwZbbb> tb = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtilByDeptInfo(tb, sysDeptLevel);
+        tb.lambda().ne(TbQwZbbb::getBbzt, "1").likeRight(TbQwZbbb::getSsbmdm, ssbmdm);
+        List<TbQwZbbb> tbQwZbbbs = this.baseMapper.selectList(tb);
+        Set<String> zbSet = new HashSet<>();
+        if (!CollectionUtils.isEmpty(tbQwZbbbs)) {
+            for (TbQwZbbb zb : tbQwZbbbs) {
+                String zbmj = zb.getZbmj();
+                if (StringUtils.isNotBlank(zbmj)) {
+                    List<TbQwJl> mjList = JSONObject.parseArray(zbmj, TbQwJl.class);
+                    mjList.forEach(v -> {
+                        zbSet.add(v.getSfzh());
+                    });
+                }
+                String zbfj = zb.getZbfj();
+                if (StringUtils.isNotBlank(zbfj)) {
+                    List<TbQwJl> fjList = JSONObject.parseArray(zbfj, TbQwJl.class);
+                    fjList.forEach(v -> {
+                        zbSet.add(v.getSfzh());
+                    });
+                }
+            }
+        }
+        ryMap.put("zbjl", zbSet.size());
+
+        //查询未在岗警力
+        //查询人员请假休假
+        QueryWrapper<TbQwQxj> ryqj = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtilByDeptInfo(ryqj, sysDeptLevel);
+        ryqj.lambda().likeRight(TbQwQxj::getSsbmdm, ssbmdm).last("and DATE_FORMAT('" + time + "', '%Y-%m-%d') <= jssj and DATE_FORMAT('" + time + "', '%Y-%m-%d') >= kssj");
+        List<TbQwQxj> tbQwQxjs = tbQwQxjMapper.selectList(ryqj);
+        ryMap.put("wzgjl", tbQwQxjs.size());
+        return ryMap;
+    }
+
+    @Override
+    public IPage<TbQwZbbbVo> queryList(TbQwZbbbQuery zb) {
+        zb.setSsbmdm(tbBaseAdaptRemoteService.getSsbm(zb.getSsbmdm(), null));
+//        UserInfo userInfo = UserInfoManager.get();
+        IPage<TbQwZbbbVo> page = PageUtils.buildPage(zb.getPageSize(), zb.getPageCurrent());
+        return this.baseMapper.queryList(page, zb);
+    }
+
+    @Override
+    public TbQwZbbbVo selectById(String id) {
+        TbQwZbbb zb = this.baseMapper.selectById(id);
+        TbQwZbbbVo vo = new TbQwZbbbVo();
+        BeanUtils.copyProperties(zb, vo);
+        List<String> list = new ArrayList<>();
+        list.add(id);
+        List<TbQwJl> jlList = this.tbQwJlMapper.queryListByYwid(list);
+        vo.setJlList(jlList);
+        return vo;
+    }
+
+    @Override
+    public String addQwzb(TbQwZbbbVo vo) {
+        TbQwZbbb zbbb = new TbQwZbbb();
+        BeanUtils.copyProperties(vo, zbbb);
+        zbbb.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isBlank(zbbb.getBblx())) {
+            zbbb.setBblx("01");
+        }
+        if (StringUtils.isBlank(vo.getSsbmdm())) throw new BusinessException("请选择值班部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(vo.getSsbmdm());
+        zbbb.setSsbm(dept.getDeptname());
+        zbbb.setSsbmid(dept.getDeptid());
+        zbbb.setSsbmdm(dept.getDeptcode());
+        zbbb.setSsxgajdm(dept.getFxjcode());
+        zbbb.setSsxgajid(dept.getFxjid());
+        zbbb.setSsxgaj(dept.getFxjname());
+        zbbb.setSssgaj(dept.getDszname());
+        zbbb.setSssgajdm(dept.getDszcode());
+        zbbb.setSssgajid(dept.getDszid());
+        zbbb.setXtSjly("2");
+        this.saveRelevanceData(zbbb, vo, zbbb.getId());
+        this.baseMapper.insert(zbbb);
+        return zbbb.getId();
+    }
+
+    /**
+     * 保存关联数据
+     *
+     * @param vo
+     * @param ywid
+     */
+    public void saveRelevanceData(TbQwZbbb zbbb, TbQwZbbbVo vo, String ywid) {
+        UserInfo user = UserInfoManager.get();
+        if (vo != null) {
+            List<TbQwJl> jlList = vo.getJlList();
+            if (!CollectionUtils.isEmpty(jlList)) {
+                List<TbQwJl> mjLists = new ArrayList<>();
+                List<TbQwJl> fjLists = new ArrayList<>();
+                for (TbQwJl jl : jlList) {
+                    if (Constant.JLLX_MJ.equals(jl.getJllx())) {
+                        mjLists.add(jl);
+                    } else {
+                        fjLists.add(jl);
+                    }
+                }
+                zbbb.setZbmj(JSONArray.toJSONString(mjLists));
+                zbbb.setZbfj(JSONArray.toJSONString(fjLists));
+                zbbb.setMjsl(mjLists.size());
+                zbbb.setFjsl(fjLists.size());
+                for (TbQwJl jl : jlList) {
+                    jl.setId(UUIDGenerator.getUUID());
+                    jl.setZblx("4");
+                    jl.setYwid(ywid);
+                    jl.setXtSjzt("1");
+                    jl.setJlzt("1");
+                    jl.setXtSjly(StringUtils.isBlank(jl.getXtSjly()) ? "1" : jl.getXtSjly());
+                    jl.setXtScbz("0");
+                    if (user != null) {
+                        jl.setSsbm(user.getDeptName());
+                        jl.setSsbmdm(String.valueOf(user.getDeptId()));
+                        jl.setSsxgaj(user.getFxjDeptName());
+                        jl.setSsxgajdm(String.valueOf(user.getFxjDeptId()));
+                        jl.setSssgaj(user.getDszDeptName());
+                        jl.setSssgajdm(String.valueOf(user.getDszDeptId()));
+                    }
+                    tbQwJlMapper.insert(jl);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean deleteBatch(List<String> list) {
+        if (list.size() > 0) {
+            for (String id : list) {
+                deleteRelevanceData(id);
+            }
+            int rs = this.baseMapper.deleteZb(list);
+            return rs > 0;
+        }
+        return true;
+    }
+
+    @Override
+    public IPage<TbQwZbbbVo> queryPage(TbQwZbbbQuery zb) {
+        IPage<TbQwZbbb> xfpbIPage = queryXfzb(zb);
+        IPage<TbQwZbbbVo> voIPage = new Page<>(zb.getPageCurrent(), zb.getPageSize());
+        voIPage.setTotal(xfpbIPage.getTotal());
+        List<TbQwZbbb> records = xfpbIPage.getRecords();
+        List<TbQwZbbbVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            for (TbQwZbbb record : records) {
+                TbQwZbbbVo vo = new TbQwZbbbVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbQwJl> jl = tbQwJlMapper.queryListByYwid(new ArrayList<String>() {{
+                    this.add(record.getId());
+                }});
+                vo.setJlList(jl);
+                vos.add(vo);
+            }
+        }
+        voIPage.setRecords(vos);
+        return voIPage;
+    }
+
+    @Override
+    public TbQwZbbb getMyBbInfoToday() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("登录异常，请重新登录！");
+        }
+        return this.baseMapper.getMyBbInfoToday(String.valueOf(user.getUserId()));
+    }
+
+    @Override
+    public Integer startOrEndBb(TbQwXfbbStartOrEndBbDto dto) {
+        TbQwZbbb bb = this.baseMapper.selectById(dto.getId());
+        if ("0".equals(dto.getBbzt())) {
+            bb.setBbkssj(new Date());
+        } else {
+            bb.setBbjssj(new Date());
+        }
+        bb.setBbzt(dto.getBbzt());
+        return this.baseMapper.updateById(bb);
+    }
+
+    @Override
+    public void authJsbb() {
+        // 查询所有的已经报备的报备信息
+        List<TbQwZbbb> bbList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbQwZbbb>()
+                        .eq(TbQwZbbb::getBbzt, "0")
+                        .eq(TbQwZbbb::getXtSjzt, "1")
+        );
+        bbList.forEach(bb -> {
+            Date jssj;
+            if (bb.getKssj().getTime() > bb.getJssj().getTime()) {
+                jssj = DateUtils.strToDate(DateUtils.getQueryDateString(
+                        DateUtils.getNextDate(bb.getZbrq(), "D", +1), "01") + " "
+                        + DateUtils.getQueryDateString(bb.getJssj(), "10"), "02");
+            } else {
+                jssj = DateUtils.strToDate(DateUtils.getQueryDateString(bb.getZbrq(), "01") + " "
+                        + DateUtils.getQueryDateString(bb.getJssj(), "10"), "02");
+            }
+            if (new Date().getTime() >= jssj.getTime()) {
+                bb.setBbzt("1");
+                bb.setBbjssj(new Date());
+                this.baseMapper.updateById(bb);
+            }
+        });
+    }
+
+    @Override
+    public Map<String, Object> getBbCountByDept(String time) {
+        Map<String, Object> map = new HashMap<>();
+        time = StringUtils.isBlank(time) ? DateUtils.getQueryDateString(new Date(), "01") : time;
+        // 查询所有的部门信息
+        List<DeptInfoVo> list = this.tbBaseAdaptRemoteService.getDeptAll();
+        AtomicInteger y = new AtomicInteger();
+        AtomicInteger n = new AtomicInteger();
+        String finalTime = time;
+        list.forEach(item -> {
+            // 查询部门值班信息
+            int count = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbQwZbbb>()
+                            .eq(TbQwZbbb::getSsbmdm, item.getDeptid())
+                            .eq(TbQwZbbb::getXtSjzt, "1")
+                            .eq(TbQwZbbb::getZbrq, finalTime)
+            );
+            if (count > 0) y.addAndGet(count);
+            else n.addAndGet(1);
+        });
+        map.put("y", y);
+        map.put("n", n);
+        return map;
+    }
+
+    @Override
+    public List<Map<String, Object>> getBbListByDept(String time) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        time = StringUtils.isBlank(time) ? DateUtils.getQueryDateString(new Date(), "01") : time;
+        // 查询所有的部门信息
+        List<DeptInfoVo> deptList = this.tbBaseAdaptRemoteService.getDeptAll();
+        for (DeptInfoVo dept : deptList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("ssbmid", dept.getDeptid());
+            map.put("ssbmdm", dept.getDeptcode());
+            map.put("ssbmmc", dept.getDeptname());
+            List<TbQwZbbb> bbList = this.baseMapper.selectList(
+                    new LambdaQueryWrapper<TbQwZbbb>()
+                            .eq(TbQwZbbb::getSsbmdm, dept.getDeptid())
+                            .eq(TbQwZbbb::getXtSjzt, "1")
+                            .eq(TbQwZbbb::getZbrq, time)
+            );
+            if (bbList != null && bbList.size() > 0) {
+                map.put("type", "ybb");
+                map.put("list", bbList);
+            } else {
+                List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.getDeptByMonth(DateUtils.strToDate(time, "01"),
+                        dept.getDeptid());
+                if (zqList != null && zqList.size() > 0) {
+                    map.put("type", "wbb");
+                    map.put("list", zqList);
+                } else {
+                    map.put("type", "wpb");
+                }
+            }
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> getZbld() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            return null;
+        }
+        TbQwZbbb bb = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbQwZbbb>()
+                        .eq(TbQwZbbb::getSsbmdm, String.valueOf(user.getDeptId()))
+                        .eq(TbQwZbbb::getZbrq, DateUtils.getQueryDateString(new Date(), "01"))
+                        .eq(TbQwZbbb::getBbzt, "0")
+                        .last(" limit 1")
+        );
+        if (bb == null) return null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("zbldid", bb.getZbldId());
+        map.put("zbldxm", bb.getZbldXm());
+        map.put("zblddh", bb.getZbldDh());
+        map.put("zbldsfzh", bb.getZbldSfzh());
+        return map;
+    }
+
+    // 获取巡防排班数据
+    public IPage<TbQwZbbb> queryXfzb(TbQwZbbbQuery xfpb) {
+        IPage<TbQwZbbb> page = new Page<>(xfpb.getPageCurrent(), xfpb.getPageSize());
+        LambdaQueryWrapper<TbQwZbbb> queryWrapper = new LambdaQueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        xfpb.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(xfpb.getSsbmdm(), null));
+        queryWrapper
+                .like(StringUtils.isNotBlank(xfpb.getZbldXm()), TbQwZbbb::getZbldXm, xfpb.getZbldXm())
+                .likeRight(StringUtils.isNotBlank(xfpb.getSsbmdm()), TbQwZbbb::getSsbmdm, xfpb.getSsbmdm());
+        if (xfpb.getStartTime() != null && xfpb.getEndTime() == null) {
+            queryWrapper.ge(TbQwZbbb::getZbrq, xfpb.getStartTime());
+        }
+        if (xfpb.getStartTime() == null && xfpb.getEndTime() != null) {
+            queryWrapper.le(TbQwZbbb::getZbrq, xfpb.getEndTime());
+        }
+        if (xfpb.getStartTime() != null && xfpb.getEndTime() != null) {
+            queryWrapper.between(TbQwZbbb::getZbrq, xfpb.getStartTime(), xfpb.getEndTime());
+        }
+        queryWrapper.orderByDesc(TbQwZbbb::getZbrq);
+        return this.baseMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 删除关联数据
+     *
+     * @param id
+     */
+    public void deleteRelevanceData(String id) {
+        tbQwJlMapper.deleteByYwid(id);
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbpbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbpbServiceImpl.java
new file mode 100644
index 0000000..8babdb0
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwZbpbServiceImpl.java
@@ -0,0 +1,993 @@
+package com.mosty.qwzx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskUserDto;
+import com.mosty.base.model.entity.qwzx.*;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.base.model.vo.qwzx.TbQwZbpbZqMyVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbInsertOrUpdateDto;
+import com.mosty.base.model.dto.qwzx.TbQwZbpbZqDto;
+import com.mosty.base.model.query.qwzx.TbQwZbpbQuery;
+import com.mosty.base.model.query.qwzx.TbQwZbpbSearchMyQuery;
+import com.mosty.qwzx.mapper.*;
+import com.mosty.qwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.qwzx.remote.TbRwzxAdaptRemoteService;
+import com.mosty.qwzx.service.TbQwZbpbService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author dw
+ * @since 2022/8/3
+ **/
+@Service
+@AllArgsConstructor
+public class TbQwZbpbServiceImpl extends ServiceImpl<TbQwZbpbMapper, TbQwZbpb> implements TbQwZbpbService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwZbpbZqMapper tbQwZbpbZqMapper;
+    private final TbQwJlMapper tbQwJlMapper;
+    private final TbQwZbpbMrjlMapper tbQwZbpbMrjlMapper;
+    private final TbQwJjrMapper tbQwJjrMapper;
+    private final TbQwZbbbMapper tbQwzbbbMapper;
+    private final TbRwzxAdaptRemoteService tbRwzxAdaptRemoteService;
+    private final TbQwQxjMapper tbQwQxjMapper;
+
+    @Override
+    @Transactional
+    public Integer addEntity(TbQwZbpbInsertOrUpdateDto dto) {
+        String year = DateUtils.getQueryDateString(new Date(), "13");
+        if (!DateUtils.getQueryDateString(dto.getZbpbksrq(), "13").equals(year) || (
+                dto.getZbpbjsrq() != null && !DateUtils.getQueryDateString(dto.getZbpbjsrq(), "13").equals(year)
+        )) {
+            throw new BusinessException("排班开始日期和结束日期必须为本年度！！");
+        }
+        TbQwZbpb pb = new TbQwZbpb();
+        BeanUtils.copyProperties(dto, pb);
+        UserInfo user = UserInfoManager.get();
+        pb.setId(UUIDGenerator.getUUID());
+        pb.setPbrid(String.valueOf(user.getUserId()));
+        pb.setPbr(user.getUserName());
+        pb.setPbrsfzh(user.getIdEntityCard());
+        if ("0".equals(pb.getJsrqlx())) {
+            try {
+                pb.setZbpbjsrq(new SimpleDateFormat("yyyy-MM-dd").parse("2099-12-31"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+                throw new BusinessException("时间格式转换异常！！");
+            }
+        }
+        if (StringUtils.isBlank(pb.getSsbmid())) throw new BusinessException("请选择值班部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(pb.getSsbmid());
+        if (dept != null) {
+            pb.setSsbm(dept.getDeptname());
+            pb.setSsbmid(dept.getDeptid());
+            pb.setSsbmdm(dept.getDeptcode());
+            pb.setSsxgajdm(dept.getFxjcode());
+            pb.setSsxgajid(dept.getFxjid());
+            pb.setSsxgaj(dept.getFxjname());
+            pb.setSssgaj(dept.getDszname());
+            pb.setSssgajdm(dept.getDszcode());
+            pb.setSssgajid(dept.getDszid());
+        }
+        pb.setXtSjly("1");
+        // 保存周期表信息和警力信息
+        this.setZbpbzq(dto, pb, dept, null);
+        return this.baseMapper.insert(pb);
+    }
+
+    // 判断是否有时间重合、任务重合的情况，如果存在，则提示给前端
+    private void checkZbxx(TbQwZbpbInsertOrUpdateDto dto) {
+        // 查询所有的人员，根据人员查询该时间段是否有排班信息
+        List<TbQwZbpbZqDto> zqList = dto.getPbzqList();
+        if (zqList == null || zqList.size() == 0) {
+            throw new BusinessException("请配置周期信息");
+        }
+        for (int i = 0; i < zqList.size(); i++) {
+            TbQwZbpbZqDto zq = zqList.get(i);
+            this.checkUserZb(zq, dto, zq.getZbldId(), "01", zq.getZbldXm());
+            this.checkUserZb(zq, dto, zq.getZbzhzId(), "01", zq.getZbzhzXm());
+            this.checkUserZb(zq, dto, zq.getZzzhzId(), "01", zq.getZzzhzXm());
+            this.checkUserZb(zq, dto, zq.getFzzbId(), "01", zq.getFzzbXm());
+            List<TbQwJl> jlList = zq.getJlList();
+            if (jlList == null || jlList.size() == 0) {
+                throw new BusinessException("请配置第" + (i + 1) + "班的警力信息");
+            }
+            jlList.forEach(jl -> this.checkUserZb(zq, dto, jl.getJlId(), jl.getJllx(), jl.getJlxm()));
+        }
+    }
+
+    // 检查用户信息是否重合
+    private void checkUserZb(TbQwZbpbZqDto zq, TbQwZbpbInsertOrUpdateDto dto, String jlId,
+                             String jlLx, String jlxm) {
+        // 查询重合的排班信息
+        String kssj = DateUtils.getQueryDateString(zq.getKssj(), "02");
+        String jssj = "";
+        if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+            jssj = "1970-01-02" + " " + DateUtils.getQueryDateString(zq.getJssj(), "10");
+        }
+        List<TbQwZbpb> pbTempList = this.baseMapper.getZbBySjAndJl
+                (DateUtils.getQueryDateString(dto.getZbpbksrq(), "01"),
+                        DateUtils.getQueryDateString(dto.getZbpbjsrq(), "01"),
+                        jlId, kssj, jssj, dto.getId());
+        pbTempList.forEach(pbTemp -> {
+            throw new BusinessException(("01".equals(jlLx) ? "民警" : "辅警") + "(" + jlxm + ")在" +
+                    "其他排班中时间冲突，冲突排班名称：" + pbTemp.getZbmc());
+        });
+    }
+
+    @Override
+    @Transactional
+    public Integer updateEntity(TbQwZbpbInsertOrUpdateDto dto) {
+        // 判断是否有时间重合、任务重合的情况，如果存在，则提示给前端
+        // this.checkZbxx(dto);
+        String year = DateUtils.getQueryDateString(new Date(), "13");
+        if (!DateUtils.getQueryDateString(dto.getZbpbksrq(), "13").equals(year)
+                || (dto.getZbpbjsrq() != null && !DateUtils.getQueryDateString(dto.getZbpbjsrq(), "13")
+                .equals(year)
+        )) {
+            throw new BusinessException("排班开始日期和结束日期必须为本年度！！");
+        }
+        TbQwZbpb pb = new TbQwZbpb();
+        BeanUtils.copyProperties(dto, pb);
+        if ("0".equals(pb.getJsrqlx())) {
+            try {
+                pb.setZbpbjsrq(new SimpleDateFormat("yyyy-MM-dd").parse("2099-12-31"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+                throw new BusinessException("时间格式转换异常！！");
+            }
+        }
+        if (StringUtils.isBlank(pb.getSsbmid())) throw new BusinessException("请选择值班部门！");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(pb.getSsbmid());
+        if (dept != null) {
+            pb.setSsbm(dept.getDeptname());
+            pb.setSsbmid(dept.getDeptid());
+            pb.setSsbmdm(dept.getDeptcode());
+            pb.setSsxgajdm(dept.getFxjcode());
+            pb.setSsxgajid(dept.getFxjid());
+            pb.setSsxgaj(dept.getFxjname());
+            pb.setSssgaj(dept.getDszname());
+            pb.setSssgajdm(dept.getDszcode());
+            pb.setSssgajid(dept.getDszid());
+        }
+        // 删除排班表的数据
+        this.deleteZbpb(pb.getId());
+        // 添加排班表数据
+        this.setZbpbzq(dto, pb, dept, dto.getId());
+        return this.baseMapper.updateById(pb);
+    }
+
+    @Override
+    @Transactional
+    public void deleteBatch(List<String> ids) {
+        if (ids.size() > 0) {
+            ids.forEach(id -> {
+                // 删除值班排班周期和警力信息
+                this.deleteZbpb(id);
+                // 删除排班信息
+                this.baseMapper.deleteById(id);
+            });
+        }
+    }
+
+    @Override
+    @Transactional
+    public void deleteEntity(String id) {
+        // 删除值班排班周期和警力信息
+        this.deleteZbpb(id);
+        // 删除排班信息
+        this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public IPage<TbQwZbpbInsertOrUpdateDto> selectPage(TbQwZbpbQuery dto) {
+        QueryWrapper<TbQwZbpb> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        qw.lambda().eq(StringUtils.isNotBlank(dto.getJsrqlx()), TbQwZbpb::getJsrqlx, dto.getJsrqlx())
+                .eq(dto.getXhzq() != null, TbQwZbpb::getXhzq, dto.getXhzq())
+                .eq(StringUtils.isNotBlank(dto.getXhlx()), TbQwZbpb::getXhlx, dto.getXhlx())
+                .eq(dto.getMrbc() != null, TbQwZbpb::getMrbc, dto.getMrbc())
+                .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbQwZbpb::getSsbmdm, dto.getSsbmdm())
+                .like(StringUtils.isNotBlank(dto.getZbmc()), TbQwZbpb::getZbmc, dto.getZbmc())
+                .like(StringUtils.isNotBlank(dto.getZbms()), TbQwZbpb::getZbms, dto.getZbms());
+        if (dto.getZbpbksrq() != null && dto.getZbpbjsrq() != null) {
+            qw.lambda().and(
+                    it -> it.between(TbQwZbpb::getZbpbksrq, dto.getZbpbksrq(), dto.getZbpbjsrq()).or()
+                            .between(TbQwZbpb::getZbpbjsrq, dto.getZbpbksrq(), dto.getZbpbjsrq())
+            );
+        }
+        IPage<TbQwZbpb> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page = this.baseMapper.selectPage(page, qw);
+        IPage<TbQwZbpbInsertOrUpdateDto> rPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbQwZbpb> list = page.getRecords();
+        List<TbQwZbpbInsertOrUpdateDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbQwZbpbInsertOrUpdateDto entity = new TbQwZbpbInsertOrUpdateDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwZbpbZq>().eq(TbQwZbpbZq::getPbId, item.getId())
+            );
+            List<TbQwZbpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwZbpbZqDto zqDto = new TbQwZbpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setPbzqList(zqDtoList);
+            rList.add(entity);
+        });
+        rPage.setRecords(rList);
+        rPage.setTotal(page.getTotal());
+        return rPage;
+    }
+
+    @Override
+    public TbQwZbpbInsertOrUpdateDto getInfo(String id) {
+        TbQwZbpb item = this.baseMapper.selectById(id);
+        if (item != null) {
+            TbQwZbpbInsertOrUpdateDto entity = new TbQwZbpbInsertOrUpdateDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwZbpbZq>().eq(TbQwZbpbZq::getPbId, item.getId())
+            );
+            List<TbQwZbpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwZbpbZqDto zqDto = new TbQwZbpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setPbzqList(zqDtoList);
+            return entity;
+        }
+        return null;
+    }
+
+    @Override
+    public IPage<TbQwZbpbInsertOrUpdateDto> getMyZbpb(TbQwZbpbSearchMyQuery dto) {
+        IPage<TbQwZbpbInsertOrUpdateDto> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        Map<String, Object> map = new HashMap<>();
+        UserInfo userInfo = UserInfoManager.get();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("ryid", String.valueOf(userInfo.getUserId()));
+        int count = this.baseMapper.getCount(map);
+        List<TbQwZbpb> list = this.baseMapper.getList(map);
+        List<TbQwZbpbInsertOrUpdateDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbQwZbpbInsertOrUpdateDto entity = new TbQwZbpbInsertOrUpdateDto();
+            BeanUtils.copyProperties(item, entity);
+            // 查询排班周期
+            List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.selectList(
+                    new LambdaQueryWrapper<TbQwZbpbZq>().eq(TbQwZbpbZq::getPbId, item.getId())
+            );
+            List<TbQwZbpbZqDto> zqDtoList = new ArrayList<>();
+            zqList.forEach(zqItem -> {
+                TbQwZbpbZqDto zqDto = new TbQwZbpbZqDto();
+                BeanUtils.copyProperties(zqItem, zqDto);
+                // 查询警力列表
+                List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                        new LambdaQueryWrapper<TbQwJl>().eq(TbQwJl::getYwid, zqDto.getId())
+                );
+                zqDto.setJlList(jlList);
+                zqDtoList.add(zqDto);
+            });
+            entity.setPbzqList(zqDtoList);
+            rList.add(entity);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    public void checkThisTimeZbpb() {
+        List<TbQwZbpbMrjl> list = this.baseMapper.checkThisTimeZbpb();
+        TbRwTaskDto task = new TbRwTaskDto();
+        List<TbRwTaskUserDto> userDtoList = new ArrayList<>();
+        if (list.size() > 0) {
+            list.forEach(item -> {
+                // 查询是否发送消息，如果发送则无需发送了
+                TbRwTaskByYwidQuery query = new TbRwTaskByYwidQuery();
+                query.setYwid(item.getId());
+                query.setRwxl("04");
+                TbRwTask temp = this.tbRwzxAdaptRemoteService.getRwByYwid(query);
+                if (temp == null) {
+                    // 判断本次排班是否报备,如果没有报备就不需要提醒了
+                    int count = this.tbQwzbbbMapper.selectCount(
+                            new LambdaQueryWrapper<TbQwZbbb>()
+                                    .eq(TbQwZbbb::getZbpbId, item.getPbId())
+                                    .eq(TbQwZbbb::getBbzt, "0")
+                                    .eq(TbQwZbbb::getZbrq, new Date())
+                    );
+                    TbQwZbpbZq zq = this.tbQwZbpbZqMapper.selectById(item.getPbzqId());
+                    if (count == 0) {
+                        // 需要发出提醒
+                        // 值班领导
+                        if (StringUtils.isNotBlank(zq.getZbldId())) {
+                            this.addZbld(zq, userDtoList);
+                        }
+                        // 值班指挥长
+                        if (StringUtils.isNotBlank(zq.getZbzhzId())) {
+                            this.addZbzhz(zq, userDtoList);
+                        }
+                        // 专职指挥长
+                        if (StringUtils.isNotBlank(zq.getZzzhzId())) {
+                            this.addZzzhz(zq, userDtoList);
+                        }
+                        // 法制值班
+                        if (StringUtils.isNotBlank(zq.getFzzbId())) {
+                            this.addFzzb(zq, userDtoList);
+                        }
+                        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                                new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, item.getPbzqId())
+                                        .eq(TbQwJl::getJllx, "01")
+                        );
+                        if (!CollectionUtils.isEmpty(jlList)) {
+                            jlList.forEach(jl -> {
+                                TbRwTaskUserDto itemDtos = new TbRwTaskUserDto();
+                                itemDtos.setRwzflx("1");
+                                itemDtos.setJsrid(jl.getJlId());
+                                itemDtos.setJsrmc(jl.getJlxm());
+                                itemDtos.setJsrsfzh(jl.getSfzh());
+                                itemDtos.setJsrlxdh(jl.getLxdh());
+                                DeptInfoVo deptVo = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(jl.getJlId());
+                                if (deptVo != null) {
+                                    itemDtos.setSsbm(deptVo.getDeptname());
+                                    itemDtos.setSsbmid(deptVo.getDeptid());
+                                }
+                                // 判断重复数据
+                                List<TbRwTaskUserDto> tempList = userDtoList.stream().filter(t -> t.getJsrid().equals(jl.getJlId())).collect(Collectors.toList());
+                                if (tempList.size() == 0) {
+                                    userDtoList.add(itemDtos);
+                                }
+                            });
+                        }
+                    }
+                    if (userDtoList.size() > 0) {
+                        task.setSsbmid(zq.getSsbmid());
+                        task.setSsbmdm(zq.getSsbmdm());
+                        task.setRwmc("值班报备提醒");
+                        task.setRwnr("根据值班排班安排，请您于" + new SimpleDateFormat("HH:mm").format(zq.getKssj()) + "前，" +
+                                "进行值班报备！！");
+                        task.setRwjsdx("01");
+                        task.setRwlx("2");
+                        task.setRwxl("04");
+                        task.setRwjjcd("3");
+                        task.setSfaqwc("1");
+                        task.setRwms("1");
+                        task.setCjrid("-1");
+                        task.setCjrxm("系统");
+                        Date sj;
+                        // 跨天
+                        if (zq.getJssj().getTime() <= zq.getKssj().getTime()) {
+                            sj = DateUtils.getNextDate(
+                                    DateUtils.strToDate(
+                                            DateUtils.getQueryDateString(
+                                                    DateUtils.getNextDate(new Date(), "D", +1), "01") + " " +
+                                                    DateUtils.getQueryDateString(zq.getJssj(), "10"), "02"
+                                    ), "H", +2
+                            );
+                        } else {
+                            sj = DateUtils.getNextDate(
+                                    DateUtils.strToDate(
+                                            DateUtils.getQueryDateString(new Date(), "01") + " " +
+                                                    DateUtils.getQueryDateString(zq.getJssj(), "10"), "02"
+                                    ), "H", +2
+                            );
+                        }
+                        task.setRwyqwcsj(sj);
+                        task.setCjrlxdh("");
+                        task.setYwid(item.getId());
+                        task.setUserDtoList(userDtoList);
+                        this.tbRwzxAdaptRemoteService.addRw(task);
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public TbQwZbpbZqMyVo getMyZbpbToday() {
+        UserInfo user = UserInfoManager.get();
+        return this.tbQwZbpbZqMapper.getMyZbpbToday(String.valueOf(user.getUserId()));
+    }
+
+    @Override
+    public TbQwZbpbZqDto getZbpbZqInfo(String id) {
+        TbQwZbpbZq zqItem = this.tbQwZbpbZqMapper.selectById(id);
+        if (zqItem == null) {
+            return null;
+        }
+        TbQwZbpbZqDto zqDto = new TbQwZbpbZqDto();
+        BeanUtils.copyProperties(zqItem, zqDto);
+        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                new LambdaQueryWrapper<TbQwJl>()
+                        .eq(TbQwJl::getYwid, zqDto.getId())
+        );
+        zqDto.setJlList(jlList);
+        return zqDto;
+    }
+
+    @Override
+    public void addMrjl() {
+        // 查询值班排班信息
+        List<TbQwZbpb> pbList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbQwZbpb>()
+                        .eq(TbQwZbpb::getXtSjzt, "1")
+                        .eq(TbQwZbpb::getJsrqlx, "0")
+        );
+        if (!CollectionUtils.isEmpty(pbList)) {
+            pbList.forEach(zb -> {
+                List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZbpbZq>()
+                                .eq(TbQwZbpbZq::getPbId, zb.getId())
+                                .eq(TbQwZbpbZq::getXtSjzt, "1")
+                );
+                zqList.forEach(zq -> {
+                    // 获取本年的第一天
+                    Date firstDay = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "13") + "-01-01", "01");
+                    zb.setZbpbksrq(firstDay);
+                    // 获取本年最后一天的数据
+                    Date lastDay = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "13") + "-12-31", "01");
+                    if (lastDay.getTime() >= zb.getZbpbjsrq().getTime()) {
+                        lastDay = zb.getZbpbjsrq();
+                    }
+                    zb.setZbpbjsrq(lastDay);
+                    this.setZbpbMrjlOther(zb, zq);
+                });
+            });
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> exportData(String time, String pbid) {
+        List<TbQwZbpbMrjl> list = this.tbQwZbpbMrjlMapper.selectList(
+                new LambdaQueryWrapper<TbQwZbpbMrjl>()
+                        .isNotNull(TbQwZbpbMrjl::getId)
+                        .eq(TbQwZbpbMrjl::getPbId, pbid)
+                        .last(" and date_format(zbrq,'%Y-%m') = '" + time + "' order by zbrq")
+        );
+        List<Map<String, Object>> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbQwZbpbZq zq = this.tbQwZbpbZqMapper.selectById(item.getPbzqId());
+            if (zq != null) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("time", DateUtils.getQueryDateString(item.getZbrq(), "01"));
+                map.put("zbldXm", zq.getZbldXm());
+                map.put("zbzhzXm", zq.getZbzhzXm());
+                map.put("zzzhzXm", zq.getZzzhzXm());
+                map.put("fzzbXm", zq.getFzzbXm());
+                map.put("zbmj", zq.getZbmj());
+                map.put("zbfj", zq.getZbfj());
+                rList.add(map);
+            }
+        });
+        return rList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getDeptByMonth(String time) {
+        UserInfo user = UserInfoManager.get();
+        String ssbmid = String.valueOf(user.getDeptId());
+        List<Map<String, Object>> rList = new ArrayList<>();
+        Date kssj = DateUtils.strToDate(time + "-01", "01");
+        Date jssj = DateUtils.getThisMonthLastDay(time);
+        while (kssj.getTime() <= jssj.getTime()) {
+            // 查询排班情况
+            Date now = DateUtils.strToDate(DateUtils.getQueryDateString(new Date(), "01"), "01");
+            Map<String, Object> map = new HashMap<>();
+            map.put("time", DateUtils.getQueryDateString(kssj, "01"));
+            // 过去,有值班展示值班信息，没有就不展示
+            if (now.getTime() > kssj.getTime()) {
+                List<TbQwZbbb> bbList = this.tbQwzbbbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZbbb>()
+                                .eq(TbQwZbbb::getZbrq, kssj)
+                                .eq(TbQwZbbb::getXtSjzt, "1")
+                                .eq(TbQwZbbb::getSsbmid, ssbmid)
+                );
+                if (bbList != null && bbList.size() != 0) {
+                    map.put("type", "01");
+                    map.put("list", bbList);
+                } else {
+                    map.put("type", "00");
+                }
+                // 当天，有报备展示报备，没有报备展示排班
+            } else if (now.getTime() == kssj.getTime()) {
+                List<TbQwZbbb> bbList = this.tbQwzbbbMapper.selectList(
+                        new LambdaQueryWrapper<TbQwZbbb>()
+                                .eq(TbQwZbbb::getZbrq, kssj)
+                                .eq(TbQwZbbb::getXtSjzt, "1")
+                                .eq(TbQwZbbb::getSsbmid, ssbmid)
+                );
+                if (bbList != null && bbList.size() != 0) {
+                    map.put("type", "02");
+                    map.put("list", bbList);
+                } else {
+                    List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.getDeptByMonth(kssj, ssbmid);
+                    if (zqList != null && zqList.size() > 0) {
+                        map.put("type", "03");
+                        map.put("list", zqList);
+                    } else {
+                        map.put("type", "04");
+                    }
+                }
+            } else {
+                List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.getDeptByMonth(kssj, ssbmid);
+                if (zqList != null && zqList.size() > 0) {
+                    map.put("type", "05");
+                    map.put("list", zqList);
+                } else {
+                    map.put("type", "06");
+                }
+            }
+            rList.add(map);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+        return rList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getZbbbByMonth(String time) {
+        UserInfo user = UserInfoManager.get();
+        String userId = String.valueOf(user.getUserId());
+        List<Map<String, Object>> rList = new ArrayList<>();
+        Date kssj = DateUtils.strToDate(time + "-01", "01");
+        Date jssj = DateUtils.getThisMonthLastDay(time);
+        while (kssj.getTime() <= jssj.getTime()) {
+            // 查询排班情况
+            List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.getMyZbpbByTime(kssj, userId);
+            Map<String, Object> map = new HashMap<>();
+            map.put("day", DateUtils.getQueryDateString(kssj, "12"));
+            List<Map<String, Object>> dayList = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(zqList)) {
+                Date finalKssj = kssj;
+                List<Map<String, Object>> finalDayList = dayList;
+                zqList.forEach(zq -> {
+                    Map<String, Object> dayMap = new HashMap<>();
+                    dayMap.put("zt", "01");
+                    dayMap.put("time", DateUtils.getQueryDateString(zq.getKssj(), "09") + "-"
+                            + DateUtils.getQueryDateString(zq.getJssj(), "09"));
+                    dayMap.put("id", zq.getId());
+                    // 查询是否报备，如果报备，则覆盖排班信息，改为报备信息
+                    TbQwZbbb zbbb = this.tbQwzbbbMapper.selectOne(
+                            new LambdaQueryWrapper<TbQwZbbb>()
+                                    .eq(TbQwZbbb::getZbpbId, zq.getId())
+                                    .eq(TbQwZbbb::getZbrq, finalKssj)
+                                    .orderByDesc(TbQwZbbb::getXtCjsj)
+                                    .last(" limit 1")
+                    );
+                    if (zbbb != null) {
+                        if ("0".equals(zbbb.getBbzt())) {
+                            dayMap.put("zt", "02");
+                            dayMap.put("time", DateUtils.getQueryDateString(zbbb.getBbkssj(), "09") + "-当前");
+                            dayMap.put("id", zbbb.getId());
+                        } else if ("1".equals(zbbb.getBbzt())) {
+                            dayMap.put("zt", "03");
+                            dayMap.put("time", DateUtils.getQueryDateString(zbbb.getBbkssj(), "09") + "-" +
+                                    DateUtils.getQueryDateString(zbbb.getBbjssj(), "09"));
+                            dayMap.put("id", zbbb.getId());
+                        }
+                    }
+                    finalDayList.add(dayMap);
+                });
+            }
+            // 查询其他的报备信息
+            List<TbQwZbbb> bbList = this.tbQwzbbbMapper.getMybbTodayByTime(String.valueOf(user.getUserId()),
+                    DateUtils.getQueryDateString(kssj, "01"));
+            for (TbQwZbbb item : bbList) {
+                Map<String, Object> dayMap = new HashMap<>();
+                dayMap.put("zt", "0".equals(item.getBbzt()) ? "02" : "03");
+                dayMap.put("time", DateUtils.getQueryDateString(item.getKssj(), "09") + "-"
+                        + DateUtils.getQueryDateString(item.getJssj(), "09"));
+                dayMap.put("id", item.getId());
+                dayList.add(dayMap);
+            }
+            // 查询请休假信息
+            TbQwQxj qxj = this.tbQwQxjMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwQxj>()
+                            .eq(TbQwQxj::getSqrId, userId)
+                            .le(TbQwQxj::getKssj, kssj)
+                            .ge(TbQwQxj::getJssj, kssj)
+                            .last(" limit 1")
+            );
+            if (qxj != null) {
+                Map<String, Object> dayMap = new HashMap<>();
+                dayMap.put("zt", "04");
+                dayMap.put("time", "00:00-23:59");
+                dayList = new ArrayList<>();
+                dayList.add(dayMap);
+            }
+            map.put("list", dayList);
+            rList.add(map);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+        return rList;
+    }
+
+    // 保存时间段累的所有的警力的数据
+    private void setZbpbMrjlOther(TbQwZbpb zb, TbQwZbpbZq zq) {
+        Date kssj = DateUtils.getNextDate(zb.getZbpbksrq(), "D", zq.getZbzq() - 1);
+        Date jssj = zb.getZbpbjsrq();
+        int a = -1;
+        while (kssj.getTime() <= jssj.getTime()) {
+            a++;
+            if (a % zb.getXhzq() != 0) {
+                kssj = DateUtils.getNextDate(kssj, "D", +1);
+                continue;
+            }
+            if ("1".equals(zb.getXhlx())) {
+                // 排除今天是休息日的情况，则需要查询今天是否是休息日
+                boolean flag = this.checkXxr(kssj);
+                if (flag) {
+                    kssj = DateUtils.getNextDate(kssj, "D", +1);
+                    continue;
+                }
+            } else if ("2".equals(zb.getXhlx())) {
+                // 排除今天是工作日的情况，则需要查询今天是否是工作日
+                boolean flag = this.checkXxr(kssj);
+                if (!flag) {
+                    kssj = DateUtils.getNextDate(kssj, "D", +1);
+                    continue;
+                }
+            }
+            TbQwZbpbMrjl mrjl = new TbQwZbpbMrjl();
+            mrjl.setPbId(zb.getId());
+            mrjl.setPbzqId(zq.getId());
+            String zbksskTime = DateUtils.getQueryDateString(kssj, "01") + " "
+                    + DateUtils.getQueryDateString(zq.getKssj(), "10");
+            mrjl.setZbkssj(DateUtils.strToDate(zbksskTime, "02"));
+            // 判断排班的开始时间是否大于排班的结束时间，如果大于 那么巡防的结束时间需要加一天
+            if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+                Date tempTime = DateUtils.getNextDate(kssj, "D", +1);
+                String xfjsskTime = DateUtils.getQueryDateString(tempTime, "01") + " "
+                        + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                mrjl.setZbjssj(DateUtils.strToDate(xfjsskTime, "02"));
+            } else {
+                String xfjsskTime = DateUtils.getQueryDateString(kssj, "01") + " "
+                        + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                mrjl.setZbjssj(DateUtils.strToDate(xfjsskTime, "02"));
+            }
+            mrjl.setZbrq(kssj);
+            this.tbQwZbpbMrjlMapper.insert(mrjl);
+            kssj = DateUtils.getNextDate(kssj, "D", +1);
+        }
+    }
+
+    // 发送给法制值班
+    private void addFzzb(TbQwZbpbZq zq, List<TbRwTaskUserDto> userDtoList) {
+        TbRwTaskUserDto itemDto = new TbRwTaskUserDto();
+        itemDto.setRwzflx("1");
+        itemDto.setJsrid(zq.getFzzbId());
+        itemDto.setJsrmc(zq.getFzzbXm());
+        itemDto.setJsrsfzh(zq.getFzzbSfzh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(zq.getFzzbId());
+        if (dept != null) {
+            itemDto.setSsbm(dept.getDeptname());
+            itemDto.setSsbmid(dept.getDeptid());
+        }
+        userDtoList.add(itemDto);
+    }
+
+    // 发送给专职指挥长
+    private void addZzzhz(TbQwZbpbZq zq, List<TbRwTaskUserDto> userDtoList) {
+        TbRwTaskUserDto itemDto = new TbRwTaskUserDto();
+        itemDto.setRwzflx("1");
+        itemDto.setJsrid(zq.getZzzhzId());
+        itemDto.setJsrmc(zq.getZzzhzXm());
+        itemDto.setJsrsfzh(zq.getZzzhzSfzh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(zq.getZzzhzId());
+        if (dept != null) {
+            itemDto.setSsbm(dept.getDeptname());
+            itemDto.setSsbmid(dept.getDeptid());
+        }
+        userDtoList.add(itemDto);
+    }
+
+    // 发送给值班指挥长
+    private void addZbzhz(TbQwZbpbZq zq, List<TbRwTaskUserDto> userDtoList) {
+        TbRwTaskUserDto itemDto = new TbRwTaskUserDto();
+        itemDto.setRwzflx("1");
+        itemDto.setJsrid(zq.getZbzhzId());
+        itemDto.setJsrmc(zq.getZbzhzXm());
+        itemDto.setJsrsfzh(zq.getZbzhzSfzh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(zq.getZbzhzId());
+        if (dept != null) {
+            itemDto.setSsbm(dept.getDeptname());
+            itemDto.setSsbmid(dept.getDeptid());
+        }
+        userDtoList.add(itemDto);
+    }
+
+    // 发送给值班领导
+    private void addZbld(TbQwZbpbZq zq, List<TbRwTaskUserDto> userDtoList) {
+        TbRwTaskUserDto itemDto = new TbRwTaskUserDto();
+        itemDto.setRwzflx("1");
+        itemDto.setJsrid(zq.getZbldId());
+        itemDto.setJsrmc(zq.getZbldXm());
+        itemDto.setJsrsfzh(zq.getZbldSfzh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(zq.getZbldId());
+        if (dept != null) {
+            itemDto.setSsbm(dept.getDeptname());
+            itemDto.setSsbmid(dept.getDeptid());
+        }
+        userDtoList.add(itemDto);
+    }
+
+    // 删除值班报备数据
+    public void deleteZbpb(String id) {
+        List<TbQwZbpbZq> zqList = this.tbQwZbpbZqMapper.selectList(
+                new LambdaQueryWrapper<TbQwZbpbZq>()
+                        .eq(TbQwZbpbZq::getPbId, id)
+        );
+        if (!CollectionUtils.isEmpty(zqList)) {
+            zqList.forEach(zq -> {
+                // 删除警力信息
+                this.tbQwJlMapper.deleteByYwid(zq.getId());
+                // 删除每日警力数据
+                this.tbQwZbpbMrjlMapper.deleteByYwid(id, zq.getId());
+            });
+        }
+        this.tbQwZbpbZqMapper.deleteByPbId(id);
+    }
+
+    //保存值班排班周期表数据
+    public void setZbpbzq(TbQwZbpbInsertOrUpdateDto dto, TbQwZbpb pb, DeptInfoVo dept, String pbid) {
+        List<TbQwZbpbZqDto> list = dto.getPbzqList();
+        if (!CollectionUtils.isEmpty(list)) {
+            for (TbQwZbpbZqDto item : list) {
+                TbQwZbpbZq zq = new TbQwZbpbZq();
+                BeanUtils.copyProperties(item, zq);
+                zq.setPbId(pb.getId());
+                zq.setId(UUIDGenerator.getUUID());
+                List<TbQwJl> jlList = item.getJlList();
+                List<TbQwJl> mjList = new ArrayList<>(), fjList = new ArrayList<>();
+                if (!CollectionUtils.isEmpty(jlList)) {
+                    for (TbQwJl jl : jlList) {
+                        if ("01".equals(jl.getJllx())) {
+                            mjList.add(jl);
+                        } else if ("02".equals(jl.getJllx())) {
+                            fjList.add(jl);
+                        }
+                        // 保存警力信息
+                        jl.setId(UUIDGenerator.getUUID());
+                        jl.setYwid(zq.getId());
+                        jl.setZblx("1");
+                        jl.setJlzt("1");
+                        jl.setXtSjly("1");
+                        if (dept != null) {
+                            jl.setSsbm(dept.getDeptname());
+                            jl.setSsbmid(dept.getDeptid());
+                            jl.setSsbmdm(dept.getDeptcode());
+                            jl.setSsxgajdm(dept.getFxjcode());
+                            jl.setSsxgajid(dept.getFxjid());
+                            jl.setSsxgaj(dept.getFxjname());
+                            jl.setSssgaj(dept.getDszname());
+                            jl.setSssgajdm(dept.getDszcode());
+                            jl.setSssgajid(dept.getDszid());
+                        }
+                        this.tbQwJlMapper.insert(jl);
+                    }
+                }
+                zq.setMjsl(mjList.size());
+                zq.setFjsl(fjList.size());
+                zq.setZbmj(JSONArray.toJSONString(mjList));
+                zq.setZbfj(JSONArray.toJSONString(fjList));
+                zq.setBcs(item.getBcs());
+                if (dept != null) {
+                    zq.setSsbm(dept.getDeptname());
+                    zq.setSsbmid(dept.getDeptid());
+                    zq.setSsbmdm(dept.getDeptcode());
+                    zq.setSsxgajdm(dept.getFxjcode());
+                    zq.setSsxgajid(dept.getFxjid());
+                    zq.setSsxgaj(dept.getFxjname());
+                    zq.setSssgaj(dept.getDszname());
+                    zq.setSssgajdm(dept.getDszcode());
+                    zq.setSssgajid(dept.getDszid());
+                }
+                zq.setXtSjly("1");
+                this.tbQwZbpbZqMapper.insert(zq);
+                // 保存时间段内的所有的警力数据
+                List<String> jlIds = jlList.stream().map(TbQwJl::getJlId).collect(Collectors.toList());
+                if (StringUtils.isNotBlank(zq.getZbldId())) {
+                    jlIds.add(zq.getZbldId());
+                }
+                if (StringUtils.isNotBlank(zq.getZbzhzId())) {
+                    jlIds.add(zq.getZbzhzId());
+                }
+                if (StringUtils.isNotBlank(zq.getZzzhzId())) {
+                    jlIds.add(zq.getZzzhzId());
+                }
+                if (StringUtils.isNotBlank(zq.getFzzbId())) {
+                    jlIds.add(zq.getFzzbId());
+                }
+                this.setZbpbMrjl(pb, zq, jlIds, pbid);
+            }
+        }
+    }
+
+    // 保存时间段内的所有的警力数据
+    private void setZbpbMrjl(TbQwZbpb pb, TbQwZbpbZq zq, List<String> jlIds, String pbid) {
+        Date kssj = DateUtils.getNextDate(pb.getZbpbksrq(), "D", zq.getZbzq() - 1);
+        Date jssj = pb.getZbpbjsrq();
+        if (kssj != null && jssj != null) {
+            // 判断结束时间和开始时间的年份是否一样，如果一样，保存所有数据，
+            // 如果不一样暂时保存本年数据
+            if (!DateUtils.getQueryDateString(kssj, "13")
+                    .equals(DateUtils.getQueryDateString(jssj, "13"))) {
+                jssj = DateUtils.strToDate(DateUtils.getQueryDateString(kssj, "13") + "-12-31", "01");
+            }
+            int a = -1;
+            while (kssj.getTime() <= jssj.getTime()) {
+                a++;
+                if (a % pb.getXhzq() != 0) {
+                    kssj = DateUtils.getNextDate(kssj, "D", +1);
+                    continue;
+                }
+                if ("1".equals(pb.getXhlx())) {
+                    // 排除今天是休息日的情况，则需要查询今天是否是休息日
+                    boolean flag = this.checkXxr(kssj);
+                    if (flag) {
+                        kssj = DateUtils.getNextDate(kssj, "D", +1);
+                        continue;
+                    }
+                } else if ("2".equals(pb.getXhlx())) {
+                    // 排除今天是工作日的情况，则需要查询今天是否是工作日
+                    boolean flag = this.checkXxr(kssj);
+                    if (!flag) {
+                        kssj = DateUtils.getNextDate(kssj, "D", +1);
+                        continue;
+                    }
+                }
+                TbQwZbpbMrjl mrjl = new TbQwZbpbMrjl();
+                mrjl.setPbId(pb.getId());
+                mrjl.setPbzqId(zq.getId());
+                String zbksskTime = DateUtils.getQueryDateString(kssj, "01") + " "
+                        + DateUtils.getQueryDateString(zq.getKssj(), "10");
+                mrjl.setZbkssj(DateUtils.strToDate(zbksskTime, "02"));
+                // 判断排班的开始时间是否大于排班的结束时间，如果大于 那么巡防的结束时间需要加一天
+                if (zq.getKssj().getTime() > zq.getJssj().getTime()) {
+                    Date tempTime = DateUtils.getNextDate(kssj, "D", +1);
+                    String xfjsskTime = DateUtils.getQueryDateString(tempTime, "01") + " "
+                            + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                    mrjl.setZbjssj(DateUtils.strToDate(xfjsskTime, "02"));
+                } else {
+                    String xfjsskTime = DateUtils.getQueryDateString(kssj, "01") + " "
+                            + DateUtils.getQueryDateString(zq.getJssj(), "10");
+                    mrjl.setZbjssj(DateUtils.strToDate(xfjsskTime, "02"));
+                }
+                mrjl.setZbrq(kssj);
+                // 判断时间是否重合，如果重合则抛出异常给前端
+                this.checkTime(mrjl, jlIds, pbid);
+                this.tbQwZbpbMrjlMapper.insert(mrjl);
+                kssj = DateUtils.getNextDate(kssj, "D", +1);
+            }
+        }
+
+    }
+
+    // 判断时间是否重合，如果重合则抛出异常给前端
+    private void checkTime(TbQwZbpbMrjl mrjl, List<String> jlIds, String pbid) {
+        List<TbQwZbpbMrjl> mrjlList = this.tbQwZbpbMrjlMapper.getMrjlByTime(DateUtils.getQueryDateString(mrjl.getZbkssj(), "02"),
+                DateUtils.getQueryDateString(mrjl.getZbjssj(), "02"), pbid);
+        if (mrjlList != null && mrjlList.size() > 0) {
+            mrjlList.forEach(m -> {
+                TbQwZbpbZq zq = this.tbQwZbpbZqMapper.selectById(m.getPbzqId());
+                if (zq != null) {
+                    TbQwZbpb zbpb = this.baseMapper.selectById(zq.getPbId());
+                    if (zbpb != null) {
+                        if (jlIds.indexOf(zq.getZbldId()) != -1) {
+                            throw new BusinessException(("值班领导(" + zq.getZbldXm() + ")在" +
+                                    "其他排班中时间冲突，冲突排班名称：" + zbpb.getZbmc()));
+                        }
+                        System.err.println(zq.getZbzhzId());
+                        if (jlIds.indexOf(zq.getZbzhzId()) != -1) {
+                            throw new BusinessException(("值班指挥长(" + zq.getZbzhzXm() + ")在" +
+                                    "其他排班中时间冲突，冲突排班名称：" + zbpb.getZbmc()));
+                        }
+                        if (jlIds.indexOf(zq.getZzzhzId()) != -1) {
+                            throw new BusinessException(("综合指挥长(" + zq.getZzzhzXm() + ")在" +
+                                    "其他排班中时间冲突，冲突排班名称：" + zbpb.getZbmc()));
+                        }
+                        if (jlIds.indexOf(zq.getFzzbId()) != -1) {
+                            throw new BusinessException(("法制值班(" + zq.getFzzbXm() + ")在" +
+                                    "其他排班中时间冲突，冲突排班名称：" + zbpb.getZbmc()));
+                        }
+                        // 其他警力
+                        List<TbQwJl> jlList = this.tbQwJlMapper.selectList(
+                                new LambdaQueryWrapper<TbQwJl>()
+                                        .eq(TbQwJl::getYwid, zq.getId())
+                                        .eq(TbQwJl::getXtSjzt, "1")
+                        );
+                        jlList.forEach(jl -> {
+                            if (jlIds.indexOf(jl.getJlId()) != -1) {
+                                throw new BusinessException(("01".equals(jl.getJllx()) ? "民警" : "辅警") + "(" + jl.getJlxm() + ")在" +
+                                        "其他排班中时间冲突，冲突排班名称：" + zbpb.getZbmc());
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    }
+
+    // 判断今天是否是工作日
+    private boolean checkGzr(Date kssj) {
+        int week = DateUtils.dateToWeek(kssj);
+        if (week == 0 || week == 6) {
+            TbQwJjr jjr = this.tbQwJjrMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwJjr>()
+                            .eq(TbQwJjr::getJjrq, kssj)
+                            .eq(TbQwJjr::getRqlx, "1")
+            );
+            if (jjr != null) return true;
+        }
+        TbQwJjr jjr = this.tbQwJjrMapper.selectOne(
+                new LambdaQueryWrapper<TbQwJjr>()
+                        .eq(TbQwJjr::getJjrq, kssj)
+                        .eq(TbQwJjr::getRqlx, "0")
+        );
+        return jjr == null;
+    }
+
+    // 判断今天是否是节假日或休息日
+    private boolean checkXxr(Date kssj) {
+        TbQwJjr jjr = this.tbQwJjrMapper.selectOne(
+                new LambdaQueryWrapper<TbQwJjr>()
+                        .eq(TbQwJjr::getJjrq, kssj)
+                        .eq(TbQwJjr::getRqlx, "0")
+        );
+        if (jjr != null) return true;
+        int week = DateUtils.dateToWeek(kssj);
+        if (week == 0 || week == 6) {
+            jjr = this.tbQwJjrMapper.selectOne(
+                    new LambdaQueryWrapper<TbQwJjr>()
+                            .eq(TbQwJjr::getJjrq, kssj)
+                            .eq(TbQwJjr::getRqlx, "1")
+            );
+            return jjr == null;
+        }
+        return false;
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbSearchTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbSearchTask.java
new file mode 100644
index 0000000..85e51da
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbSearchTask.java
@@ -0,0 +1,38 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.base.model.dto.qwzx.TbQwSearchJlqdDto;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.qwzx.service.TbQwBmjlbbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 部门警力报备存入redis中（每5分钟执行一次）
+ * 然后直接从redis中取数据
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwBmjlbbSearchTask {
+
+    private final TbQwBmjlbbService tbQwBmjlbbService;
+
+    @Scheduled(cron = "0 */5 * * * ?")
+    @Transactional
+    public void run() {
+        TbQwSearchJlqdDto dto = new TbQwSearchJlqdDto();
+        dto.setBbrq(DateUtils.getQueryDateString(new Date(), "01"));
+        // 获取新数据存入redis中
+        tbQwBmjlbbService.getJlqdListToRedis(dto);
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbTask.java
new file mode 100644
index 0000000..ac16012
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwBmjlbbTask.java
@@ -0,0 +1,40 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.qwzx.service.TbQwBmjlbbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/6
+ * 规则：
+ * 一、每晚1点更新昨天数据，并写入今天数据。
+ * 写入今天逻辑：
+ * 一、去人员表查询所有有部门且非虚拟的人员，全面写入。
+ * 二、去值班排班表查询数据并修改相关字段。
+ * 三、去请休假表查询数据并修改相关字段。
+ * 昨天数据更新逻辑：
+ * 一、去值班班表查询数据并修改相关字段。
+ * 二、去请休假表查询数据并修改相关字段。
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwBmjlbbTask {
+
+    private final TbQwBmjlbbService tbQwBmjlbbService;
+
+    @Scheduled(cron = "0 0 1 * * ?")
+    @Transactional
+    public void run() {
+        String time = DateUtils.dateTime(new Date());
+        // 写入今日数据
+        this.tbQwBmjlbbService.setBmjlbbInfo(time);
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwJsbbTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwJsbbTask.java
new file mode 100644
index 0000000..e4dc56c
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwJsbbTask.java
@@ -0,0 +1,41 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.base.model.entity.qwzx.TbQwZbbb;
+import com.mosty.qwzx.service.TbQwXfbbService;
+import com.mosty.qwzx.service.TbQwXfpbService;
+import com.mosty.qwzx.service.TbQwZbbbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author dw
+ * @since 2022/9/28
+ * 每5分钟查询报备(包含巡防报备和值班报备)信息，
+ * 如果时间到了，结束报备
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwJsbbTask {
+
+    private final TbQwXfbbService tbQwXfbbService;
+    private final TbQwZbbbService tbQwZbbbService;
+
+    @Scheduled(cron = "0 */10 * * * ?")
+    public void run() {
+        // 结束巡防报备
+        this.tbQwXfbbService.authJsbb();
+        // 结束值班报备
+        this.tbQwZbbbService.authJsbb();
+        // 删除报备
+        this.tbQwXfbbService.delRedisXfwz();
+    }
+
+    @Scheduled(cron = " 0 0 0 ? * 1 ")
+    public void authJsbbTs() {
+        // 结束特殊巡防报备
+        this.tbQwXfbbService.authJsbbTs();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwXfbbScTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwXfbbScTask.java
new file mode 100644
index 0000000..ba072fc
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwXfbbScTask.java
@@ -0,0 +1,39 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.qwzx.service.TbQwBmjlbbService;
+import com.mosty.qwzx.service.TbQwXfbbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/6
+ * 每30秒计算一次巡逻时长
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwXfbbScTask {
+
+    private final TbQwXfbbService tbQwXfbbService;
+
+    @Scheduled(cron = "0/30 * * * * ?")
+    @Transactional
+    public void run() {
+        this.tbQwXfbbService.checkXfbbSc();
+    }
+
+
+    //三分钟执行一次
+//    @Scheduled(cron = "0 0/3 * * * ?")
+    @Transactional
+    public void xfbbxlzt() {
+        this.tbQwXfbbService.updateXfzt();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbPbMrjlTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbPbMrjlTask.java
new file mode 100644
index 0000000..17d8c83
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbPbMrjlTask.java
@@ -0,0 +1,30 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.qwzx.service.TbQwXfpbService;
+import com.mosty.qwzx.service.TbQwZbpbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author dw
+ * @since 2022/8/10
+ * 每年第一天对排班日期为永久的排班信息添加每日警力
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwZbPbMrjlTask {
+
+    private final TbQwXfpbService tbQwXfpbService;
+    private final TbQwZbpbService tbQwZbpbService;
+
+    @Scheduled(cron = "0 0 0 1 1 ?")
+    public void run() {
+        // 排班添加每日警力
+        this.tbQwXfpbService.addMrjl();
+        // 值班添加每日警力
+        this.tbQwZbpbService.addMrjl();
+    }
+}
diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbbbAndXfbbTask.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbbbAndXfbbTask.java
new file mode 100644
index 0000000..6b0c6e4
--- /dev/null
+++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/task/TbQwZbbbAndXfbbTask.java
@@ -0,0 +1,31 @@
+package com.mosty.qwzx.task;
+
+import com.mosty.qwzx.service.TbQwXfpbService;
+import com.mosty.qwzx.service.TbQwZbpbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ * 每半小时提醒人员进行巡防报备\值班报备
+ * （定时巡防排班的数据，获取到需要巡防报备的人)
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbQwZbbbAndXfbbTask {
+
+    private final TbQwXfpbService tbQwXfpbService;
+    private final TbQwZbpbService tbQwZbpbService;
+
+    @Scheduled(cron = "0 */30 * * * ?")
+    public void run() {
+        // 巡防排班
+        this.tbQwXfpbService.checkThisTimeXfpb();
+        // 值班排班
+        this.tbQwZbpbService.checkThisTimeZbpb();
+    }
+}
diff --git a/mosty-qwzx/src/main/resources/application.yml b/mosty-qwzx/src/main/resources/application.yml
new file mode 100644
index 0000000..784d0e1
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_qwgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/bootstrap.yml b/mosty-qwzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..b9f9e5e
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8010
+  servlet:
+    context-path: /mosty-qwzx/
+spring:
+  application:
+    name: mosty-qwzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-qwzx/src/main/resources/logback-spring.xml b/mosty-qwzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..bac2c23
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+<!--        <appender-ref ref="CONSOLE" />-->
+<!--        <appender-ref ref="LOG_FILE_INFO" />-->
+<!--        <appender-ref ref="LOG_FILE_WARN" />-->
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/QwzxQwlbMapper.xml b/mosty-qwzx/src/main/resources/mapper/QwzxQwlbMapper.xml
new file mode 100644
index 0000000..9a08d45
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/QwzxQwlbMapper.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.qwzx.mapper.QwzxQwlbMapper">
+
+    <select id="qxjMjlb" resultType="java.util.Map">
+        select * from mosty_qwgl.tb_qw_qxj
+        where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.qjrq != null and dto.qjrq != ''">
+            and #{dto.qjrq} between date_format(kssj,'%Y-%m-%d') and date_format(jssj,'%Y-%m-%d')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmid like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+<!--        ${useSql}-->
+    </select>
+
+    <select id="jmxz" resultType="java.util.Map">
+        select *  from tb_qw_xfbb where xt_scbz='0' and xt_sjzt='1'
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="jmxzCount" resultType="int">
+        select *  from tb_qw_xfbb where xt_scbz='0' and xt_sjzt='1'
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/QwzxStatisticsMapper.xml b/mosty-qwzx/src/main/resources/mapper/QwzxStatisticsMapper.xml
new file mode 100644
index 0000000..8c04c09
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/QwzxStatisticsMapper.xml
@@ -0,0 +1,1086 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.qwzx.mapper.QwzxStatisticsMapper">
+    <select id="getQbfjCount" resultType="Integer">
+        select count(1) from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_jcgl.tb_jcgl_xfll c
+        where a.jl_id = c.id
+        and a.xt_sjzt = '1' and a.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0'
+        and a.jllx = '02'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid == null or dto.ssbmid == ''">-->
+        <!--            ${useSql}-->
+        <!--        </if>-->
+    </select>
+
+    <select id="getQbfjList" resultType="java.util.Map">
+        select c.xm username,c.sfzh sfz,c.mzdm mz,a.ssbm,a.ssbmdm,a.jllx jllx,c.xbdm sex,
+        date_format(now(),'%Y') - substring(c.sfzh,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_jcgl.tb_jcgl_xfll c
+        where a.jl_id = c.id
+        and a.xt_sjzt = '1' and a.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0'
+        and a.jllx = '02'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!-- 警力情况-辅警-全部列表 -->
+    <select id="qblb" resultType="java.util.Map">
+        select * from mosty_jcgl.tb_jcgl_xfll where fl='02' and xt_sjzt='1' and xt_scbz='0'
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm = #{dto.xm}
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getQblbCount" resultType="int">
+        select count(1) from mosty_jcgl.tb_jcgl_xfll where fl='02' and xt_sjzt='1' and xt_scbz='0'
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.xm != null and dto.xm != ''">
+            and xm = #{dto.xm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--全部在岗统计 -->
+    <select id="qbzgtj" resultType="java.util.Map">
+        select a.sl as qbsl,b.sl as zgsl from
+        (select count(1) as sl from mosty_qwgl.tb_qw_bmjlbb_jlmx where bblx in ('2','5') and xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        ) a,
+        (
+        select count(1) as sl from mosty_qwgl.tb_qw_bmjlbb_jlmx where bblx='2' and xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        ) b
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getQbzgtjCount" resultType="int">
+        select count(1) from
+        (select count(1) as sl from mosty_qwgl.tb_qw_bmjlbb_jlmx where bblx in ('2','5') and xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+
+
+        ) a,
+        (
+        select count(1) as sl from mosty_qwgl.tb_qw_bmjlbb_jlmx where bblx='2' and xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        ) b
+    </select>
+
+    <!--    在岗辅警数量-->
+    <select id="getZgfjCount" resultType="Integer">
+        select count(1) count from tb_qw_bmjlbb_jlmx a where xt_sjzt = '1' and xt_scbz = '0' and (jlzt = '1' or jlzt =
+        '2')
+        and jllx = '02'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    在岗辅警列表-->
+    <select id="getZgfjList" resultType="java.util.Map">
+        select c.xm username,c.sfzh sfz,c.mzdm mz,a.ssbm,a.ssbmdm,a.ssbmid,a.jllx jllx,c.xbdm sex,
+        date_format(now(),'%Y') - substring(c.sfzh,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_jcgl.tb_jcgl_xfll c
+        where a.jl_id = c.id
+        and a.xt_sjzt = '1' and a.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0' and (a.jlzt = '1' or a.jlzt =
+        '2')
+        and a.jllx = '02'
+        and a.bbrq = #{dto.bbrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jh != null and dto.jh != ''">
+            and a.jh like concat('%',#{dto.jh},'%')
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    在岗列表 -->
+    <select id="zglb" resultType="java.util.Map">
+        select * from mosty_qwgl.tb_qw_bmjlbb_jlmx where xt_scbz='0' and xt_sjzt='1' and bblx='2'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jh != null and dto.jh != ''">
+            and jh like concat('%',#{dto.jh},'%')
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getZglbCount" resultType="int">
+        select count(1) from mosty_qwgl.tb_qw_bmjlbb_jlmx where xt_scbz='0' and xt_sjzt='1' and bblx='2'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jh != null and dto.jh != ''">
+            and jh like concat('%',#{dto.jh},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--  "警力情况-街面警力-辅警列表  -->
+    <select id="fjlb" resultType="java.util.Map">
+        select * from tb_qw_jl a where jllx = '02' and xt_scbz = '0' and xt_sjzt='1' and ywid in(
+        select id from tb_qw_xfbb b where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and b.bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm=#{dto.jlxm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <select id="getFjlbCount" resultType="int">
+        select count(1) from tb_qw_jl a where jllx = '02' and xt_scbz = '0' and xt_sjzt='1' and ywid in(
+        select id from tb_qw_xfbb b where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and b.bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm=#{dto.jlxm}
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    警力情况-民警列表-->
+    <select id="mjlb" resultType="java.util.Map">
+        select * from tb_qw_jl a where jllx = '01' and xt_scbz = '0' and xt_sjzt='1' and ywid in(
+        select id from tb_qw_xfbb b where xt_sjzt='1' and xt_scbz='0'
+        and TO_DAYS(xfrq) = TO_DAYS(NOW())
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm=#{dto.jlxm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getMjlbCount" resultType="int">
+        select count(1) from tb_qw_jl a where jllx = '01' and xt_scbz = '0' and xt_sjzt='1' and ywid in(
+        select id from tb_qw_xfbb b where xt_sjzt='1' and xt_scbz='0'
+        and TO_DAYS(xfrq) = TO_DAYS(NOW())
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm=#{dto.jlxm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <select id="getQbCount" resultType="Integer">
+        select count(1) count from tb_qw_bmjlbb_jlmx a where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jllx != null and dto.jllx != ''">
+            and a.jllx=#{dto.jllx}
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <select id="qbList" resultType="java.util.Map">
+        select a.jlxm username,a.sfzh sfz,'' mz,a.ssbm,a.ssbmdm,a.jllx jllx,a.xbdm sex,
+        date_format(now(),'%Y') - substring(a.sfzh,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0' and (a.jlzt = '1' or a.jlzt =
+        '2')
+        <if test="dto.jllx != null and dto.jllx != ''">
+            and a.jllx = #{dto.jllx}
+        </if>
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    在岗民警辅警数量 -->
+    <select id="getZgCount" resultType="Integer">
+        select count(1) count from tb_qw_bmjlbb_jlmx a where xt_sjzt = '1' and xt_scbz = '0' and (jlzt = '1' or jlzt =
+        '2')
+        and bbrq = #{dto.bbrq}
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm=#{dto.jlxm}
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <select id="zgList" resultType="java.util.Map">
+        <!--     select b.user_name username,b.id_entity_card sfz,b.nation mz,a.ssbm,a.ssbmdm,a.jllx jllx,b.sex sex,
+             date_format(now(),'%Y') - substring(b.id_entity_card,7,4) age
+             from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_base.sys_user b
+             where a.jl_id = b.id
+             and a.xt_sjzt = '1' and a.xt_scbz = '0' and b.xt_zxbz = '0' and (a.jlzt = '1' or a.jlzt = '2')
+             and a.jllx = '01'
+             <if test="dto.bbrq != null and dto.bbrq != ''">
+                 and a.bbrq = #{dto.bbrq}
+             </if>
+             <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                 and a.ssbmdm  like concat(#{dto.ssbmdm},'%')
+             </if>
+     &lt;!&ndash;        <if test="dto.ssbmid != null and dto.ssbmid != ''">&ndash;&gt;
+     &lt;!&ndash;            and a.ssbmid = #{dto.ssbmid}&ndash;&gt;
+     &lt;!&ndash;        </if>&ndash;&gt;
+             <if test="dto.jlxm != null and dto.jlxm != ''">
+                 and b.user_name=#{dto.jlxm}
+             </if>
+     &lt;!&ndash;        ${useSql}&ndash;&gt;
+             union-->
+        select a.jlxm username,a.sfzh sfz,'' mz,a.ssbm,a.ssbmdm,a.jllx jllx,a.xbdm sex,
+        date_format(now(),'%Y') - substring(a.sfzh,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0' and (a.jlzt = '1' or a.jlzt =
+        '2')
+
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    可抽调辅警列表 -->
+    <select id="kcdFjlb" resultType="java.util.Map">
+        select * from mosty_qwgl.tb_qw_bmjlbb_jlmx where xt_scbz='0' and xt_sjzt='1' and bblx='2'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != '' and dto.ssbmid != '1'">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm = #{dto.jlxm}
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getKcdFjlbCount" resultType="int">
+        select count(1) from mosty_qwgl.tb_qw_bmjlbb_jlmx where xt_scbz='0' and xt_sjzt='1' and bblx='2'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != '' and dto.ssbmid != '1'">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm = #{dto.jlxm}
+        </if>
+        ${useSql}
+    </select>
+
+    <!--    可抽调民警辅警数量-->
+    <select id="getZbtjCount" resultType="Map">
+        select count(1) mj,(
+        select count(1) from tb_qw_bmjlbb_jlmx a where a.xt_sjzt='1' and a.xt_scbz='0'
+        and a.jllx = '02' and jlzt = '1'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq=#{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+        ) fj from tb_qw_bmjlbb_jlmx a where a.xt_sjzt='1' and a.xt_scbz='0'
+        and a.jllx = '01' and jlzt = '1'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq=#{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    可抽调民警列表-->
+    <select id="kcdMjList" resultType="java.util.Map">
+        select * from tb_qw_bmjlbb_jlmx a
+        where xt_scbz='0' and jllx = '01' and bblx = 1
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.bbrq == null or dto.bbrq == ''">
+            and TO_DAYS(bbrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="mjfjzh" resultType="java.util.Map">
+        <if test='dto.jllx == 01'>
+            select a.id_entity_card as idEntityCard, c.org_name as orgName,a.user_name as userName, a.sex as
+            sex,a.in_dust_rial_id as inDustRialId,
+            "01" as jllx from mosty_base.sys_user a
+            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+            where a.xt_zxbz = 0
+            and a.is_virtual_user='02'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and b.dept_id = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.user_name like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+
+            <!--            <if test="useDept != null and useDept != ''">-->
+            <!--                and b.dept_id in (${useDept})-->
+            <!--            </if>-->
+        </if>
+        <if test='dto.jllx == 02'>
+            select sfzh as idEntityCard,ssbm as orgName,xm as userName,xbdm as sex,"" as inDustRialId,"02" as jllx
+            from mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and a.ssbmid = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.xm like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <!--            ${useSql}-->
+        </if>
+        <if test="dto.jllx == null or dto.jllx == ''">
+            select a.id_entity_card as idEntityCard, c.org_name as orgName,a.user_name as userName, a.sex as
+            sex,a.in_dust_rial_id as inDustRialId,
+            "01" as jllx from mosty_base.sys_user a
+            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+            where a.xt_zxbz = 0
+            and a.is_virtual_user='02'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and b.dept_id = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.user_name like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <!--            <if test="useDept != null and useDept != ''">-->
+            <!--                and b.dept_id in (${useDept})-->
+            <!--            </if>-->
+            union all
+            select sfzh as idEntityCard,ssbm as orgName,xm as userName,xbdm as sex,"" as inDustRialId,"02" as jllx
+            from mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and a.ssbmid = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.xm like concat('%',#{dto.jlxm},'%')
+            </if>
+            <!--            ${useSql}-->
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    <select id="getMjQblbCount" resultType="int">-->
+    <!--        <if test='dto.jllx == 01'>-->
+    <!--            select count(1) a.id_entity_card as idEntityCard, c.org_name as orgName,a.user_name as userName, a.sex as sex,a.in_dust_rial_id as inDustRialId,-->
+    <!--            "01" as jllx from mosty_base.sys_user a-->
+    <!--            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id-->
+    <!--            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id-->
+    <!--            where a.xt_zxbz = 0-->
+    <!--            and a.is_virtual_user='02'-->
+    <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+    <!--                and b.dept_id = #{dto.ssbmid}-->
+    <!--            </if>-->
+    <!--            <if test="dto.jlxm != null and dto.jlxm != ''">-->
+    <!--                and a.user_name like concat('%',#{dto.jlxm},'%')-->
+    <!--            </if>-->
+    <!--        </if>-->
+    <!--        <if test='dto.jllx == 02'>-->
+    <!--            select sfzh as idEntityCard,ssbm as orgName,xm as userName,xbdm as sex,"" as inDustRialId,"02" as jllx-->
+    <!--            from mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'-->
+    <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+    <!--                and a.ssbmid = #{dto.ssbmid}-->
+    <!--            </if>-->
+    <!--            <if test="dto.jlxm != null and dto.jlxm != ''">-->
+    <!--                and a.xm like concat('%',#{dto.jlxm},'%')-->
+    <!--            </if>-->
+    <!--        </if>-->
+    <!--        <if test="dto.jllx == null or dto.jllx == ''">-->
+    <!--            select a.id_entity_card as idEntityCard, c.org_name as orgName,a.user_name as userName, a.sex as sex,a.in_dust_rial_id as inDustRialId,-->
+    <!--            "01" as jllx from mosty_base.sys_user a-->
+    <!--            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id-->
+    <!--            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id-->
+    <!--            where a.xt_zxbz = 0-->
+    <!--            and a.is_virtual_user='02'-->
+    <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+    <!--                and b.dept_id = #{dto.ssbmid}-->
+    <!--            </if>-->
+    <!--            <if test="dto.jlxm != null and dto.jlxm != ''">-->
+    <!--                and a.user_name like concat('%',#{dto.jlxm},'%')-->
+    <!--            </if>-->
+    <!--            union all-->
+    <!--            select sfzh as idEntityCard,ssbm as orgName,xm as userName,xbdm as sex,"" as inDustRialId,"02" as jllx-->
+    <!--            from mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'-->
+    <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+    <!--                and a.ssbmid = #{dto.ssbmid}-->
+    <!--            </if>-->
+    <!--            <if test="dto.jlxm != null and dto.jlxm != ''">-->
+    <!--                and a.xm like concat('%',#{dto.jlxm},'%')-->
+    <!--            </if>-->
+    <!--        </if>-->
+    <!--        <if test="dto.ssbmid == null or dto.ssbmid == ''">-->
+    <!--            ${useSql}-->
+    <!--        </if>-->
+    <!--        limit #{pageIndex},#{pageSize}-->
+    <!--    </select>-->
+
+    <!--    警力情况-民警-全部列表-->
+    <select id="mjQblb" resultType="java.util.Map">
+        SELECT
+        DISTINCT
+        a.id,
+        a.position_id,
+        a.position_name,
+        a.login_name,
+        a.user_name,
+        a.mobile,
+        a.tele_phone,
+        a.sex,
+        a.xt_lrsj,
+        a.in_dust_rial_id,
+        a.id_entity_card,
+        a.politic,
+        a.marital,
+        a.type,
+        c.id as deptId,
+        c.org_code as deptCode,
+        c.org_name as deptName
+        FROM
+        mosty_base.sys_user a
+        inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+        inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+        where a.xt_zxbz = 0
+        and a.is_virtual_user='02'
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.dept_id = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.userName != null and dto.userName != ''">
+            and a.user_name like concat('%',#{dto.userName} ,'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and c.org_code like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="useDept != null and useDept != ''">-->
+        <!--            and b.dept_id in (${useDept})-->
+        <!--        </if>-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    警力情况-民警-全部民警-->
+    <select id="getQbmjCount" resultType="java.lang.Integer">
+        select count(1) count from tb_qw_bmjlbb_jlmx a where xt_sjzt = '1' and xt_scbz = '0'
+        and jllx = '01'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    警力情况-民警-全部民警列表-->
+    <select id="qbmjList" resultType="java.util.Map">
+        select b.user_name username,b.id_entity_card sfz,b.nation mz,a.ssbm,a.ssbmdm,a.jllx jllx,b.sex sex,
+        date_format(now(),'%Y') - substring(b.id_entity_card,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_base.sys_user b
+        where a.jl_id = b.id
+        and a.xt_sjzt = '1' and a.xt_scbz = '0' and b.xt_zxbz = '0'
+        and a.jllx = '01'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--   警力情况-民警-全部在岗统计 -->
+    <select id="getQbzgCount" resultType="Integer">
+        select a.sl as qbsl,b.sl as zgsl from
+        (select count(1) as sl from
+        mosty_base.sys_user a
+        inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+        inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+        where a.is_virtual_user='02' and a.xt_zxbz='0'
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.dept_id = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        <if test="useDept != null and useDept != ''">-->
+        <!--            and b.dept_id in (${useDept})-->
+        <!--        </if>-->
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        ) a,
+        (select count(1) as sl from tb_qw_bmjlbb_jlmx where jlbb_id in(
+        select id from tb_qw_bmjlbb where xt_scbz='0' and jllx = '01' and bblx = 1
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq=#{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        )
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        ) b
+    </select>
+
+    <!--    警力情况-民警-在岗列表 -->
+    <select id="mjZglb" resultType="java.util.Map">
+        select * from tb_qw_bmjlbb_jlmx a where jllx = '01'
+
+        <!-- jlbb_id in(
+         select id from tb_qw_bmjlbb b where xt_scbz='0' and jllx = '01' and bblx = 1
+         <if test="dto.bbrq != null and dto.bbrq != ''">
+             and b.bbrq = #{dto.bbrq}
+         </if>
+         <if test="dto.bbrq == null or dto.bbrq == ''">
+             and TO_DAYS(b.bbrq) = TO_DAYS(NOW())
+         </if>
+         )-->
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.bbrq == null or dto.bbrq == ''">
+            and TO_DAYS(b.bbrq) = TO_DAYS(NOW())
+        </if>
+
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jh != null and dto.jh != ''">
+            and a.jh like concat('%',#{dto.jh},'%')
+        </if>
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getmMjzglbCount" resultType="int">
+        select count(1) from tb_qw_bmjlbb_jlmx a where jlbb_id in(
+        select id from tb_qw_bmjlbb b where xt_scbz='0' and jllx = '01' and bblx = 1
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and b.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.bbrq == null or dto.bbrq == ''">
+            and TO_DAYS(b.bbrq) = TO_DAYS(NOW())
+        </if>
+        )
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jh != null and dto.jh != ''">
+            and a.jh like concat('%',#{dto.jh},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    在岗民警 -->
+    <select id="getZgmj" resultType="int">
+        select count(1) count from tb_qw_bmjlbb_jlmx where xt_sjzt = '1' and xt_scbz = '0' and (jlzt = '1' or jlzt =
+        '2')
+        and jllx = '01'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    警力情况-民警-在岗民警辅警整合-->
+    <select id="zgmjfjzh" resultType="java.util.Map">
+        select * from tb_qw_bmjlbb_jlmx a where jlbb_id in(
+        select id from tb_qw_bmjlbb b where xt_scbz='0' and bblx = 1
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and b.bbrq=#{dto.bbrq}
+        </if>
+        <if test="dto.bbrq == null or dto.bbrq == ''">
+            and TO_DAYS(b.bbrq) = TO_DAYS(NOW())
+        </if>
+        <!--        <if test="ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.ssbmid=#{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.jllx != null and dto.jllx != ''">
+            and a.jllx #dto.jllx}
+        </if>
+    </select>
+
+    <!--    警力情况-民警-在岗民警列表-->
+    <select id="zgmjList" resultType="java.util.Map">
+        select b.user_name username,b.id_entity_card sfz,b.nation mz,a.ssbm,a.ssbmdm,a.jllx jllx,b.sex sex,
+        date_format(now(),'%Y') - substring(b.id_entity_card,7,4) age
+        from mosty_qwgl.tb_qw_bmjlbb_jlmx a,mosty_base.sys_user b
+        where a.jl_id = b.id
+        and a.xt_sjzt = '1' and a.xt_scbz = '0' and b.xt_zxbz = '0' and (a.jlzt = '1' or a.jlzt = '2')
+        and a.jllx = '01'
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and a.bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--   警力情况-请休假-辅警列表 -->
+    <select id="qxFjlb" resultType="java.util.Map">
+        select * from tb_qw_qxj a where a.xt_scbz='0' and a.xt_sjzt='1' and a.sqrlx = '02'
+        <if test="dto.kssj == null or dto.kssj == ''">
+            and curdate() BETWEEN a.kssj and a.jssj
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.kssj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.jssj &lt;=#{dto.jssj}
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and a.ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.sqr_xm=#{dto.jlxm}
+        </if>
+
+        <!--        ${useSql}-->
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--    警力情况-请休假-民警辅警统计 -->
+    <select id="mjfjtj" resultType="java.util.Map">
+        select count(1) mj,(
+        select count(1) fj from tb_qw_qxj a where a.xt_sjzt = '1' and a.xt_scbz = '0' and a.sqrlx = '02'
+        <if test="dto.qjrq != null and dto.qjrq != ''">
+            and #{dto.qjrq} between date_format(kssj,'%Y-%m-%d') and date_format(jssj,'%Y-%m-%d')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+
+        ) fj
+        from tb_qw_qxj a where a.xt_sjzt = '1' and a.xt_scbz = '0' and a.sqrlx = '01'
+        <if test="dto.qjrq != null and dto.qjrq != ''">
+            and #{dto.qjrq} between date_format(kssj,'%Y-%m-%d') and date_format(jssj,'%Y-%m-%d')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--    警力情况-请休假-民警列表 -->
+    <select id="qxjMjlb" resultType="java.util.Map">
+        select user_name as jlxm,sex as xbdm,id_entity_card as sfzh,manager_org_id as ssbmdm,manager_org_name as
+        ssbm from mosty_base.sys_user a where xt_zxbz='0' and id in(
+        select sqr_id from tb_qw_qxj where xt_scbz='0' and xt_sjzt='1' and sqrlx = '01'
+        <if test="dto.kssj == null or dto.kssj == ''">
+            and curdate() BETWEEN kssj and jssj
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and kssj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and jssj &lt;=#{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.user_name like concat('%',#{dto.jlxm} ,'%')
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="kcdMjCount" resultType="int">
+        select count(1) from tb_qw_bmjlbb_jlmx a
+        where xt_scbz='0' and jllx = '01' and bblx = 1
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and bbrq = #{dto.bbrq}
+        </if>
+        <if test="dto.bbrq == null or dto.bbrq == ''">
+            and TO_DAYS(bbrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <select id="mjQblbCount" resultType="int">
+        SELECT
+        count(DISTINCT a.id)
+        FROM
+        mosty_base.sys_user a
+        inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+        inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+        where a.xt_zxbz = 0
+        and a.is_virtual_user='02'
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and b.dept_id = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <if test="dto.userName != null and dto.userName != ''">
+            and a.user_name like concat('%',#{dto.userName} ,'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and c.org_code like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="useDept != null and useDept != ''">-->
+        <!--            and b.dept_id in (${useDept})-->
+        <!--        </if>-->
+    </select>
+
+    <select id="mjfjzhCount" resultType="int">
+        <if test='dto.jllx == 01'>
+            select count(1) from mosty_base.sys_user a
+            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+            where a.xt_zxbz = 0
+            and a.is_virtual_user='02'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and b.dept_id = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.user_name like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and c.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <!--            <if test="useDept != null and useDept != ''">-->
+            <!--                and b.dept_id in (${useDept})-->
+            <!--            </if>-->
+        </if>
+        <if test='dto.jllx == 02'>
+            select count(1) mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and a.ssbmid = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.xm like concat('%',#{dto.jlxm},'%')
+            </if>
+            <!--            ${useSql}-->
+        </if>
+        <if test="dto.jllx == null or dto.jllx == ''">
+            select count(1) from mosty_base.sys_user a
+            inner JOIN mosty_base.sys_user_dept b ON a.id = b.user_id
+            inner JOIN mosty_base.sys_dept c ON b.dept_id = c.id
+            where a.xt_zxbz = 0
+            and a.is_virtual_user='02'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and b.dept_id = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.user_name like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <!--            <if test="useDept != null and useDept != ''">-->
+            <!--                and b.dept_id in (${useDept})-->
+            <!--            </if>-->
+            union all
+            select count(1) from mosty_jcgl.tb_jcgl_xfll a where fl='02' and xt_sjzt='1' and xt_scbz='0'
+            <!--            <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+            <!--                and a.ssbmid = #{dto.ssbmid}-->
+            <!--            </if>-->
+            <if test="dto.jlxm != null and dto.jlxm != ''">
+                and a.xm like concat('%',#{dto.jlxm},'%')
+            </if>
+            <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+                and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+            </if>
+            <!--            ${useSql}-->
+        </if>
+    </select>
+
+    <select id="qxjMjlbCount" resultType="int">
+        select count(1) from mosty_base.sys_user a where xt_zxbz='0' and id in(
+        select sqr_id from tb_qw_qxj where xt_scbz='0' and xt_sjzt='1' and sqrlx = '01'
+        <if test="dto.kssj == null or dto.kssj == ''">
+            and curdate() BETWEEN kssj and jssj
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and kssj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and jssj &lt;=#{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+        <!--            and ssbmid = #{dto.ssbmid}-->
+        <!--        </if>-->
+        <!--        ${useSql}-->
+        )
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.user_name like concat('%',#{dto.jlxm} ,'%')
+        </if>
+    </select>
+
+    <select id="qxFjlbCount" resultType="int">
+        select count(1) from tb_qw_qxj a where a.xt_scbz='0' and a.xt_sjzt='1' and a.sqrlx = '02'
+        <if test="dto.kssj == null or dto.kssj == ''">
+            and curdate() BETWEEN a.kssj and a.jssj
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.kssj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.jssj &lt;=#{dto.jssj}
+        </if>
+        <!--   <if test="dto.ssbmid != null and dto.ssbmid != ''">
+               and a.ssbmid = #{dto.ssbmid}
+           </if>-->
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.sqr_xm=#{dto.jlxm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbJlmxMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbJlmxMapper.xml
new file mode 100644
index 0000000..215487f
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbJlmxMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwBmjlbbJlmxMapper">
+
+    <!--根据ID删除警力明细-->
+    <update id="deleteJlmx">
+        update tb_qw_bmjlbb_jlmx set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据ID删除明细-->
+    <update id="deleteByJlbbId">
+        delete
+        from tb_qw_bmjlbb_jlmx
+        where jlbb_id = #{qwjzId}
+    </update>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbMapper.xml
new file mode 100644
index 0000000..776c33f
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwBmjlbbMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwBmjlbbMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.vo.qwzx.TbQwBmjlbbVo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="bbrq" property="bbrq" />
+        <result column="sfjjr" property="sfjjr" />
+        <result column="jjrmc" property="jjrmc" />
+        <result column="qwdj_id" property="qwdjId" />
+        <result column="qwdjdm" property="qwdjdm" />
+        <result column="qwdj" property="qwdj" />
+        <result column="kssj" property="kssj" />
+        <result column="jssj" property="jssj" />
+        <result column="zgmjsl" property="zgmjsl" />
+        <result column="zgmj" property="zgmj" />
+        <result column="zgfjsl" property="zgfjsl" />
+        <result column="zgfj" property="zgfj" />
+        <result column="zbjlsl" property="zbjlsl" />
+        <result column="zbjl" property="zbjl" />
+        <result column="bzmjlsl" property="bzmjlsl" />
+        <result column="bzgmj" property="bzgmj" />
+        <result column="bzgfjsl" property="bzgfjsl" />
+        <result column="bzgfj" property="bzgfj" />
+        <result column="ssbm" property="ssbm" />
+        <result column="ssbmdm" property="ssbmdm" />
+        <result column="ssxgaj" property="ssxgaj" />
+        <result column="ssxgajdm" property="ssxgajdm" />
+        <result column="sssgaj" property="sssgaj" />
+        <result column="sssgajdm" property="sssgajdm" />
+        <result column="bz" property="bz" />
+        <collection property="zbjlList" ofType="com.mosty.base.model.dto.qwzx.TbQwBmjlbbJlmxDto">
+            <result column="id" property="id" />
+            <result column="jlbb_id" property="jlbbId" />
+            <result column="jl_id" property="jlId" />
+            <result column="jllx" property="jllx" />
+            <result column="jlxm" property="jlxm" />
+            <result column="sfzh" property="sfzh" />
+            <result column="jh" property="jh" />
+            <result column="xbdm" property="xbdm" />
+            <result column="nl" property="nl" />
+            <result column="jlzt" property="jlzt" />
+            <result column="bblx" property="bblx" />
+        </collection>
+        <collection property="zgjlList" ofType="com.mosty.base.model.dto.qwzx.TbQwBmjlbbJlmxDto">
+            <result column="id" property="id" />
+            <result column="jlbb_id" property="jlbbId" />
+            <result column="jl_id" property="jlId" />
+            <result column="jllx" property="jllx" />
+            <result column="jlxm" property="jlxm" />
+            <result column="sfzh" property="sfzh" />
+            <result column="jh" property="jh" />
+            <result column="xbdm" property="xbdm" />
+            <result column="nl" property="nl" />
+            <result column="jlzt" property="jlzt" />
+            <result column="bblx" property="bblx" />
+        </collection>
+        <collection property="bzgjlList" ofType="com.mosty.base.model.dto.qwzx.TbQwBmjlbbJlmxDto">
+            <result column="id" property="id" />
+            <result column="jlbb_id" property="jlbbId" />
+            <result column="jl_id" property="jlId" />
+            <result column="jllx" property="jllx" />
+            <result column="jlxm" property="jlxm" />
+            <result column="sfzh" property="sfzh" />
+            <result column="jh" property="jh" />
+            <result column="xbdm" property="xbdm" />
+            <result column="nl" property="nl" />
+            <result column="jlzt" property="jlzt" />
+            <result column="bblx" property="bblx" />
+        </collection>
+    </resultMap>
+
+    <select id="selectOnCop" resultType="com.mosty.base.model.vo.qwzx.Gzqk">
+        select count(1) zgmjsl,
+        (select count(1) zgfjsl from tb_qw_bmjlbb_jlmx a where DATE_FORMAT(a.bbrq,'%Y-%m-%d')=
+        DATE_FORMAT(NOW(),'%Y-%m-%d') and a.xt_scbz = '0' and a.xt_sjzt = '1' and a.jlzt = '1' and
+        a.jllx = '02'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and a.ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        ) as zgfjsl
+        from tb_qw_bmjlbb_jlmx a where DATE_FORMAT(a.bbrq,'%Y-%m-%d')=
+        DATE_FORMAT(NOW(),'%Y-%m-%d') and a.xt_scbz = '0' and a.xt_sjzt = '1' and a.jlzt = '1'
+        and a.jllx = '01'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and a.ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+    </select>
+
+    <select id="jlbbCount" resultType="com.mosty.base.model.vo.qwzx.TbQwBmjlbbCountVo">
+        select SUM(zgmjsl) as zgmjs,SUM(zgfjsl) as zgfjs,SUM(bzmjlsl) as bzgmjs,SUM(bzgfjsl) as bzgfjs
+        from tb_qw_bmjlbb
+        <if test="params.kssj != null and params.jssj == null">
+            and a.bbrq &gt;= #{params.kssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj == null and params.jssj != null">
+            and a.bbrq &lt;= #{params.jssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj != null and params.jssj != null">
+            and a.bbrq between #{params.kssj,jdbcType=DATE} and #{params.jssj,jdbcType=DATE}
+        </if>
+    </select>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwClMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwClMapper.xml
new file mode 100644
index 0000000..8866ddb
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwClMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwClMapper">
+
+    <!--根据ID删除勤务车辆明细-->
+    <update id="deleteCl">
+        update tb_qw_cl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByYwid">
+        delete from tb_qw_cl where ywid = #{ywid}
+    </update>
+
+    <select id="queryListByYwid" resultType="com.mosty.base.model.entity.qwzx.TbQwCl">
+        select a.* from tb_qw_cl a
+        where a.xt_scbz = '0'
+        and a.ywid in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwJjrMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwJjrMapper.xml
new file mode 100644
index 0000000..fdcc208
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwJjrMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.qwzx.mapper.TbQwJjrMapper">
+
+    <delete id="deleteBatch">
+        delete from tb_qw_jjr where id in
+        <foreach collection="list" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwJlMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwJlMapper.xml
new file mode 100644
index 0000000..ce39c1c
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwJlMapper.xml
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwJlMapper">
+
+    <resultMap type="com.mosty.base.model.entity.qwzx.TbQwJl" id="TbQwJlMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ywid" column="ywid" jdbcType="VARCHAR"/>
+        <result property="jllx" column="jllx" jdbcType="VARCHAR"/>
+        <result property="jlId" column="jl_id" jdbcType="VARCHAR"/>
+        <result property="jlxm" column="jlxm" jdbcType="VARCHAR"/>
+        <result property="sfzh" column="sfzh" jdbcType="VARCHAR"/>
+        <result property="lxdh" column="lxdh" jdbcType="VARCHAR"/>
+        <result property="xbdm" column="xbdm" jdbcType="VARCHAR"/>
+        <result property="nl" column="nl" jdbcType="INTEGER"/>
+        <result property="jlzt" column="jlzt" jdbcType="VARCHAR"/>
+        <result property="zblx" column="zblx" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询所有-->
+    <select id="queryAll" resultMap="TbQwJlMap">
+        select id,
+               ywid,
+               jllx,
+               jl_id,
+               jlxm,
+               sfzh,
+               xbdm,
+               nl,
+               jlzt,
+               zblx,
+               ssbm,
+               ssbmdm,
+               ssxgaj,
+               ssxgajdm,
+               sssgaj,
+               sssgajdm,
+               xt_sjly,
+               xt_sjzt,
+               xt_scbz,
+               xt_cjip,
+               xt_cjsj,
+               xt_cjr_id,
+               xt_cjr,
+               xt_cjbmdm,
+               xt_cjbmmc,
+               xt_zhgxip,
+               xt_zhgxsj,
+               xt_zhgxrid,
+               xt_zhgxr,
+               xt_zhgxbmdm,
+               xt_zhgxbm,
+               bz
+        from tb_qw_jl
+    </select>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbQwJlMap">
+        select id,
+               ywid,
+               jllx,
+               jl_id,
+               jlxm,
+               sfzh,
+               xbdm,
+               nl,
+               jlzt,
+               zblx,
+               ssbm,
+               ssbmdm,
+               ssxgaj,
+               ssxgajdm,
+               sssgaj,
+               sssgajdm,
+               xt_sjly,
+               xt_sjzt,
+               xt_scbz,
+               xt_cjip,
+               xt_cjsj,
+               xt_cjr_id,
+               xt_cjr,
+               xt_cjbmdm,
+               xt_cjbmmc,
+               xt_zhgxip,
+               xt_zhgxsj,
+               xt_zhgxrid,
+               xt_zhgxr,
+               xt_zhgxbmdm,
+               xt_zhgxbm,
+               bz
+        from tb_qw_jl
+        where id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLimit" resultMap="TbQwJlMap">
+        select
+        id, ywid, jllx, jl_id, jlxm, sfzh, xbdm, nl, jlzt, zblx, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,
+        xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+        xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+        from tb_qw_jl
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="ywid != null and ywid != ''">
+                and ywid = #{ywid}
+            </if>
+            <if test="jllx != null and jllx != ''">
+                and jllx = #{jllx}
+            </if>
+            <if test="jlId != null and jlId != ''">
+                and jl_id = #{jlId}
+            </if>
+            <if test="jlxm != null and jlxm != ''">
+                and jlxm = #{jlxm}
+            </if>
+            <if test="sfzh != null and sfzh != ''">
+                and sfzh = #{sfzh}
+            </if>
+            <if test="xbdm != null and xbdm != ''">
+                and xbdm = #{xbdm}
+            </if>
+            <if test="nl != null">
+                and nl = #{nl}
+            </if>
+            <if test="jlzt != null and jlzt != ''">
+                and jlzt = #{jlzt}
+            </if>
+            <if test="zblx != null and zblx != ''">
+                and zblx = #{zblx}
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                and ssbm = #{ssbm}
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                and ssbmdm = #{ssbmdm}
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                and ssxgaj = #{ssxgaj}
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                and ssxgajdm = #{ssxgajdm}
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                and sssgaj = #{sssgaj}
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                and sssgajdm = #{sssgajdm}
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                and xt_sjly = #{xtSjly}
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                and xt_sjzt = #{xtSjzt}
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                and xt_scbz = #{xtScbz}
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                and xt_cjip = #{xtCjip}
+            </if>
+            <if test="xtCjsj != null">
+                and xt_cjsj = #{xtCjsj}
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                and xt_cjr_id = #{xtCjrId}
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                and xt_cjr = #{xtCjr}
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                and xt_cjbmdm = #{xtCjbmdm}
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                and xt_cjbmmc = #{xtCjbmmc}
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                and xt_zhgxip = #{xtZhgxip}
+            </if>
+            <if test="xtZhgxsj != null">
+                and xt_zhgxsj = #{xtZhgxsj}
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                and xt_zhgxrid = #{xtZhgxrid}
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                and xt_zhgxr = #{xtZhgxr}
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                and xt_zhgxbmdm = #{xtZhgxbmdm}
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                and xt_zhgxbm = #{xtZhgxbm}
+            </if>
+            <if test="bz != null and bz != ''">
+                and bz = #{bz}
+            </if>
+        </where>
+        limit #{pageable.offset}, #{pageable.pageSize}
+    </select>
+
+    <!--统计总行数-->
+    <select id="count" resultType="java.lang.Long">
+        select count(1)
+        from tb_qw_jl
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="ywid != null and ywid != ''">
+                and ywid = #{ywid}
+            </if>
+            <if test="jllx != null and jllx != ''">
+                and jllx = #{jllx}
+            </if>
+            <if test="jlId != null and jlId != ''">
+                and jl_id = #{jlId}
+            </if>
+            <if test="jlxm != null and jlxm != ''">
+                and jlxm = #{jlxm}
+            </if>
+            <if test="sfzh != null and sfzh != ''">
+                and sfzh = #{sfzh}
+            </if>
+            <if test="xbdm != null and xbdm != ''">
+                and xbdm = #{xbdm}
+            </if>
+            <if test="nl != null">
+                and nl = #{nl}
+            </if>
+            <if test="jlzt != null and jlzt != ''">
+                and jlzt = #{jlzt}
+            </if>
+            <if test="zblx != null and zblx != ''">
+                and zblx = #{zblx}
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                and ssbm = #{ssbm}
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                and ssbmdm = #{ssbmdm}
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                and ssxgaj = #{ssxgaj}
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                and ssxgajdm = #{ssxgajdm}
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                and sssgaj = #{sssgaj}
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                and sssgajdm = #{sssgajdm}
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                and xt_sjly = #{xtSjly}
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                and xt_sjzt = #{xtSjzt}
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                and xt_scbz = #{xtScbz}
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                and xt_cjip = #{xtCjip}
+            </if>
+            <if test="xtCjsj != null">
+                and xt_cjsj = #{xtCjsj}
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                and xt_cjr_id = #{xtCjrId}
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                and xt_cjr = #{xtCjr}
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                and xt_cjbmdm = #{xtCjbmdm}
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                and xt_cjbmmc = #{xtCjbmmc}
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                and xt_zhgxip = #{xtZhgxip}
+            </if>
+            <if test="xtZhgxsj != null">
+                and xt_zhgxsj = #{xtZhgxsj}
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                and xt_zhgxrid = #{xtZhgxrid}
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                and xt_zhgxr = #{xtZhgxr}
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                and xt_zhgxbmdm = #{xtZhgxbmdm}
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                and xt_zhgxbm = #{xtZhgxbm}
+            </if>
+            <if test="bz != null and bz != ''">
+                and bz = #{bz}
+            </if>
+        </where>
+    </select>
+
+    <select id="countReportPolice" resultType="Map">
+        select count(*) bb, zblx
+        from tb_qw_jl
+        where zblx is not null
+          and xt_sjzt = '1'
+          and DATE_FORMAT(xt_cjsj, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
+            ${sql}
+        GROUP BY zblx
+    </select>
+
+    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_qw_jl(id, ywid, jllx, jl_id, jlxm, sfzh, xbdm, nl, jlzt, zblx, ssbm, ssbmdm, ssxgaj, ssxgajdm,
+        sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc,
+        xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.ywid}, #{entity.jllx}, #{entity.jlId}, #{entity.jlxm}, #{entity.sfzh}, #{entity.xbdm},
+            #{entity.nl}, #{entity.jlzt}, #{entity.zblx}, #{entity.ssbm}, #{entity.ssbmdm}, #{entity.ssxgaj},
+            #{entity.ssxgajdm}, #{entity.sssgaj}, #{entity.sssgajdm}, #{entity.xtSjly}, #{entity.xtSjzt},
+            #{entity.xtScbz}, #{entity.xtCjip}, #{entity.xtCjsj}, #{entity.xtCjrId}, #{entity.xtCjr},
+            #{entity.xtCjbmdm}, #{entity.xtCjbmmc}, #{entity.xtZhgxip}, #{entity.xtZhgxsj}, #{entity.xtZhgxrid},
+            #{entity.xtZhgxr}, #{entity.xtZhgxbmdm}, #{entity.xtZhgxbm}, #{entity.bz})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_qw_jl(ywid, jllx, jl_id, jlxm, sfzh, xbdm, nl, jlzt, zblx, ssbm, ssbmdm, ssxgaj, ssxgajdm,
+        sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc,
+        xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.ywid}, #{entity.jllx}, #{entity.jlId}, #{entity.jlxm}, #{entity.sfzh}, #{entity.xbdm},
+            #{entity.nl}, #{entity.jlzt}, #{entity.zblx}, #{entity.ssbm}, #{entity.ssbmdm}, #{entity.ssxgaj},
+            #{entity.ssxgajdm}, #{entity.sssgaj}, #{entity.sssgajdm}, #{entity.xtSjly}, #{entity.xtSjzt},
+            #{entity.xtScbz}, #{entity.xtCjip}, #{entity.xtCjsj}, #{entity.xtCjrId}, #{entity.xtCjr},
+            #{entity.xtCjbmdm}, #{entity.xtCjbmmc}, #{entity.xtZhgxip}, #{entity.xtZhgxsj}, #{entity.xtZhgxrid},
+            #{entity.xtZhgxr}, #{entity.xtZhgxbmdm}, #{entity.xtZhgxbm}, #{entity.bz})
+        </foreach>
+        on duplicate key update
+        ywid = values(ywid),
+        jllx = values(jllx),
+        jl_id = values(jl_id),
+        jlxm = values(jlxm),
+        sfzh = values(sfzh),
+        xbdm = values(xbdm),
+        nl = values(nl),
+        jlzt = values(jlzt),
+        zblx = values(zblx),
+        ssbm = values(ssbm),
+        ssbmdm = values(ssbmdm),
+        ssxgaj = values(ssxgaj),
+        ssxgajdm = values(ssxgajdm),
+        sssgaj = values(sssgaj),
+        sssgajdm = values(sssgajdm),
+        xt_sjly = values(xt_sjly),
+        xt_sjzt = values(xt_sjzt),
+        xt_scbz = values(xt_scbz),
+        xt_cjip = values(xt_cjip),
+        xt_cjsj = values(xt_cjsj),
+        xt_cjr_id = values(xt_cjr_id),
+        xt_cjr = values(xt_cjr),
+        xt_cjbmdm = values(xt_cjbmdm),
+        xt_cjbmmc = values(xt_cjbmmc),
+        xt_zhgxip = values(xt_zhgxip),
+        xt_zhgxsj = values(xt_zhgxsj),
+        xt_zhgxrid = values(xt_zhgxrid),
+        xt_zhgxr = values(xt_zhgxr),
+        xt_zhgxbmdm = values(xt_zhgxbmdm),
+        xt_zhgxbm = values(xt_zhgxbm),
+        bz = values(bz)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update tb_qw_jl
+        <set>
+            <if test="ywid != null and ywid != ''">
+                ywid = #{ywid},
+            </if>
+            <if test="jllx != null and jllx != ''">
+                jllx = #{jllx},
+            </if>
+            <if test="jlId != null and jlId != ''">
+                jl_id = #{jlId},
+            </if>
+            <if test="jlxm != null and jlxm != ''">
+                jlxm = #{jlxm},
+            </if>
+            <if test="sfzh != null and sfzh != ''">
+                sfzh = #{sfzh},
+            </if>
+            <if test="xbdm != null and xbdm != ''">
+                xbdm = #{xbdm},
+            </if>
+            <if test="nl != null">
+                nl = #{nl},
+            </if>
+            <if test="jlzt != null and jlzt != ''">
+                jlzt = #{jlzt},
+            </if>
+            <if test="zblx != null and zblx != ''">
+                zblx = #{zblx},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <update id="deleteById">
+
+    </update>
+    <update id="deleteByYwid">
+        delete
+        from tb_qw_jl
+        where ywid = #{ywid}
+    </update>
+
+    <select id="queryListByYwid" resultType="com.mosty.base.model.entity.qwzx.TbQwJl">
+        select a.* from tb_qw_jl a
+        where a.xt_scbz = '0'
+        and a.ywid in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--查询今日报备警力数量-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_qw_jl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.zblx = '3'
+        <if test="dto.jllx != null and dto.jllx != ''">
+            and a.jllx = #{dto.jllx}
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        and a.ywid in (
+        select id from tb_qw_xfbb b where b.xt_scbz = '0' and b.xt_sjzt = '1' and b.bbzt = '0'
+        <if test="dto.xfbmdm != null and dto.xfbmdm != ''">
+            and b.xfbmdm like concat(#{dto.xfbmdm},'%')
+        </if>
+        )
+    </select>
+
+    <!--查询今日报备警力集合-->
+    <select id="getList" resultMap="TbQwJlMap" parameterType="Map">
+        select * from tb_qw_jl a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.zblx = '3'
+        <if test="dto.jllx != null and dto.jllx != ''">
+            and a.jllx = #{dto.jllx}
+        </if>
+        <if test="dto.jlxm != null and dto.jlxm != ''">
+            and a.jlxm like concat('%',#{dto.jlxm},'%')
+        </if>
+        and a.ywid in (
+        select id from tb_qw_xfbb b where b.xt_scbz = '0' and b.xt_sjzt = '1' and b.bbzt = '0'
+        <if test="dto.xfbmdm != null and dto.xfbmdm != ''">
+            and b.xfbmdm like concat(#{dto.xfbmdm},'%')
+        </if>
+
+<!--        ${useSql}-->
+        )
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+</mapper>
+
+
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwJyqxMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwJyqxMapper.xml
new file mode 100644
index 0000000..e22f077
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwJyqxMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwJyqxMapper">
+
+    <!--根据ID删除警用器械明细-->
+    <update id="deleteJyqx">
+        update tb_qw_jyqx set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据业务ID删除明细-->
+    <delete id="deleteByYwid">
+        delete from tb_qw_jyqx where ywid = #{ywid}
+    </delete>
+
+    <select id="queryListByYwid" resultType="com.mosty.base.model.entity.qwzx.TbQwJyqx">
+        select a.* from tb_qw_jyqx a
+        where a.xt_scbz = '0'
+        and a.ywid in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwQwbcMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwQwbcMapper.xml
new file mode 100644
index 0000000..547c65a
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwQwbcMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwQwbcMapper">
+
+    <delete id="deleteQwbc">
+        delete from tb_qw_qwbc where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwQwdjMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwQwdjMapper.xml
new file mode 100644
index 0000000..2edc343
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwQwdjMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwQwdjMapper">
+
+    <delete id="deleteQwdj">
+        delete from tb_qw_qwdj where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+
+    <select id="queryCurrentQwdj" resultType="com.mosty.base.model.entity.qwzx.TbQwQwdj">
+        SELECT * FROM tb_qw_qwdj where xt_scbz = '0' and fbzt = '1'
+        and date_format(#{datetime},'%Y-%m-%d  %H:%i:%s') BETWEEN qwkssj and qwjssj order by qwdj LIMIT 1
+    </select>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwQxjMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwQxjMapper.xml
new file mode 100644
index 0000000..4439f71
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwQxjMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwQxjMapper">
+
+    <update id="deleteQxj">
+        update tb_qw_qxj set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="selectHolidayCount" resultType="java.util.Map">
+        select count(*),sqrlx from tb_qw_qxj where DATE_FORMAT(now(),'%Y-%m-%d')
+        between kssj and jssj GROUP BY sqrlx
+    </select>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwMapper.xml
new file mode 100644
index 0000000..94b39fb
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.qwzx.mapper.TbQwSpsCsdwMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwhdgjMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwhdgjMapper.xml
new file mode 100644
index 0000000..afac90b
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwSpsCsdwhdgjMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.qwzx.mapper.TbQwSpsCsdwhdgjMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfBxfsqMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfBxfsqMapper.xml
new file mode 100644
index 0000000..35190e6
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfBxfsqMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXfBxfsqMapper">
+
+    <delete id="deleteBxfsq">
+        delete from tb_qw_xf_bxfsq where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml
new file mode 100644
index 0000000..d670d35
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml
@@ -0,0 +1,838 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXfbbMapper">
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.dto.qwzx.TbQwXfbbVo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="xfpb_id" property="xfpbId"/>
+        <result column="bblx" property="bblx"/>
+        <result column="qwlx" property="qwlx"/>
+        <result column="qwdj_id" property="qwdjId"/>
+        <result column="qwdj" property="qwdj"/>
+        <result column="qwbc_id" property="qwbcId"/>
+        <result column="jz_id" property="jzId"/>
+        <result column="jz_mc" property="jzMc"/>
+        <result column="xfbm" property="xfbm"/>
+        <result column="xfbmid" property="xfbmid"/>
+        <result column="xfbmdm" property="xfbmdm"/>
+        <result column="fzr_sfzh" property="fzrSfzh"/>
+        <result column="fzr_xm" property="fzrXm"/>
+        <result column="fzr_id" property="fzrId"/>
+        <result column="fzr_lxdh" property="fzrLxdh"/>
+        <result column="xfrq" property="xfrq"/>
+        <result column="kssj" property="kssj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="zqsc" property="zqsc"/>
+        <result column="jgts" property="jgts"/>
+        <result column="mjsl" property="mjsl"/>
+        <result column="pbmj" property="pbmj"/>
+        <result column="fjsl" property="fjsl"/>
+        <result column="pbfj" property="pbfj"/>
+        <result column="jcsl" property="jcsl"/>
+        <result column="pbcl" property="pbcl"/>
+        <result column="txzbsl" property="txzbsl"/>
+        <result column="txzb" property="txzb"/>
+        <result column="jyqxsl" property="jyqxsl"/>
+        <result column="jyqx" property="jyqx"/>
+        <result column="wzlx" property="wzlx"/>
+        <result column="zzlx" property="zzlx"/>
+        <result column="xlfs" property="xlfs"/>
+        <result column="xfzt" property="xfzt"/>
+        <result column="bbkssj" property="bbkssj"/>
+        <result column="bbjssj" property="bbjssj"/>
+        <result column="bbzt" property="bbzt"/>
+        <result column="dqwz" property="dqwz"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="zbsj" property="zbsj"/>
+        <result column="xfsc" property="xfsc"/>
+        <result column="xflc" property="xflc"/>
+        <result column="xffwlx" property="xffwlx"/>
+        <result column="xffwid" property="xffwid"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="bz" property="bz"/>
+        <result column="zylx" property="zylx"/>
+        <result column="dzbq" property="dzbq"/>
+        <result column="wqzb" property="wqzb"/>
+        <collection property="jlList" ofType="com.mosty.base.model.dto.qwzx.TbQwJlDto">
+            <result column="id" property="id"/>
+            <result column="ywid" property="ywid"/>
+            <result column="jl_id" property="jlId"/>
+            <result column="jllx" property="jllx"/>
+            <result column="jlxm" property="jlxm"/>
+            <result column="xbdm" property="xbdm"/>
+            <result column="nl" property="nl"/>
+            <result column="jlzt" property="jlzt"/>
+            <result column="zblx" property="zblx"/>
+        </collection>
+        <collection property="clList" ofType="com.mosty.base.model.dto.qwzx.TbQwClDto">
+            <result column="id" property="id"/>
+            <result column="ywid" property="ywid"/>
+            <result column="qwcl_id" property="qwclId"/>
+            <result column="clmc" property="clmc"/>
+            <result column="jdchphm" property="jdchphm"/>
+            <result column="jdchpzldm" property="jdchpzldm"/>
+            <result column="zblx" property="zblx"/>
+        </collection>
+        <collection property="znzbList" ofType="com.mosty.base.model.dto.qwzx.TbQwZnzbDto">
+            <result column="id" property="id"/>
+            <result column="ywid" property="ywid"/>
+            <result column="txzb_id" property="txzbId"/>
+            <result column="sbmc" property="sbmc"/>
+            <result column="txzblx" property="txzblx"/>
+            <result column="hh" property="hh"/>
+            <result column="zhh" property="zhh"/>
+            <result column="zblx" property="zblx"/>
+        </collection>
+        <collection property="jyqxList" ofType="com.mosty.base.model.dto.qwzx.TbQwJyqxDto">
+            <result column="id" property="id"/>
+            <result column="ywid" property="ywid"/>
+            <result column="zblx" property="zblx"/>
+            <result column="qxmc" property="qxmc"/>
+            <result column="qxlx" property="qxlx"/>
+            <result column="qxsl" property="qxsl"/>
+        </collection>
+    </resultMap>
+
+    <resultMap id="BaseMap" type="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="xfpb_id" property="xfpbId"/>
+        <result column="qwdj_id" property="qwdjId"/>
+        <result column="qwlx" property="qwlx"/>
+        <result column="bblx" property="bblx"/>
+        <result column="qwdj" property="qwdj"/>
+        <result column="qwbc_id" property="qwbcId"/>
+        <result column="jz_id" property="jzId"/>
+        <result column="jz_mc" property="jzMc"/>
+        <result column="xfbm" property="xfbm"/>
+        <result column="xfbmid" property="xfbmid"/>
+        <result column="xfbmdm" property="xfbmdm"/>
+        <result column="fzr_sfzh" property="fzrSfzh"/>
+        <result column="fzr_xm" property="fzrXm"/>
+        <result column="fzr_id" property="fzrId"/>
+        <result column="fzr_lxdh" property="fzrLxdh"/>
+        <result column="xfrq" property="xfrq"/>
+        <result column="kssj" property="kssj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="zqsc" property="zqsc"/>
+        <result column="jgts" property="jgts"/>
+        <result column="mjsl" property="mjsl"/>
+        <result column="pbmj" property="pbmj"/>
+        <result column="fjsl" property="fjsl"/>
+        <result column="pbfj" property="pbfj"/>
+        <result column="jcsl" property="jcsl"/>
+        <result column="pbcl" property="pbcl"/>
+        <result column="txzbsl" property="txzbsl"/>
+        <result column="txzb" property="txzb"/>
+        <result column="jyqxsl" property="jyqxsl"/>
+        <result column="jyqx" property="jyqx"/>
+        <result column="wzlx" property="wzlx"/>
+        <result column="zzlx" property="zzlx"/>
+        <result column="xlfs" property="xlfs"/>
+        <result column="xfzt" property="xfzt"/>
+        <result column="bbkssj" property="bbkssj"/>
+        <result column="bbjssj" property="bbjssj"/>
+        <result column="bbzt" property="bbzt"/>
+        <result column="dqwz" property="dqwz"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="zbsj" property="zbsj"/>
+        <result column="xfsc" property="xfsc"/>
+        <result column="xflc" property="xflc"/>
+        <result column="xffwlx" property="xffwlx"/>
+        <result column="xffwid" property="xffwid"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result column="bz" property="bz"/>
+        <result column="zylx" property="zylx"/>
+        <result column="dzbq" property="dzbq"/>
+        <result column="wqzb" property="wqzb"/>
+    </resultMap>
+
+    <!--查询-->
+    <select id="queryList" resultMap="BaseResultMap">
+        select a.*,b.*,c.*,d.*,e.* from tb_qw_xfbb a
+        left join tb_qw_jl b on a.id = b.ywid
+        left join tb_qw_cl c on a.id = c.ywid
+        left join tb_qw_znzb d on a.id = d.ywid
+        left join tb_qw_jyqx e on a.id = e.ywid
+        where a.xt_scbz = '0'
+        <if test="params.xfbId != null and params.xfbId != ''">
+            and a.xfpb_id = #{params.xfpbId,jdbcType=VARCHAR}
+        </if>
+        <if test="params.qwdjId != null and params.qwdjId != ''">
+            and a.qwdj_id = #{params.qwdjId,jdbcType=VARCHAR}
+        </if>
+        <if test="params.qwbcId != null and params.qwbcId != ''">
+            and a.qwbc_id = #{params.qwbcId,jdbcType=VARCHAR}
+        </if>
+        <if test="params.jzId != null and params.jzId != ''">
+            and a.jz_id = #{params.jzId,jdbcType=VARCHAR}
+        </if>
+        <if test="params.qwdj != null and params.qwdj != ''">
+            and a.qwdj = #{params.qwdj,jdbcType=VARCHAR}
+        </if>
+        <if test="params.xfbmdm != null and params.xfbmdm != ''">
+            and a.xfbmdm = #{params.xfbmdm,jdbcType=VARCHAR}
+        </if>
+        <if test="params.fzrXm != null and params.fzrXm != ''">
+            and a.fzr_xm like concat('%',#{params.fzrXm,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="params.fzrSfzh != null and params.fzrSfzh != ''">
+            and a.fzr_sfzh like concat('%',#{params.fzrSfzh,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="params.xfzt != null and params.xfzt != ''">
+            and a.xfzt = #{params.xfzt,jdbcType=VARCHAR}
+        </if>
+        <if test="params.xtSjly != null and params.xtSjly != ''">
+            and a.xt_sjly = #{params.xtSjly,jdbcType=VARCHAR}
+        </if>
+        <if test="params.xtSjzt != null and params.xtSjzt != ''">
+            and a.xt_sjzt = #{params.xtSjzt,jdbcType=VARCHAR}
+        </if>
+        <if test="params.kssj != null and params.jssj == null">
+            and a.kssj &gt;= #{params.kssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj == null and params.jssj != null">
+            and a.kssj &lt;= #{params.jssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj != null and params.jssj != null">
+            and a.kssj between #{params.kssj,jdbcType=DATE} and #{params.jssj,jdbcType=DATE}
+        </if>
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and a.ssbmdm like concat(#{params.ssbmdm},'%')
+        </if>
+        <!-- 数据范围过滤 -->
+<!--        ${createSql}-->
+    </select>
+
+    <!--id查询-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select a.*, b.*, c.*, d.*, e.*
+        from tb_qw_xfbb a
+                     left join tb_qw_jl b on a.id = b.ywid
+                     left join tb_qw_cl c on a.id = c.ywid
+                     left join tb_qw_znzb d on a.id = d.ywid
+                     left join tb_qw_jyqx e on a.id = e.ywid
+        where a.xt_scbz = '0'
+          and a.id = #{id,jdbcType=VARCHAR}
+    </select>
+
+    <select id="selectJhsl" resultType="Integer">
+        select count(1) from tb_qw_xfpb_zq b where b.xt_scbz = '0' and b.xt_sjzt = '1'
+        and b.id in (select a.pbzq_id from tb_qw_xfpb_mrjl a where DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%s')
+        between DATE_FORMAT(a.xfkssj, '%Y-%m-%d %H:%i:%s') and DATE_FORMAT(a.xfjssj, '%Y-%m-%d %H:%i:%s'))
+        <if test="dto != null and dto.fzrXm != null and dto.fzrXm != ''">
+            and b.fzr_xm like concat ('%',#{dto.fzrXm},'%')
+        </if>
+<!--        <if test="dto != null and dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and b.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto != null and dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        ${useSql}-->
+    </select>
+
+    <select id="selectJhslList" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpbZq">
+        select * from tb_qw_xfpb_zq b where b.xt_scbz = '0' and b.xt_sjzt = '1'
+        and b.id in (select a.pbzq_id from tb_qw_xfpb_mrjl a where DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%s')
+        between DATE_FORMAT(a.xfkssj, '%Y-%m-%d %H:%i:%s') and DATE_FORMAT(a.xfjssj, '%Y-%m-%d %H:%i:%s')
+        )
+        <if test="dto != null and dto.fzrXm != null and dto.fzrXm != ''">
+            and b.fzr_xm like concat ('%',#{dto.fzrXm},'%')
+        </if>
+<!--        <if test="dto != null and dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and b.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto != null and dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm = #{dto.ssbmdm}
+        </if>
+<!--        ${useSql}-->
+        limit #{pageIndex}, #{pageSize}
+    </select>
+
+    <select id="selectSjsl" resultType="Integer">
+        select count(1)
+        from tb_qw_xfbb b
+        where b.xt_scbz = '0'
+        and b.xt_sjzt = '1'
+        and b.bbzt = '0'
+        <if test="dto != null and dto.fzrXm != null and dto.fzrXm != ''">
+            and b.fzr_xm like concat ('%',#{dto.fzrXm},'%')
+        </if>
+<!--        <if test="dto != null and dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and b.xfbmdm = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto != null and dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        ${useSql}-->
+    </select>
+
+    <select id="selectSjslList" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        select *
+        from tb_qw_xfbb b
+        where b.xt_scbz = '0'
+        and b.xt_sjzt = '1'
+        and b.bbzt = '0'
+        <if test="dto != null and dto.fzrXm != null and dto.fzrXm != ''">
+            and b.fzr_xm like concat ('%',#{dto.fzrXm},'%')
+        </if>
+<!--        <if test="dto != null and dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and b.xfbmdm = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto != null and dto.ssbmdm != null and dto.ssbmdm != ''">
+            and b.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+<!--        ${useSql}-->
+        limit #{pageIndex}
+        , #{pageSize}
+    </select>
+
+    <select id="selectPowerAndDayLength" resultType="java.util.Map" parameterType="String">
+        select ifnull(sum(mjsl), 0) jmmjsl,
+               ifnull(sum(fjsl), 0) jmfjsl,
+               ifnull(sum(xfsc), 0) xfsc,
+               ifnull(sum(xflc), 0) xflc
+        from tb_qw_xfbb
+        where xt_scbz = '0'
+          and xt_sjzt = '1'
+          and bbzt = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+    </select>
+
+    <select id="selectNearbyDeck" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        SELECT *,
+               (
+                       6371 * acos(
+                               cos(radians(#{t.jd}))
+                                       * cos(radians(jd))
+                                       * cos(radians(wd) - radians(#{t.wd}))
+                                       + sin(radians(#{t.jd}))
+                                       * sin(radians(jd))
+                               )
+                       )
+                       AS distance
+        FROM tb_qw_xfbb
+        HAVING distance &lt; 20
+        ORDER BY distance;
+    </select>
+
+    <!--批量删除-->
+    <update id="deleteXfbb">
+        update tb_qw_xfbb set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--查询周边巡组或街面巡组数量-->
+    <select id="getCountZbxz" resultType="Integer" parameterType="Map">
+        select count(1) from tb_qw_xfbb a where a.xt_scbz = '0' and a.xt_sjzt = '1' and   a.bbzt= '0'
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+      <!--  <if test="list != null and list.size() > 0 and qwList != null and qwList.size() > 0 ">
+            and a.xfzt in
+            <foreach collection="list" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>-->
+
+        <choose>
+            <when test="list != null and list.size() > 0 and qwList != null and qwList.size() > 0 ">
+                and ( a.xfzt in
+                <foreach collection="list" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                or a.qwlx in
+                <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                )
+            </when>
+            <when test="list != null and list.size() > 0 ">
+                and a.xfzt in
+                <foreach collection="list" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <when test="qwList != null and qwList.size() > 0 ">
+                and a.qwlx in
+                <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+        </choose>
+
+
+
+
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and date_format(a.xfrq,'%Y-%m-%d') = #{dto.bbrq}
+        </if>
+        <if test="dto.zzlx != null and dto.zzlx != ''">
+            and a.zzlx =  #{dto.zzlx}
+        </if>
+        <if test="dto.fzrXm != null and dto.fzrXm != ''">
+            and a.fzr_xm like concat('%',#{dto.fzrXm},'%')
+        </if>
+        <if test="dto.jzMc != null and dto.jzMc != ''">
+            and a.jz_mc like concat('%',#{dto.jzMc},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (
+                a.xfbm like concat('%',#{dto.keyword},'%') or
+                a.jz_mc like concat('%',#{dto.keyword},'%') or
+                a.fzr_xm like concat('%',#{dto.keyword},'%') or
+                a.dqwz like concat('%',#{dto.keyword},'%')
+               )
+        </if>
+
+      <!--  <if test="qwList != null and qwList.size() > 0">
+            and a.qwlx in
+            <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+-->
+    </select>
+
+    <!--查询周边巡组或街面巡组列表-->
+    <select id="getListZbxz" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb" parameterType="Map">
+        select *
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_qw_xfbb a where a.xt_scbz = '0' and a.xt_sjzt = '1'  and a.bbzt= '0'
+    <!--    <if test="list != null and list.size() > 0">
+            and a.xfzt in
+            <foreach collection="list" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>-->
+
+
+        <choose>
+            <when test="list != null and list.size() > 0 and qwList != null and qwList.size() > 0 ">
+                and ( a.xfzt in
+                <foreach collection="list" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                or a.qwlx in
+                <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+                )
+            </when>
+            <when test="list != null and list.size() > 0 ">
+                and a.xfzt in
+                <foreach collection="list" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+            <when test="qwList != null and qwList.size() > 0 ">
+                and a.qwlx in
+                <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </when>
+        </choose>
+
+        <if test="dto.bbrq != null and dto.bbrq != ''">
+            and date_format(a.xfrq,'%Y-%m-%d') = #{dto.bbrq}
+        </if>
+        <if test="dto.zzlx != null and dto.zzlx != ''">
+            and a.zzlx =  #{dto.zzlx}
+        </if>
+<!--        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">-->
+<!--            and ssbmdm = #{dto.ssbmdm}-->
+<!--        </if>-->
+        <if test="dto.fzrXm != null and dto.fzrXm != ''">
+            and a.fzr_xm like concat('%',#{dto.fzrXm},'%')
+        </if>
+        <if test="dto.jzMc != null and dto.jzMc != ''">
+            and a.jz_mc like concat('%',#{dto.jzMc},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+
+
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (
+            a.xfbm like concat('%',#{dto.keyword},'%') or
+            a.jz_mc like concat('%',#{dto.keyword},'%') or
+            a.fzr_xm like concat('%',#{dto.keyword},'%') or
+            a.dqwz like concat('%',#{dto.keyword},'%')
+            )
+        </if>
+
+     <!--   <if test="qwList != null and qwList.size() > 0">
+            and a.qwlx in
+            <foreach collection="qwList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>-->
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+            order by distance asc
+        </if>
+        <if test="pageIndex != null and pageIndex != null and pageIndex != '' and pageSize != ''">
+            limit #{pageIndex},#{pageSize}
+        </if>
+    </select>
+
+
+
+    <!--查询我今天的报备-->
+    <select id="getMybbTodayNew" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb" parameterType="String">
+        select *
+        from tb_qw_xfbb a
+        where a.xt_scbz = '0'
+        <if test="bblx != null and bblx != ''">
+            and a.bblx = #{bblx}
+        </if>
+        and a.xt_sjzt = '1'
+        and a.bbzt = '0'
+        and a.bbjssj is null
+        and (
+        a.fzr_sfzh = #{sfzh} or a.id in (select ywid
+        from tb_qw_jl b
+        where b.xt_scbz = '0'
+        and b.xt_sjzt = '1'
+        and b.ywid = a.id
+        and b.sfzh = #{sfzh})
+        )
+        limit 1
+    </select>
+
+    <!--查询我今天的报备-->
+    <select id="getMybbTodayByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb" parameterType="String">
+        select *
+        from tb_qw_xfbb a
+        where a.xt_scbz = '0'
+        and a.xt_sjzt = '1'
+        and a.bbzt = '0'
+        and a.bbjssj is null
+        <if test="bblx != null and bblx != ''">
+            and a.bblx = #{bblx}
+        </if>
+        <if test="time != null and time != ''">
+            and date_format(a.xfrq,'%Y-%m-%d') = #{time}
+        </if>
+        and (
+        a.fzr_id = #{userId} or a.id in (select ywid
+        from tb_qw_jl b
+        where b.xt_scbz = '0'
+        and b.xt_sjzt = '1'
+        and b.ywid = a.id
+        and b.jl_id = #{userId})
+        )
+    </select>
+
+    <select id="getBbxxByJi" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        select *
+        from (
+        select id,
+        st_distance_sphere(POINT(jd, wd), POINt(#{jd}, #{wd}))
+        as jl,
+        ssbm,
+        ssbmid,
+        ssbmdm,
+        ssxgaj,
+        ssxgajid,
+        ssxgajdm,
+        sssgaj,
+        sssgajid,
+        sssgajdm
+        from tb_qw_xfbb
+        where xt_scbz = '0'
+        and bbzt = '0'
+        and xfzt = '0'
+        <if test="ssbmid != null and ssbmid != ''">
+            and (ssbmid = #{ssbmid} or ssxgajid = #{ssbmid} or sssgajid = #{ssbmid})
+        </if>
+        order by jl asc
+        ) a
+        where a.jl &lt;= #{radius} limit 1
+    </select>
+
+    <select id="getBbList" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        select a.*
+        from tb_qw_xfbb a,
+             tb_qw_znzb b
+        where a.id = b.ywid
+          and b.xt_sjzt = '1'
+          and b.xt_scbz = '0'
+          and b.hh = #{sbid}
+          and a.bbzt = '0'
+<!--          and date_format(xfrq, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d')-->
+    </select>
+
+    <select id="getClBbList" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        SELECT
+            a.*
+        FROM
+            tb_qw_xfbb a,
+            tb_qw_cl b
+        WHERE
+            a.id = b.ywid
+            AND b.xt_sjzt = '1'
+            AND b.xt_scbz = '0'
+            AND b.gps_id = #{sbid}
+            AND a.bbzt = '0'
+    </select>
+
+
+    <sql id="base_column_list">
+        id, xfpb_id, qwdj_id, qwdj, qwbc_id, jz_id, jz_mc,bblx,qwlx,
+       xfbm,xfbmid, xfbmdm, fzr_sfzh, fzr_xm, fzr_id, fzr_lxdh, xfrq, kssj, jssj,
+       zqsc, jgts, mjsl, pbmj, fjsl, pbfj, jcsl, pbcl, txzbsl, txzb, jyqxsl,
+       jyqx, wzlx, zzlx, xlfs, xfzt, bbkssj, bbjssj, bbzt, dqwz, jd, wd,
+       zbhash, zbsj, xfsc, xflc, xffwlx, xffwid, ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+       sssgaj, sssgajdm, bz, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+       xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+       xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,zylx,dzbq,wqzb
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <insert id="insertEntity">
+        insert into tb_qw_xfbb
+                (id, xfpb_id, qwdj_id, qwdj, qwbc_id, jz_id, jz_mc, bblx, qwlx,
+                 xfbm, xfbmid, xfbmdm, fzr_sfzh, fzr_xm, fzr_id, fzr_lxdh, xfrq, kssj, jssj,
+                 zqsc, jgts, mjsl, pbmj, fjsl, pbfj, jcsl, pbcl, txzbsl, txzb, jyqxsl,
+                 jyqx, wzlx, zzlx, xlfs, xfzt, bbkssj, bbjssj, bbzt, dqwz, jd, wd, zb,
+                 zbhash, zbsj, xfsc, xflc, xffwlx, xffwid, ssbm, ssbmdm, ssxgaj, ssxgajdm, ssbmid, ssxgajid, sssgajid,
+                 sssgaj, sssgajdm, bz, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+                 xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                 xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, zylx,dzbq,wqzb)
+        values (#{id}, #{xfpbId}, #{qwdjId}, #{qwdj}, #{qwbcId}, #{jzId}, #{jzMc}, #{bblx}, #{qwlx},
+                #{xfbm}, #{xfbmid}, #{xfbmdm}, #{fzrSfzh}, #{fzrXm}, #{fzrId}, #{fzrLxdh}, #{xfrq}, #{kssj}, #{jssj},
+                #{zqsc}, #{jgts}, #{mjsl}, #{pbmj}, #{fjsl}, #{pbfj}, #{jcsl}, #{pbcl}, #{txzbsl}, #{txzb}, #{jyqxsl},
+                #{jyqx}, #{wzlx}, #{zzlx}, #{xlfs}, #{xfzt}, #{bbkssj}, #{bbjssj}, #{bbzt}, #{dqwz}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{zbsj}, #{xfsc}, #{xflc}, #{xffwlx}, #{xffwid}, #{ssbm}, #{ssbmdm}, #{ssxgaj},
+                #{ssxgajdm}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                #{sssgaj}, #{sssgajdm}, #{bz}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip},
+                #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+                #{xtZhgxrid},
+                #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{zylx}, #{dzbq}, #{wqzb})
+    </insert>
+
+    <select id="getSumXfsc" resultType="java.util.Map">
+        select sum(xfsc) xfsc,ssxgaj,ssxgajid from tb_qw_xfbb where xfrq &lt;= #{jssj} and xfrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="getSumXflc" resultType="java.util.Map">
+        select sum(xflc) xflc,ssxgaj,ssxgajid from tb_qw_xfbb where xfrq &lt;= #{jssj} and xfrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="getBbAll" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        select * from tb_qw_xfbb where
+         xt_sjzt = '1' and xt_scbz = '0' and bbzt = '0'
+    </select>
+
+    <!--修改巡逻状态-->
+    <update id="updateByXlzt">
+        update tb_qw_xfbb set xfzt = #{xlzt} where id = #{id}
+    </update>
+
+    <!--修改巡逻时长-->
+    <update id="updateXfscById">
+           update tb_qw_xfbb set xfsc = #{xfsc} where id = #{id}
+    </update>
+
+
+
+    <select id="bmtj" resultType="java.util.Map">
+       SELECT ssbm,ssbmdm,
+        sum(xfsc) xfsc,
+        SUM(xflc) xflc,
+        COUNT(1) xfxz,
+        SUM( IFNULL( jcsl, 0 ) ) jcsl,
+        SUM( IFNULL( mjsl, 0 ) ) mjsl,
+        SUM( IFNULL( fjsl, 0 ) ) fjsl
+        FROM `tb_qw_xfbb`
+        where    xt_sjzt = '1' and xt_scbz = '0'
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and ssbmdm like concat(#{params.ssbmdm},'%')
+        </if>
+
+        <if test="params.kssj != null and params.kssj != ''">
+            and bbkssj >= #{params.kssj}
+        </if>
+        <if test="params.jssj != null and params.jssj != ''">
+            and bbkssj &lt;= #{params.jssj}
+        </if>
+       GROUP  BY ssbm,ssbmdm ORDER BY ssbmdm
+    </select>
+
+
+    <select id="bmtjAll" resultType="java.util.Map">
+        SELECT
+        sum(xfsc) xfsc,
+        SUM(xflc) xflc,
+        COUNT(1) xfxz,
+        SUM( IFNULL( jcsl, 0 ) ) jcsl,
+        SUM( IFNULL( mjsl, 0 ) ) mjsl,
+        SUM( IFNULL( fjsl, 0 ) ) fjsl
+        FROM `tb_qw_xfbb`
+        where    xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+
+        <if test="kssj != null and kssj != ''">
+            and bbkssj >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and bbkssj &lt;= #{jssj}
+        </if>
+    </select>
+
+
+    <select id="xqtj" resultType="java.util.Map">
+        SELECT
+        glbid,
+        fw_mc,
+        COUNT( b.id ) xfxz,
+        SUM( IFNULL( b.jcsl, 0 ) ) jcsl,
+        SUM( IFNULL( b.mjsl, 0 ) ) mjsl,
+        SUM( IFNULL( b.xflc, 0 ) ) xflc,
+        SUM( IFNULL( b.xfsc, 0 ) ) xfsc,
+        SUM( IFNULL( b.fjsl, 0 ) ) fjsl
+        FROM
+        `tb_qw_xffw` f
+        LEFT JOIN tb_qw_xfbb b ON b.id = f.ywid
+        WHERE
+        f.qwlx = '2'
+        AND f.xt_scbz = '0'
+        AND b.xt_scbz = '0'
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and b.ssbmdm like concat(#{params.ssbmdm},'%')
+        </if>
+        <if test="params.kssj != null and params.kssj != ''">
+            and b.bbkssj >= #{params.kssj}
+        </if>
+        <if test="params.jssj != null and params.jssj != ''">
+            and b.bbkssj &lt;= #{params.jssj}
+        </if>
+        GROUP BY
+        glbid,
+        fw_mc
+    </select>
+
+
+    <select id="grtj" resultType="java.util.Map">
+    SELECT
+        fzr_sfzh,
+        fzr_xm,
+        SUM( xfsc ) xfsc,
+        SUM( xflc ) xflc,
+        SUM( IFNULL( jcsl, 0 ) ) jcsl,
+        SUM( IFNULL( mjsl, 0 ) ) mjsl,
+        SUM( IFNULL( fjsl, 0 ) ) fjsl
+    FROM
+        `tb_qw_xfbb`
+
+        where    xt_sjzt = '1' and xt_scbz = '0'
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and ssbmdm like concat(#{params.ssbmdm},'%')
+        </if>
+
+        <if test="params.kssj != null and params.kssj != ''">
+            and bbkssj >= #{params.kssj}
+        </if>
+        <if test="params.jssj != null and params.jssj != ''">
+            and bbkssj &lt;= #{params.jssj}
+        </if>
+
+    GROUP BY
+        fzr_sfzh,
+        fzr_xm
+    </select>
+
+
+
+    <select id="getBbidByXq" resultType="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        select  id, xfpb_id, qwdj_id, qwdj, qwbc_id, jz_id, jz_mc,bblx,qwlx,
+        xfbm,xfbmid, xfbmdm, fzr_sfzh, fzr_xm, fzr_id, fzr_lxdh, xfrq, kssj, jssj,
+        zqsc, jgts, mjsl, pbmj, fjsl, pbfj, jcsl, pbcl, txzbsl, txzb, jyqxsl,
+        jyqx, wzlx, zzlx, xlfs, xfzt, bbkssj, bbjssj, bbzt, dqwz, jd, wd,
+        zbsj, xfsc, xflc, xffwlx, xffwid, ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+        sssgaj, sssgajdm, bz, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+        xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,zylx,dzbq,wqzb from tb_qw_xfbb where  xt_sjzt = '1' and xt_scbz = '0' and bbzt = '0'
+        <if test="xqid != null and xqid != ''">
+            and xffwid like concat('%',#{xqid},'%')
+        </if>
+    </select>
+
+    <select id="getScLc" resultType="java.util.Map">
+         SELECT
+        IFNULL( SUM( xflc ), 0 )/1000 xflc,
+        IFNULL( SUM( xfsc ), 0 )/3600 xfsc
+        FROM `tb_qw_xfbb`
+        WHERE  xt_sjzt = '1' and xt_scbz = '0' and bblx = '01'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        <if test="time != null and time != ''">
+            and xfrq = #{time}
+        </if>
+    </select>
+
+    <select id="getBbgj" resultType="com.mosty.base.model.entity.wzzx.TbWzLswz">
+        SELECT id,jd,wd,dwsj FROM mosty_wzzx.tb_wz_lswz
+        where ywid = #{bbid}
+        ORDER BY dwsj ASC
+    </select>
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXffwMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXffwMapper.xml
new file mode 100644
index 0000000..c1c58af
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXffwMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXffwMapper">
+
+    <delete id="deleteByYwid">
+        delete from tb_qw_xffw where ywid = #{id}
+    </delete>
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMapper.xml
new file mode 100644
index 0000000..4f46d58
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMapper.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXfpbMapper">
+
+    <!--根据条件按查询总数-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_qw_xfpb a where a.xt_scbz = '0' and a.xt_scbz = '0'
+        and a.id in (
+        select pb_id from tb_qw_xfpb_zq b where b.xt_scbz = '0' and b.xt_scbz = '0'
+        and (
+        b.fzr_id = #{ryid} or b.id in (
+        select ywid from tb_qw_jl c where c.xt_scbz = '0' and c.xt_scbz = '0' and jl_id = #{ryid}
+        )
+        )
+        )
+        <if test="dto.jsrqlx != null and dto.jsrqlx != ''">
+            and a.jsrqlx = #{dto.jsrqlx}
+        </if>
+        <if test="dto.xhlx != null and dto.xhlx != ''">
+            and a.xhlx = #{dto.xhlx}
+        </if>
+        <if test="dto.xhzq != null">
+            and a.xhzq = #{dto.xhzq}
+        </if>
+        <if test="dto.mrbc != null">
+            and a.mrbc = #{dto.mrbc}
+        </if>
+        <if test="dto.pbksrq != null and dto.pbjsrq != null">
+            and (
+            a.pbksrq between #{dto.pbksrq} and #{dto.pbjsrq} or
+            a.pbjsrq between #{dto.pbksrq} and #{dto.pbjsrq}
+            )
+        </if>
+    </select>
+
+    <!--根据条件按查询总数-->
+    <select id="getList" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpb" parameterType="Map">
+        select a.* from tb_qw_xfpb a where a.xt_scbz = '0' and a.xt_scbz = '0'
+        and a.id in (
+        select pb_id from tb_qw_xfpb_zq b where b.xt_scbz = '0' and b.xt_scbz = '0'
+        and (
+        b.fzr_id = #{ryid} or b.id in (
+        select ywid from tb_qw_jl c where c.xt_scbz = '0' and c.xt_scbz = '0' and jl_id = #{ryid}
+        )
+        )
+        )
+        <if test="dto.jsrqlx != null and dto.jsrqlx != ''">
+            and a.jsrqlx = #{dto.jsrqlx}
+        </if>
+        <if test="dto.xhlx != null and dto.xhlx != ''">
+            and a.xhlx = #{dto.xhlx}
+        </if>
+        <if test="dto.xhzq != null">
+            and a.xhzq = #{dto.xhzq}
+        </if>
+        <if test="dto.mrbc != null">
+            and a.mrbc = #{dto.mrbc}
+        </if>
+        <if test="dto.pbksrq != null and dto.pbjsrq != null">
+            and (
+            a.pbksrq between #{dto.pbksrq} and #{dto.pbjsrq} or
+            a.pbjsrq between #{dto.pbksrq} and #{dto.pbjsrq}
+            )
+        </if>
+        order by a.pbksrq desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="checkThisTimeXfpb" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpbMrjl">
+        <![CDATA[
+            select * from tb_qw_xfpb_mrjl a where
+            xfkssj BETWEEN DATE_FORMAT(date_add(now(),interval - 2 hour), '%Y-%m-%d %H:%i:%s')
+            and DATE_FORMAT(date_add(now(),interval + 2 hour), '%Y-%m-%d %H:%i:%s')
+        ]]>
+    </select>
+
+    <select id="getPbBySjAndJl" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpb">
+        select * from tb_qw_xfpb a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        <if test="id != null and id !=''">
+            and a.id != #{id}
+        </if>
+        <![CDATA[
+        and a.id in (
+            select b.pb_id from tb_qw_xfpb_zq b where b.xt_sjzt = '1' and b.xt_scbz = '0'
+            and (
+                b.fzr_id = #{jlId} or
+                b.id in (
+                    select c.ywid from tb_qw_jl c where c.jl_id = #{jlId}
+                )
+            )
+            and (
+                case when b.kssj >= b.jssj then
+                #{kssj} between concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) and concat('1970-01-02 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) or
+                #{jssj} between concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) and concat('1970-01-02 ',DATE_FORMAT(b.kssj,'%H:%i:%s'))
+                when b.kssj < b.jssj then
+                #{kssj} between concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) and concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) or
+                #{jssj} between concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s')) and concat('1970-01-01 ',DATE_FORMAT(b.kssj,'%H:%i:%s'))
+                end
+            )
+        )
+        and (
+            #{pbksrq} between DATE_FORMAT(a.pbksrq,'%Y-%m-%d') and DATE_FORMAT(a.pbjsrq,'%Y-%m-%d') or
+            #{pbjsrq} between DATE_FORMAT(a.pbksrq,'%Y-%m-%d') and DATE_FORMAT(a.pbjsrq,'%Y-%m-%d')
+        )
+        ]]>
+    </select>
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMrjlMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMrjlMapper.xml
new file mode 100644
index 0000000..a7d6c21
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbMrjlMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXfpbMrjlMapper">
+    <update id="deleteByYwid">
+
+                delete
+                from tb_qw_xfpb_mrjl
+                where pb_id = #{pbId}
+                  and pbzq_id = #{pbzqId}
+
+    </update>
+
+    <select id="getMrjlByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpbMrjl">
+        <![CDATA[
+            select * from tb_qw_xfpb_mrjl a where (
+                (
+                        DATE_FORMAT(a.xfjssj,'%Y-%m-%d %H:%i:%s') > #{xfkssj}
+                    and DATE_FORMAT(a.xfjssj,'%Y-%m-%d %H:%i:%s') < #{xfjssj}
+                ) or (
+                        DATE_FORMAT(a.xfjssj,'%Y-%m-%d %H:%i:%s') > #{xfkssj}
+                    and DATE_FORMAT(a.xfjssj,'%Y-%m-%d %H:%i:%s') < #{xfjssj}
+                )
+            )
+        ]]>
+        <if test="pbid != null and pbid != ''">
+            and a.pb_id != #{pbid}
+        </if>
+    </select>
+</mapper>
+
+
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfpbZqMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbZqMapper.xml
new file mode 100644
index 0000000..3419385
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfpbZqMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwXfpbZqMapper">
+    <!--删除值班排班信息-->
+    <delete id="deleteByPbId" parameterType="String">
+
+                delete
+                from tb_qw_xfpb_zq
+                where pb_id = #{pbId}
+
+    </delete>
+
+    <!--APP获取我的排班信息-->
+    <select id="getMyXfpbToday" resultType="com.mosty.base.model.vo.qwzx.TbQwXfpbZqMyVo" parameterType="String">
+        <![CDATA[
+        select b.*,a.id as mrjlid
+        from tb_qw_xfpb_zq b,tb_qw_xfpb_mrjl a
+        where a.pbzq_id = b.id
+          and b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and (b.fzr_id = #{userId} or b.id in
+                                   (select ywid
+                                    from tb_qw_jl c
+                                    where c.ywid = b.id
+                                      and c.jl_id = #{userId}
+                                      and c.xt_scbz = '0'
+                                      and c.xt_sjzt = '1'
+                                           )
+                )
+          and a.xfkssj BETWEEN DATE_FORMAT(date_add(now(),interval - 2 hour), '%Y-%m-%d %H:%i:%s')
+                and DATE_FORMAT(date_add(now(),interval + 2 hour), '%Y-%m-%d %H:%i:%s')
+        order by a.xfkssj
+                limit 1
+        ]]>
+    </select>
+
+    <select id="getMyXfpbByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpbZq">
+
+                select b.* from tb_qw_xfpb_zq b,tb_qw_xfpb_mrjl a
+                where a.pbzq_id = b.id
+                and b.xt_scbz = '0'
+                and b.xt_sjzt = '1'
+                and (b.fzr_id = #{userId} or b.id in
+                 (select ywid
+                    from tb_qw_jl c
+                    where c.ywid = b.id
+                        and c.jl_id = #{userId}
+                        and c.xt_scbz = '0'
+                        and c.xt_sjzt = '1'
+                        )
+                    )
+                and	DATE_FORMAT(#{kssj}, '%Y-%m-%d') = DATE_FORMAT(a.xfrq, '%Y-%m-%d')
+
+    </select>
+
+    <select id="getDeptByMonth" resultType="com.mosty.base.model.entity.qwzx.TbQwXfpbZq">
+        select b.*
+        from tb_qw_xfpb_zq b,
+             tb_qw_xfpb_mrjl a
+        where a.pbzq_id = b.id
+          and b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and b.ssbmdm = #{ssbmdm}
+          and DATE_FORMAT(#{kssj}, '%Y-%m-%d') = DATE_FORMAT(a.xfrq, '%Y-%m-%d')
+    </select>
+</mapper>
+
+
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwZbbbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwZbbbMapper.xml
new file mode 100644
index 0000000..bee9f7b
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwZbbbMapper.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwZbbbMapper">
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.vo.qwzx.TbQwZbbbVo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <id column="qwbcid" property="qwbcid" jdbcType="VARCHAR"/>
+        <result column="zbrq" property="zbrq"/>
+        <result column="kssj" property="kssj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="zbsc" property="zbsc"/>
+        <result column="zbldXm" property="zbld_xm"/>
+        <result column="zbldDh" property="zbld_dh"/>
+        <result column="zbld_id" property="zbldId"/>
+        <result column="zbzhz_xm" property="zbzhzXm"/>
+        <result column="zbzhz_id" property="zbzhzId"/>
+        <result column="zzzhz_xm" property="zzzhzXm"/>
+        <result column="zzzhz_id" property="zzzhzId"/>
+        <result column="fzzb_xm" property="fzzbXm"/>
+        <result column="fzzb_id" property="fzzbId"/>
+        <result column="zbmj" property="zbmj"/>
+        <result column="mjsl" property="mjsl"/>
+        <result column="txzbsl" property="txzbsl"/>
+        <result column="hh" property="hh"/>
+        <result column="zbzt" property="zbzt"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="bz" property="bz"/>
+        <result column="zbmjxm" property="zbmjxm"/>
+        <collection property="jlList" javaType="ArrayList"
+                    ofType="com.mosty.base.model.dto.qwzx.TbQwJlDto" select="selectJlList"
+                    column="{ywid = id,zbmjxm = zbmjxm}"/>
+    </resultMap>
+
+    <resultMap id="resultMap" type="com.mosty.base.model.vo.qwzx.TbQwZbbbVo">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <id column="qwbcid" property="qwbcid" jdbcType="VARCHAR"/>
+        <result column="zbrq" property="zbrq"/>
+        <result column="kssj" property="kssj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="zbsc" property="zbsc"/>
+        <result column="zbldXm" property="zbld_xm"/>
+        <result column="zbldDh" property="zbld_dh"/>
+        <result column="zbld_id" property="zbldId"/>
+        <result column="zbzhz_xm" property="zbzhzXm"/>
+        <result column="zbzhz_id" property="zbzhzId"/>
+        <result column="zzzhz_xm" property="zzzhzXm"/>
+        <result column="zzzhz_id" property="zzzhzId"/>
+        <result column="fzzb_xm" property="fzzbXm"/>
+        <result column="fzzb_id" property="fzzbId"/>
+        <result column="zbmj" property="zbmj"/>
+        <result column="mjsl" property="mjsl"/>
+        <result column="txzbsl" property="txzbsl"/>
+        <result column="hh" property="hh"/>
+        <result column="zbzt" property="zbzt"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="bz" property="bz"/>
+    </resultMap>
+
+    <resultMap type="com.mosty.base.model.dto.qwzx.TbQwJlDto" id="TbQwJlDto">
+        <id column="id" property="id"/>
+        <result column="ywid" property="ywid"/>
+        <result column="jl_id" property="jlId"/>
+        <result column="jllx" property="jllx"/>
+        <result column="jlxm" property="jlxm"/>
+        <result column="jh" property="jh"/>
+        <result column="xbdm" property="xbdm"/>
+        <result column="nl" property="nl"/>
+        <result column="jlzt" property="jlzt"/>
+        <result column="zblx" property="zblx"/>
+    </resultMap>
+
+    <select id="selectJlList" resultMap="TbQwJlDto">
+
+                select b.id,
+                       b.ywid,
+                       b.jl_id,
+                       b.jllx,
+                       b.jlxm,
+                       b.xbdm,
+                       b.nl,
+                       b.jlzt,
+                       b.zblx
+                from tb_qw_jl b
+                where b.xt_sjzt = '1'
+                  and b.xt_scbz = '0'
+                  and b.ywid = #{ywid}
+                  and b.jllx = '01'
+
+    </select>
+
+    <!--查询-->
+    <select id="queryList" resultMap="BaseResultMap">
+        select a.id,a.zbrq,a.ksrq,a.jsrq,a.zbsc,a.zbld_xm,a.zbld_dh,a.zbmj,a.mjsl,a.txzbsl,a.hh,a.zbzt,
+        a.ssbm,a.ssbmdm,a.bz,#{params.zbmjxm} as zbmjxm
+        from tb_qw_zbbb a
+        where a.xt_scbz = '0'
+        <if test="params.zbmjxm != null and params.zbmjxm != ''">
+            and a.zbmj like concat('%',#{params.zbmjxm},'%')
+        </if>
+        <if test="params.kssj != null and params.jssj == null">
+            and a.zbrq &gt;= #{params.kssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj == null and params.jssj != null">
+            and a.zbrq &lt;= #{params.jssj,jdbcType=DATE}
+        </if>
+        <if test="params.kssj != null and params.jssj != null">
+            and a.zbrq between #{params.kssj,jdbcType=DATE} and #{params.jssj,jdbcType=DATE}
+        </if>
+        <if test="params.zbld != null and params.zbld != ''">
+            and a.zbld like concat('%',#{params.zbld},'%')
+        </if>
+        <if test="params.zbzt != null and params.zbzt != ''">
+            and a.zbld = #{params.zbld,jdbcType=VARCHAR}
+        </if>
+        <if test="params.xtSjly != null and params.xtSjly != ''">
+            and a.xt_sjly = #{params.xtSjly,jdbcType=VARCHAR}
+        </if>
+        <if test="params.xtSjzt != null and params.xtSjzt != ''">
+            and a.xt_sjzt = #{params.xtSjzt,jdbcType=VARCHAR}
+        </if>
+        <if test="params.ssbmdm != null and params.ssbmdm != ''">
+            and a.ssbmdm like  concat(#{params.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="params.ssxgajdm != null and params.ssxgajdm != ''">-->
+<!--            and a.ssxgajdm = #{params.ssxgajdm,jdbcType=VARCHAR}-->
+<!--        </if>-->
+<!--        <if test="params.sssgajdm != null and params.sssgajdm != ''">-->
+<!--            and a.sssgajdm = #{params.sssgajdm,jdbcType=VARCHAR}-->
+<!--        </if>-->
+        <!-- 数据范围过滤 -->
+<!--        ${createSql}-->
+    </select>
+
+    <!--id查询-->
+    <select id="queryById" resultMap="BaseResultMap">
+
+                select a.*, b.*, '' as zbmjxm
+                from tb_qw_zbbb a
+                         inner join tb_qw_jl b on a.id = b.ywid
+                where a.xt_scbz = '0'
+                  and a.id = #{id,jdbcType=VARCHAR}
+
+    </select>
+
+    <!--删除值班-->
+    <update id="deleteZb">
+        update tb_qw_zbbb set xt_scbz = '1' where id in
+        <foreach collection="id" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--APP获取-->
+    <select id="getMyBbInfoToday" resultType="com.mosty.base.model.entity.qwzx.TbQwZbbb">
+
+                select *
+                from tb_qw_zbbb a
+                where a.xt_scbz = '0'
+                  and a.xt_sjzt = '1'
+                  and DATEDIFF(a.zbrq, NOW()) = 0
+                  and a.bbzt = '0'
+                  and a.bbjssj is null
+                  and (
+                     a.zbld_id = #{userId}
+                     or a.zbzhz_id = #{userId}
+                     or a.zzzhz_id = #{userId}
+                     or a.fzzb_id = #{userId}
+                     or a.id in (select ywid
+                     from tb_qw_jl b
+                     where b.xt_scbz = '0'
+                     and b.xt_sjzt = '1'
+                     and b.ywid = a.id
+                     and b.jl_id = #{userId}
+                     )
+                  )
+                  limit 1
+
+    </select>
+
+    <select id="getMybbTodayByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwZbbb">
+        select *
+        from tb_qw_zbbb a
+        where a.xt_scbz = '0'
+          and a.xt_sjzt = '1'
+        <if test="time != null and time != ''">
+            and date_format(a.zbrq,'%Y-%m-%d') = #{time}
+        </if>
+          and a.bbzt = '0'
+          and a.bbjssj is null
+          and (
+                a.zbld_id = #{userId}
+                        or a.zbzhz_id = #{userId}
+                        or a.zzzhz_id = #{userId}
+                        or a.fzzb_id = #{userId}
+                        or a.id in (select ywid
+                                    from tb_qw_jl b
+                                    where b.xt_scbz = '0'
+                                      and b.xt_sjzt = '1'
+                                      and b.ywid = a.id)
+                )
+    </select>
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMapper.xml
new file mode 100644
index 0000000..0a89b84
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwZbpbMapper">
+
+    <!--根据条件按查询总数-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_qw_zbpb a where a.xt_scbz = '0' and a.xt_scbz = '0'
+        and a.id in (
+        select pb_id from tb_qw_zbpb_zq b where b.xt_scbz = '0' and b.xt_scbz = '0'
+        and (
+        b.zbld_id = #{ryid} or b.zbzhz_id = #{ryid} or b.zzzhz_id = #{ryid} or b.fzzb_id = #{ryid}
+        or b.id in (
+        select ywid from tb_qw_jl c where c.xt_scbz = '0' and c.xt_scbz = '0' and jl_id = #{ryid}
+        )
+        )
+        )
+        <if test="dto.jsrqlx != null and dto.jsrqlx != ''">
+            and a.jsrqlx = #{dto.jsrqlx}
+        </if>
+        <if test="dto.xhlx != null and dto.xhlx != ''">
+            and a.xhlx = #{dto.xhlx}
+        </if>
+        <if test="dto.xhzq != null">
+            and a.xhzq = #{dto.xhzq}
+        </if>
+        <if test="dto.zbpbksrq != null and dto.zbpbjsrq != null">
+            and (
+            a.zbpbksrq between #{dto.zbpbksrq} and #{dto.zbpbjsrq} or
+            a.zbpbjsrq between #{dto.zbpbksrq} and #{dto.zbpbjsrq}
+            )
+        </if>
+    </select>
+
+    <!--根据条件按查询总数-->
+    <select id="getList" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpb" parameterType="Map">
+        select a.* from tb_qw_zbpb a where a.xt_scbz = '0' and a.xt_scbz = '0'
+        and a.id in (
+        select pb_id from tb_qw_zbpb_zq b where b.xt_scbz = '0' and b.xt_scbz = '0'
+        and (
+        b.zbld_id = #{ryid} or b.zbzhz_id = #{ryid} or b.zzzhz_id = #{ryid} or b.fzzb_id = #{ryid}
+        or b.id in (
+        select ywid from tb_qw_jl c where c.xt_scbz = '0' and c.xt_scbz = '0' and jl_id = #{ryid}
+        )
+        )
+        )
+        <if test="dto.jsrqlx != null and dto.jsrqlx != ''">
+            and a.jsrqlx = #{dto.jsrqlx}
+        </if>
+        <if test="dto.xhlx != null and dto.xhlx != ''">
+            and a.xhlx = #{dto.xhlx}
+        </if>
+        <if test="dto.xhzq != null">
+            and a.xhzq = #{dto.xhzq}
+        </if>
+        <if test="dto.zbpbksrq != null and dto.zbpbjsrq != null">
+            and (
+            a.zbpbksrq between #{dto.zbpbksrq} and #{dto.zbpbjsrq} or
+            a.zbpbjsrq between #{dto.zbpbksrq} and #{dto.zbpbjsrq}
+            )
+        </if>
+        order by a.zbpbksrq desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+
+
+    <select id="checkThisTimeZbpb" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpbMrjl">
+        <![CDATA[
+            select * from tb_qw_zbpb_mrjl a where
+            zbkssj BETWEEN DATE_FORMAT(date_add(now(),interval - 2 hour), '%Y-%m-%d %H:%i:%s')
+            and DATE_FORMAT(date_add(now(),interval + 2 hour), '%Y-%m-%d %H:%i:%s')
+        ]]>
+    </select>
+
+    <select id="getZbBySjAndJl" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpb">
+        select * from tb_qw_zbpb a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        <if test="id != null and id !=''">
+            and a.id != #{id}
+        </if>
+        <![CDATA[
+        and a.id in (
+            select b.pb_id from tb_qw_zbpb_zq b where b.xt_sjzt = '1' and b.xt_scbz = '0'
+            and (
+                b.zbld_id = #{jlId} or
+                b.zbzhz_id = #{jlId} or
+                b.zzzhz_id = #{jlId} or
+                b.fzzb_id = #{jlId} or
+                b.id in (
+                    select c.ywid from tb_qw_jl c where c.jl_id = #{jlId}
+                )
+            )
+            and b.id in (
+                select d.pbzq_id from tb_qw_zbpb_mrjl d
+                case when b.kssj >= b.jssj then
+                #{kssj} between DATE_FORMAT(b.kssj,'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(b.jssj,'%Y-%m-%d %H:%i:%s') or
+                #{jssj} between DATE_FORMAT(b.kssj,'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(b.jssj,'%Y-%m-%d %H:%i:%s')
+            )
+        )
+        and (
+            #{zbpbksrq} between DATE_FORMAT(a.zbpbksrq,'%Y-%m-%d') and DATE_FORMAT(a.zbpbjsrq,'%Y-%m-%d') or
+            #{zbpbjsrq} between DATE_FORMAT(a.zbpbksrq,'%Y-%m-%d') and DATE_FORMAT(a.zbpbjsrq,'%Y-%m-%d')
+        )
+        ]]>
+    </select>
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMrjlMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMrjlMapper.xml
new file mode 100644
index 0000000..bbc5419
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbMrjlMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwZbpbMrjlMapper">
+    <update id="deleteByYwid">
+        delete
+        from tb_qw_zbpb_mrjl
+        where pb_id = #{pbId}
+          and pbzq_id = #{pbzqId}
+    </update>
+
+    <select id="getMrjlByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpbMrjl">
+        <![CDATA[
+            select * from tb_qw_zbpb_mrjl a where (
+                (
+                        DATE_FORMAT(a.zbkssj,'%Y-%m-%d %H:%i:%s') > #{zbkssj}
+                    and DATE_FORMAT(a.zbkssj,'%Y-%m-%d %H:%i:%s') < #{zbjssj}
+                ) or (
+                        DATE_FORMAT(a.zbjssj,'%Y-%m-%d %H:%i:%s') > #{zbkssj}
+                    and DATE_FORMAT(a.zbjssj,'%Y-%m-%d %H:%i:%s') < #{zbjssj}
+                )
+            )
+        ]]>
+        <if test="pbid != null and pbid != ''">
+            and a.pb_id != #{pbid}
+        </if>
+    </select>
+</mapper>
+
+
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwZbpbZqMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbZqMapper.xml
new file mode 100644
index 0000000..3636142
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwZbpbZqMapper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwZbpbZqMapper">
+    <!--删除值班排班信息-->
+    <delete id="deleteByPbId" parameterType="String">
+        delete
+        from tb_qw_zbpb_zq
+        where pb_id = #{pbId}
+    </delete>
+
+    <select id="getMyZbpbToday" resultType="com.mosty.base.model.vo.qwzx.TbQwZbpbZqMyVo">
+        <![CDATA[
+        select b.*, a.id as mrjlid
+        from tb_qw_zbpb_zq b,
+             tb_qw_zbpb_mrjl a
+        where a.pbzq_id = b.id
+          and b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and (b.zbld_id = #{userId}
+                or b.zbzhz_id = #{userId}
+                or b.zzzhz_id = #{userId}
+                or b.fzzb_id = #{userId}
+                or b.id in
+                   (select ywid
+                    from tb_qw_jl c
+                    where c.ywid = b.id
+                      and c.jl_id = #{userId}
+                      and c.xt_scbz = '0'
+                      and c.xt_sjzt = '1'
+                           )
+                )
+          and zbkssj BETWEEN DATE_FORMAT(date_add(now(),interval - 2 hour), '%Y-%m-%d %H:%i:%s')
+          and DATE_FORMAT(date_add(now(),interval + 2 hour), '%Y-%m-%d %H:%i:%s')
+          order by zbkssj
+          limit 1
+        ]]>
+    </select>
+
+    <select id="getMyZbpbByTime" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpbZq">
+        select b.*
+        from tb_qw_zbpb_zq b,
+             tb_qw_zbpb_mrjl a
+        where a.pbzq_id = b.id
+          and b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and (b.zbld_id = #{userId} or
+               b.zbzhz_id = #{userId} or
+               b.zzzhz_id = #{userId} or
+               b.fzzb_id = #{userId} or
+               b.id in
+               (select ywid
+                from tb_qw_jl c
+                where c.ywid = b.id
+                  and c.jl_id = #{userId}
+                  and c.xt_scbz = '0'
+                  and c.xt_sjzt = '1'
+                       )
+                )
+          and DATE_FORMAT(#{kssj}, '%Y-%m-%d') = DATE_FORMAT(a.zbrq, '%Y-%m-%d')
+    </select>
+
+    <select id="getDeptByMonth" resultType="com.mosty.base.model.entity.qwzx.TbQwZbpbZq">
+        select b.*
+        from tb_qw_zbpb_zq b,
+             tb_qw_zbpb_mrjl a
+        where a.pbzq_id = b.id
+          and b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and b.ssbmid = #{ssbmid}
+          and DATE_FORMAT(#{kssj}, '%Y-%m-%d') = DATE_FORMAT(a.zbrq, '%Y-%m-%d')
+    </select>
+</mapper>
+
+
diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwZnzbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwZnzbMapper.xml
new file mode 100644
index 0000000..cfe2a84
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/mapper/TbQwZnzbMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.qwzx.mapper.TbQwZnzbMapper">
+
+    <!--根据ID删除智能装备明细-->
+    <update id="deleteZnzb">
+        update tb_qw_znzb set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByYwid">
+        delete from tb_qw_znzb where ywid = #{ywid}
+    </update>
+
+    <select id="queryListByYwid" resultType="com.mosty.base.model.entity.qwzx.TbQwZnzb">
+        select a.* from tb_qw_znzb a
+        where a.xt_scbz = '0'
+        and a.ywid in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+
+    </select>
+
+
+</mapper>
diff --git a/mosty-qwzx/src/main/resources/rebel.xml b/mosty-qwzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..ae6e11a
--- /dev/null
+++ b/mosty-qwzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-qwzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-qwzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-rwzx/mosty-rwzx.iml b/mosty-rwzx/mosty-rwzx.iml
new file mode 100644
index 0000000..b3c354f
--- /dev/null
+++ b/mosty-rwzx/mosty-rwzx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353925" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-rwzx/pom.xml b/mosty-rwzx/pom.xml
new file mode 100644
index 0000000..4fea283
--- /dev/null
+++ b/mosty-rwzx/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-rwzx</artifactId>
+    <description>任务中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/MostyRwzxApplication.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/MostyRwzxApplication.java
new file mode 100644
index 0000000..228ca9a
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/MostyRwzxApplication.java
@@ -0,0 +1,31 @@
+package com.mosty.rwzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	任务中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.rwzx.mapper")
+@EnableDiscoveryClient
+@EnableScheduling
+@SpringBootApplication
+public class MostyRwzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyRwzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/config/FeignConfig.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/FeignConfig.java
new file mode 100644
index 0000000..b61399b
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.rwzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/config/GlobalYmlConfig.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..0150e7d
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.rwzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/config/WebMvcConfig.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..f7c2243
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.rwzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskController.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskController.java
new file mode 100644
index 0000000..d8d6797
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskController.java
@@ -0,0 +1,42 @@
+package com.mosty.rwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rwzx.*;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.query.rwzx.TbRwTaskLogQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskMyQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskUserQuery;
+import com.mosty.base.model.vo.rwzx.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.rwzx.service.TbRwTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ **/
+@Api(tags = "任务中心相关接口-外部调用接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbRwTask")
+public class TbRwTaskController {
+
+    private final TbRwTaskService tbRwTaskService;
+
+    @ApiOperation("添加任务信息")
+    @PostMapping("addRw")
+    public ResponseResult<Integer> addRw(@RequestBody TbRwTaskDto dto) {
+        return ResponseResult.success(this.tbRwTaskService.addRw(dto));
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskInnerController.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskInnerController.java
new file mode 100644
index 0000000..4a9900b
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/controller/TbRwTaskInnerController.java
@@ -0,0 +1,201 @@
+package com.mosty.rwzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rwzx.*;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.*;
+import com.mosty.base.model.vo.rwzx.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.rwzx.service.TbRwTaskInnerService;
+import com.mosty.rwzx.service.TbRwTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/9/19
+ **/
+@Api(tags = "任务中心相关接口--内部接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbRwTask/inner")
+public class TbRwTaskInnerController {
+
+    private final TbRwTaskInnerService tbRwTaskInnerService;
+    private final TbRwTaskService tbRwTaskService;
+
+    @ApiOperation("添加任务信息")
+    @JwtSysUser
+    @PostMapping("addRw")
+    @Log(title = "添加任务信息", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addRw(@RequestBody TbRwTaskInnerDto dto) {
+        return ResponseResult.success(this.tbRwTaskInnerService.addRw(dto));
+    }
+
+    @ApiOperation("查询任务列表")
+    @JwtSysUser
+    @GetMapping("selectPage")
+    public ResponseResult<IPage<TbRwTaskVo>> selectPage(TbRwTaskInnerQuery dto) {
+        return ResponseResult.success(this.tbRwTaskInnerService.selectPage(dto));
+    }
+
+    @ApiOperation("APP统计我的任务数量")
+    @JwtSysUser
+    @GetMapping("myRwCount")
+    public ResponseResult<List<Map<String, Object>>> myRwCount() {
+        return ResponseResult.success(this.tbRwTaskInnerService.myRwCount());
+    }
+
+    @ApiOperation("APP统计任务列表的数量")
+    @JwtSysUser
+    @GetMapping("rwCountByState")
+    public ResponseResult<List<Map<String, Object>>> rwCountByState(TbRwTaskInnerQuery dto) {
+        return ResponseResult.success(this.tbRwTaskInnerService.rwCountByState(dto));
+    }
+
+    @ApiOperation("查询我的任务列表")
+    @JwtSysUser
+    @GetMapping("selectMyPage")
+    public ResponseResult<IPage<TbRwTaskUser>> selectMyPage(TbRwTaskMyInnerQuery dto) {
+        return ResponseResult.success(this.tbRwTaskInnerService.selectMyPage(dto));
+    }
+
+    @ApiOperation("通过任务Id查询任务详情信息")
+    @JwtSysUser
+    @GetMapping("getTaskInfo/{id}")
+    public ResponseResult<TbRwTaskVo> getTaskInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRwTaskService.getTaskInfo(id));
+    }
+
+    @ApiOperation("查询任务是否是登录人的任务")
+    @JwtSysUser
+    @GetMapping("checkMyTask/{id}")
+    public ResponseResult<Boolean> checkMyTask(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRwTaskService.checkMyTask(id));
+    }
+
+    @ApiOperation("查询任务接收人列表")
+    @JwtSysUser
+    @GetMapping("getTaskUserList")
+    public ResponseResult<IPage<TbRwTaskUserVo>> getTaskUserList(TbRwTaskUserQuery dto) {
+        return ResponseResult.success(this.tbRwTaskService.getTaskUserList(dto));
+    }
+
+    @ApiOperation("查询任务日志列表")
+    @JwtSysUser
+    @GetMapping("getTaskLogList")
+    public ResponseResult<IPage<TbRwTaskLogVo>> getTaskLogList(TbRwTaskLogQuery dto) {
+        return ResponseResult.success(this.tbRwTaskService.getTaskLogList(dto));
+    }
+
+    @ApiOperation("修改个人任务状态")
+    @JwtSysUser
+    @PostMapping("changeGrrwState")
+    @Log(title = "修改个人任务状态", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> changeGrrwState(@RequestBody TbRwTaskGrChangeStateInnerDto dto) {
+        this.tbRwTaskInnerService.changeGrrwState(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据任务ID修改任务状态")
+    @JwtSysUser
+    @PostMapping("changeRwState")
+    @Log(title = "修改任务状态", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> changeRwState(@RequestBody TbRwTaskChangeStateInnerDto dto) {
+        this.tbRwTaskInnerService.changeRwState(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据业务ID和业务类型修改任务状态")
+    @JwtSysUser
+    @PostMapping("changeStateByYwid")
+    @Log(title = "根据业务ID和业务类型修改任务状态", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> changeStateByYwid(@RequestBody TbRwTaskChangeStateByYwidDto dto) {
+        this.tbRwTaskInnerService.changeStateByYwid(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("任务中心首页数量统计接口")
+    @JwtSysUser
+    @GetMapping("getDataStatistics")
+    public ResponseResult<TbRwTaskStatisticsVo> getDataStatistics(TbRwTaskStatisticsDto dto) {
+        return ResponseResult.success(this.tbRwTaskService.getDataStatistics(dto));
+    }
+
+    @ApiOperation("任务中心首页任务类型数量统计接口")
+    @JwtSysUser
+    @GetMapping("getRWLXDataStatistics")
+    @Log(title = "任务中心首页任务类型数量统计接口", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbRwTaskLXStatisticsVo>> getRWLXDataStatistics(TbRwTaskStatisticsDto dto) {
+        return ResponseResult.success(this.tbRwTaskService.getRWLXDataStatistics(dto));
+    }
+
+    @ApiOperation("任务中心首页人员任务完成情况排名接口")
+    @JwtSysUser
+    @GetMapping("getTaskRanking")
+    public ResponseResult<List<TbRwTaskRankingVo>> getTaskRanking(TbRwTaskStatisticsDto dto) {
+        return ResponseResult.success(this.tbRwTaskService.getTaskRanking(dto));
+    }
+
+    @ApiOperation("任务中心首页部门任务完成情况排名接口")
+    @JwtSysUser
+    @GetMapping("getTaskByDept")
+    public ResponseResult<List<TbRwTaskRankingVo>> getTaskByDept() {
+        return ResponseResult.success(this.tbRwTaskService.getTaskByDept());
+    }
+
+    @ApiOperation("根据任务类型和业务Id查询任务是否存在")
+    @JwtSysUser
+    @PostMapping("getRwByYwid")
+    public ResponseResult<TbRwTask> getRwByYwid(@RequestBody TbRwTaskByYwidQuery dto) {
+        return ResponseResult.success(this.tbRwTaskService.getRwByYwid(dto));
+    }
+
+    @ApiOperation("检查任务是否过期")
+    @JwtSysUser
+    @PostMapping("changeState")
+    public ResponseResult<Void> changeState() {
+        this.tbRwTaskService.changeState();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改指令任务状态为未完成")
+    @JwtSysUser
+    @PostMapping("changeTaskStateByZlid")
+    public ResponseResult<Void> changeTaskStateByZlid(@RequestBody TbZlxx zl) {
+        this.tbRwTaskService.changeTaskStateByZlid(zl);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询登录用户的已处理的任务数量")
+    @JwtSysUser
+    @GetMapping("getYclTask")
+    public ResponseResult<Integer> getYclTask() {
+        return ResponseResult.success(this.tbRwTaskService.getYclTask());
+    }
+
+    @ApiOperation("查询登录用户的已处理的任务列表")
+    @JwtSysUser
+    @PostMapping("getYclTaskList")
+    public ResponseResult<IPage<TbRwTaskUserAll>> getYclTaskList(@RequestBody TbRwTaskMyInnerQuery dto) {
+        return ResponseResult.success(this.tbRwTaskService.getYclTaskList(dto));
+    }
+
+    @ApiOperation("查询是否有新的任务")
+    @JwtSysUser
+    @GetMapping("checkHasNewTask")
+    public ResponseResult<Boolean> checkHasNewTask(String sfzh) {
+        return ResponseResult.success(this.tbRwTaskService.checkHasNewTask(sfzh));
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskLogMapper.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskLogMapper.java
new file mode 100644
index 0000000..5e8cfd3
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskLogMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.rwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rwzx.TbRwTaskLog;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbRwTaskLogMapper extends BaseMapper<TbRwTaskLog> {
+
+    @ApiOperation("插入日志")
+    void insertEntity(TbRwTaskLog log);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskMapper.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskMapper.java
new file mode 100644
index 0000000..27b768d
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskMapper.java
@@ -0,0 +1,68 @@
+package com.mosty.rwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.rwzx.TbRwTaskStatisticsDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.rwzx.TbRwTaskLog;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import com.mosty.base.model.query.rwzx.TbRwTaskInnerQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskRankingVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskVo;
+import com.mosty.common.config.entity.SysDictItem;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbRwTaskMapper extends BaseMapper<TbRwTask> {
+
+    @ApiOperation("查询字典")
+    List<SysDictItem> selectDict(@Param("dictName") String dictName);
+
+    @ApiOperation("排名统计")
+    List<TbRwTaskRankingVo> getTaskRanking(TbRwTaskStatisticsDto dto);
+
+    @ApiOperation("获取我的任务列表")
+    List<TbRwTaskUser> getMyRwList(Map<String, Object> map);
+
+    @ApiOperation("获取我的任务数量")
+    int getMyRwCount(Map<String, Object> map);
+
+    @ApiOperation("根据任务状态查询任务数量")
+    Integer getCount(@Param("rwjxzt") String rwjxzt,
+                     @Param("time") Date time,
+                     @Param("sfzh") String sfzh);
+
+    @ApiOperation("任务中心首页部门任务完成情况排名接口")
+    List<Map<String, Object>> getTaskByDept();
+
+    @ApiOperation("根据部门查询任务完成情况")
+    int getCountByDept(String ssbmdm, String type);
+
+    @ApiOperation("查询任务数量")
+    List<Map<String, Object>> myRwCount(@Param("sfzh") String sfzh, @Param("ssbmid") String ssbmid);
+
+    @ApiOperation("APP统计任务列表的数量")
+    List<Map<String, Object>> rwCountByState(Map<String, Object> map);
+
+    @ApiOperation("查询登录用户的已处理的任务数量")
+    Integer getYclTask(@Param("sfzh") String sfzh,
+                       @Param("ssbmid") String ssbmid);
+
+    @ApiOperation("查询我的任务已完成列表")
+    List<TbRwTaskUserAll> getMyRwListYwc(Map<String, Object> map);
+
+    @ApiOperation("查询我的任务已完成数量")
+    int getMyRwCountYwc(Map<String, Object> map);
+
+    @ApiOperation("查询任务数量")
+    int checkHasNewTask(@Param("sfzh") String sfzh,
+                        @Param("ssbmid") String ssbmid,
+                        @Param("time") String time);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserAllMapper.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserAllMapper.java
new file mode 100644
index 0000000..ca7c627
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserAllMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.rwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TbRwTaskUserAllMapper extends BaseMapper<TbRwTaskUserAll> {
+
+    @ApiOperation("查询我的任务")
+    TbRwTaskUserAll selectByRwId(@Param("sfzh") String idEntityCard,
+                              @Param("rwid") String id,
+                              @Param("ssbmid") String ssbmid);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserMapper.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserMapper.java
new file mode 100644
index 0000000..5a0a2a4
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mapper/TbRwTaskUserMapper.java
@@ -0,0 +1,21 @@
+package com.mosty.rwzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbRwTaskUserMapper extends BaseMapper<TbRwTaskUser> {
+
+    @ApiOperation("查询我的任务")
+    TbRwTaskUser selectByRwId(@Param("sfzh") String idEntityCard,
+                              @Param("rwid") String id,
+                              @Param("ssbmid") String ssbmid);
+
+    @ApiOperation("删除")
+    void deleteEntity(String id);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..8723a3c
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.rwzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/MybatisPlusConfig.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..fdda48a
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.rwzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.rwzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbBaseAdaptRemoteService.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..26de4aa
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,123 @@
+package com.mosty.rwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据用户ID，获取用户部门信息
+    public DeptInfoVo getDeptInfoByUserId(String userid) {
+        if (StringUtils.isBlank(userid)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoByUserId(userid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据部门CODE，获取用户部门信息
+    public DeptInfoVo getOrgByDeptId(String deptcode) {
+        if (StringUtils.isBlank(deptcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询所有的用户数据（包含对应的部门信息）
+    public List<SysUserDeptVO> getUserAll(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return new ArrayList<>();
+        }
+        ResponseResult<List<SysUserDeptVO>> responseResult = mostyBaseFeignService.getUserAll(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所有的用户数据异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所有的用户数据异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据部门CODE，获取用户部门信息
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询用户详情信息
+    public SysUser getUserInfo(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return null;
+        }
+        ResponseResult<SysUser> responseResult = mostyBaseFeignService.getUserInfo(userId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询用户详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询用户详情信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询用户详情信息
+    public SysUser getUserInfoBySfzh(String sfzh) {
+        if (StringUtils.isBlank(sfzh)) {
+            return null;
+        }
+        ResponseResult<SysUser> responseResult = mostyBaseFeignService.getUserInfoBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询用户详情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询用户详情信息异常");
+        }
+        return responseResult.getData();
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbJcglAdaptRemoteService.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbJcglAdaptRemoteService.java
new file mode 100644
index 0000000..1bf26ec
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbJcglAdaptRemoteService.java
@@ -0,0 +1,32 @@
+package com.mosty.rwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbJcglAdaptRemoteService {
+    @Resource
+    private MostyJcglFeignService jcglFeignService;
+
+    public TbJcglDsfVo getDsfInfo(String code){
+        ResponseResult<TbJcglDsfVo> responseResult = jcglFeignService.getDsfInfo(code);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取第三方信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbQwzxAdaptRemoteService.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbQwzxAdaptRemoteService.java
new file mode 100644
index 0000000..5f3e4d2
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/remote/TbQwzxAdaptRemoteService.java
@@ -0,0 +1,56 @@
+package com.mosty.rwzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 勤务中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbQwzxAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    /**
+     * 获取报备详情
+     *
+     * @param
+     * @return
+     */
+    public TbQwXfbbVo getBbInfo(String id) {
+        ResponseResult<TbQwXfbbVo> responseResult = mostyQwzxFeignService.getBbInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取报备详情失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 根据报备ID查询巡组下的人员列表
+     *
+     * @param
+     * @return
+     */
+    public List<TbQwJlDto> getJlxxByBbid(String id) {
+        ResponseResult<List<TbQwJlDto>> responseResult = mostyQwzxFeignService.getJlxxByBbid(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取报备警力失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取报备警力列表异常！");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskInnerServiceImpl.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskInnerServiceImpl.java
new file mode 100644
index 0000000..203a58f
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskInnerServiceImpl.java
@@ -0,0 +1,602 @@
+package com.mosty.rwzx.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.rwzx.*;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.rwzx.TbRwTaskLog;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import com.mosty.base.model.query.rwzx.TbRwTaskInnerQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskMyInnerQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskMyVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskUserVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rwzx.mapper.TbRwTaskLogMapper;
+import com.mosty.rwzx.mapper.TbRwTaskMapper;
+import com.mosty.rwzx.mapper.TbRwTaskUserAllMapper;
+import com.mosty.rwzx.mapper.TbRwTaskUserMapper;
+import com.mosty.rwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rwzx.remote.TbJcglAdaptRemoteService;
+import com.mosty.rwzx.remote.TbQwzxAdaptRemoteService;
+import com.mosty.rwzx.service.TbRwTaskInnerService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.awt.geom.FlatteningPathIterator;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class TbRwTaskInnerServiceImpl extends ServiceImpl<TbRwTaskMapper, TbRwTask>
+        implements TbRwTaskInnerService {
+
+    private final TbRwTaskLogMapper tbRwTaskLogMapper;
+    private final TbRwTaskUserMapper tbRwTaskUserMapper;
+    private final TbRwTaskUserAllMapper tbRwTaskUserAllMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+
+    @Override
+    public int addRw(TbRwTaskInnerDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("请重新登录！！");
+        }
+        TbRwTask task = new TbRwTask();
+        BeanUtils.copyProperties(dto, task);
+        task.setId(UUIDGenerator.getUUID());
+        task.setRwfqsj(new Date());
+        task.setRwzt("0");
+        task.setRwjxzt("1");
+        task.setCjrid(String.valueOf(user.getUserId()));
+        task.setCjrxm(user.getUserName());
+        task.setCjrsfzh(user.getIdEntityCard());
+        task.setSsbmid(String.valueOf(user.getDeptId()));
+        task.setSsbm(String.valueOf(user.getDeptName()));
+        task.setSsbmdm(user.getDeptCode());
+        task.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        task.setSsxgaj(user.getFxjDeptName());
+        task.setSsxgajdm(user.getFxjDeptCode());
+        task.setSssgajid(String.valueOf(user.getDszDeptId()));
+        task.setSssgaj(user.getDszDeptName());
+        task.setSssgajdm(user.getDszDeptCode());
+        task.setXtSjly("1");
+        // 添加发送人
+        List<TbRwTaskUserInnerDto> userDtoList = dto.getUserDtoList();
+        if (CollectionUtils.isEmpty(userDtoList)) {
+            throw new BusinessException("请至少选择一个人员接收任务");
+        }
+        // TODO 计算接收人数量
+        task.setRwzxrysl(userDtoList.size());
+        userDtoList.forEach(item -> {
+            TbRwTaskUser taskUser = new TbRwTaskUser();
+            BeanUtils.copyProperties(task, taskUser);
+            taskUser.setId(UUIDGenerator.getUUID());
+            taskUser.setRwid(task.getId());
+            taskUser.setGrrwzt("0");
+            taskUser.setRwid(task.getId());
+            taskUser.setRwjsdx(task.getRwjsdx());
+            taskUser.setRwzflx("1");
+            taskUser.setJsrid(item.getJsrid());
+            taskUser.setJsrlxdh(item.getJsrlxdh());
+            taskUser.setJsrmc(item.getJsrmc());
+            taskUser.setJsrsfzh(item.getJsrsfzh());
+            taskUser.setJsxzmc(item.getJsxzmc());
+            taskUser.setJsxzid(item.getJsxzid());
+            taskUser.setJsbmmc(item.getJsbmdm());
+            taskUser.setJsbmmc(item.getJsbmmc());
+            DeptInfoVo dept = null;
+            if ("01".equals(item.getRwjsdx())) {
+                dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(item.getJsrid());
+            } else if ("02".equals(item.getRwjsdx())) {
+                dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(item.getJsbmdm());
+                taskUser.setJsbmmc(dept.getDeptname());
+            } else if ("03".equals(item.getRwjsdx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(item.getJsxzid());
+                if (bb != null) {
+                    dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bb.getSsbmid());
+                }
+            }
+            if (dept != null) {
+                taskUser.setSsbmdm(dept.getDeptcode());
+                taskUser.setSsbmid(dept.getDeptid());
+                taskUser.setSsbm(dept.getDeptname());
+                taskUser.setSsxgajid(dept.getFxjid());
+                taskUser.setSsxgaj(dept.getFxjname());
+                taskUser.setSsxgajdm(dept.getFxjcode());
+                taskUser.setSssgaj(dept.getDszname());
+                taskUser.setSssgajdm(dept.getDszcode());
+                taskUser.setSssgajid(dept.getDszid());
+                taskUser.setXtSjly("2");
+            }
+            this.tbRwTaskUserMapper.insert(taskUser);
+            // 保存所有任务
+            TbRwTaskUserAll userAll = new TbRwTaskUserAll();
+            BeanUtils.copyProperties(taskUser, userAll);
+            this.tbRwTaskUserAllMapper.insert(userAll);
+        });
+        // 保存任务日志
+        TbRwTaskLog log = new TbRwTaskLog();
+        log.setId(UUIDGenerator.getUUID());
+        log.setRwid(task.getId());
+        log.setRzlx("09");
+        log.setRznr(DateUtils.getQueryDateString(new Date(), "02") + "," + task.getCjrxm() + "发送了该任务。");
+        log.setBgrid(task.getCjrid());
+        log.setBgsj(new Date());
+        log.setBgrdhhm(task.getCjrlxdh());
+        log.setBgrsfzh(task.getCjrsfzh());
+        log.setBgrxm(task.getCjrxm());
+        log.setSsbmid(String.valueOf(user.getDeptId()));
+        log.setSsbm(String.valueOf(user.getDeptName()));
+        log.setSsbmdm(user.getDeptCode());
+        log.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        log.setSsxgajdm(user.getFxjDeptCode());
+        log.setSsxgaj(user.getFxjDeptName());
+        log.setSssgajid(String.valueOf(user.getDszDeptId()));
+        log.setSssgaj(user.getDszDeptName());
+        log.setSssgajdm(user.getDszDeptCode());
+        log.setXtSjly("1");
+        this.tbRwTaskLogMapper.insertEntity(log);
+        return this.baseMapper.insert(task);
+    }
+
+    @Override
+    public IPage<TbRwTaskVo> selectPage(TbRwTaskInnerQuery dto) {
+        if (!StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (!StringUtils.isEmpty(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 00:00:00");
+        }
+        IPage<TbRwTaskVo> rPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<String> rwjsdx = !StringUtils.isEmpty(dto.getRwjsdx()) ? Arrays.asList(dto.getRwjsdx().split(",")) : null;
+        List<String> rwxl = !StringUtils.isEmpty(dto.getRwxl()) ? Arrays.asList(dto.getRwxl().split(",")) : null;
+        QueryWrapper<TbRwTask> qw = new QueryWrapper<>();
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        IPage<TbRwTask> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                qw.lambda()
+                        .eq(!StringUtils.isEmpty(dto.getYwid()), TbRwTask::getYwid, dto.getYwid())
+                        .like(!StringUtils.isEmpty(dto.getRwmc()), TbRwTask::getRwmc, dto.getRwmc())
+                        .like(!StringUtils.isEmpty(dto.getRwnr()), TbRwTask::getRwnr, dto.getRwnr())
+                        .in(rwjsdx != null, TbRwTask::getRwjsdx, rwjsdx)
+                        .in(rwxl != null, TbRwTask::getRwxl, rwxl)
+                        .eq(!StringUtils.isEmpty(dto.getRwlx()), TbRwTask::getRwlx, dto.getRwlx())
+                        .eq(!StringUtils.isEmpty(dto.getRwjjcd()), TbRwTask::getRwjjcd, dto.getRwjjcd())
+                        .eq(!StringUtils.isEmpty(dto.getRwms()), TbRwTask::getRwms, dto.getRwms())
+                        .eq(!StringUtils.isEmpty(dto.getRwjxzt()), TbRwTask::getRwjxzt, dto.getRwjxzt())
+                        .eq(!StringUtils.isEmpty(dto.getRwzt()), TbRwTask::getRwzt, dto.getRwzt())
+                        .eq(!StringUtils.isEmpty(dto.getCjrid()), TbRwTask::getCjrid, dto.getCjrid())
+                        .eq(!StringUtils.isEmpty(dto.getRwxxlx()), TbRwTask::getRwxxlx, dto.getRwxxlx())
+                        .like(!StringUtils.isEmpty(dto.getCjrxm()), TbRwTask::getCjrxm, dto.getCjrxm())
+                        .likeRight(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .ge(!StringUtils.isEmpty(dto.getKssj()), TbRwTask::getRwfqsj, dto.getKssj())
+                        .le(!StringUtils.isEmpty(dto.getJssj()), TbRwTask::getRwfqsj, dto.getJssj())
+                        .orderByDesc(TbRwTask::getRwfqsj)
+        );
+        List<TbRwTask> list = page.getRecords();
+        List<TbRwTaskVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbRwTaskVo vo = new TbRwTaskVo();
+            BeanUtils.copyProperties(item, vo);
+            rList.add(vo);
+        });
+        rPage.setRecords(rList);
+        rPage.setTotal(page.getTotal());
+        return rPage;
+    }
+
+    @Override
+    public IPage<TbRwTaskUser> selectMyPage(TbRwTaskMyInnerQuery dto) {
+        if (!StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (!StringUtils.isEmpty(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 00:00:00");
+        }
+        UserInfo userInfo = UserInfoManager.get();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("sfzh", userInfo.getIdEntityCard());
+        map.put("dto", dto);
+        map.put("ssbmid", String.valueOf(userInfo.getDeptId()));
+        List<TbRwTaskUser> list = this.baseMapper.getMyRwList(map);
+        int count = this.baseMapper.getMyRwCount(map);
+        IPage<TbRwTaskUser> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    /**
+     * 单用户更改已查看
+     * 单人模式修改单人状态，并判断是否完成，修改任务状态
+     * 多人模式修改所有人状态，修改任务状态
+     *
+     * @param task
+     * @param dto
+     */
+    private void changeZf(TbRwTask task, TbRwTaskGrChangeStateInnerDto dto) {
+        DeptInfoVo zfDept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(dto.getZfjsrid());
+        SysUser zfUser = this.tbBaseAdaptRemoteService.getUserInfo(dto.getZfjsrid());
+        TbRwTaskUser temp = this.tbRwTaskUserMapper.selectByRwId(zfUser.getIdEntityCard(), task.getId(), zfDept.getDeptid());
+        // 判断被转发人是否有该任务，如果有，则提示
+        if (temp != null) {
+            throw new BusinessException("该人员已存在该任务，不能转发给本人！");
+        }
+        UserInfo user = UserInfoManager.get();
+        TbRwTaskUser taskUser = this.tbRwTaskUserMapper.selectByRwId(user.getIdEntityCard(),
+                task.getId(), String.valueOf(user.getDeptId()));
+        TbRwTaskUserAll taskUserAll = this.tbRwTaskUserAllMapper.selectByRwId(user.getIdEntityCard(),
+                task.getId(), String.valueOf(user.getDeptId()));
+        taskUser.setGrrwzt("3");
+        taskUserAll.setGrrwzt("3");
+        taskUser.setYjsj(new Date());
+        taskUserAll.setYjsj(new Date());
+        // 记录日志
+        TbRwTaskLog log = new TbRwTaskLog();
+        SysUser jsr = this.tbBaseAdaptRemoteService.getUserInfo(dto.getZfjsrid());
+        String rznr = DateUtils.getQueryDateString(new Date(), "2") + "," + user.getUserName() +
+                "转发了该任务,转发给->" + jsr.getUserName();
+        String rzlx = "4";
+        log.setId(UUIDGenerator.getUUID()).setRwid(task.getId()).setRzlx(rzlx).setRznr(rznr).setJd(dto.getJd()).setWd(dto.getWd())
+                .setBgsj(new Date())
+                .setBgrid(String.valueOf(user.getUserId()))
+                .setBgrxm(user.getUserName())
+                .setBgrsfzh(user.getIdEntityCard())
+                .setSsbm(user.getDeptName())
+                .setSsbmdm(String.valueOf(user.getDeptName()))
+                .setSsxgaj(user.getFxjDeptName())
+                .setSsxgajdm(String.valueOf(user.getFxjDeptId()))
+                .setSssgaj(user.getDszDeptName())
+                .setSssgajdm(String.valueOf(user.getDszDeptId()))
+                .setXtSjly("2");
+        if (log.getJd() != null && log.getWd() != null) {
+            log.setZb(JtsUtils.getPoint(log.getJd(), log.getWd())).setZbhash(GeoHashKit.encode(log.getJd(), log.getWd()));
+        }
+        this.tbRwTaskLogMapper.insertEntity(log);
+        // 重新生成一条数据
+        TbRwTaskUser newUser = new TbRwTaskUser();
+        BeanUtils.copyProperties(taskUser, newUser);
+        newUser.setRwzflx("2")
+                .setId(UUIDGenerator.getUUID())
+                .setGrrwzt("0")
+                .setJsrid(String.valueOf(jsr.getId()))
+                .setJsrlxdh(jsr.getMobile())
+                .setJsrsfzh(jsr.getIdEntityCard())
+                .setJsrmc(jsr.getUserName())
+                .setJsxzid(null)
+                .setJsxzmc(null)
+                .setJsbmmc(null)
+                .setJsbmdm(null)
+                .setXtSjly("2");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(dto.getZfjsrid());
+        newUser.setSsbmid(dept.getDeptid());
+        newUser.setSsbmdm(dept.getDeptcode());
+        newUser.setSsbm(dept.getDeptname());
+        newUser.setSsxgaj(dept.getFxjname());
+        newUser.setSsxgajid(dept.getFxjid());
+        newUser.setSsxgajdm(dept.getFxjcode());
+        newUser.setSssgaj(dept.getDszname());
+        newUser.setSssgajid(dept.getDszid());
+        newUser.setSssgajdm(dept.getDszcode());
+        newUser.setBhtaskuserid(taskUser.getId());
+        this.tbRwTaskUserMapper.insert(newUser);
+        TbRwTaskUserAll newUserAll = new TbRwTaskUserAll();
+        BeanUtils.copyProperties(newUser, newUserAll);
+        this.tbRwTaskUserAllMapper.insert(newUserAll);
+        this.tbRwTaskUserMapper.updateById(taskUser);
+        this.tbRwTaskUserAllMapper.updateById(taskUserAll);
+    }
+
+    @Override
+    public void changeStateByYwid(TbRwTaskChangeStateByYwidDto dtos) {
+        TbRwTask task = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getYwid, dtos.getYwid())
+                        .eq(TbRwTask::getXtSjzt, "1")
+                        .eq(!StringUtils.isEmpty(dtos.getRwxxlx()), TbRwTask::getRwxxlx, dtos.getRwxxlx())
+        );
+        if (task != null) {
+            TbRwTaskGrChangeStateInnerDto dto = new TbRwTaskGrChangeStateInnerDto();
+            dto.setJd(dtos.getJd());
+            dto.setWd(dtos.getWd());
+            dto.setRwid(task.getId());
+            dto.setRwzt(dtos.getRwzt());
+            if ("1".equals(dto.getRwzt()) || "2".equals(dto.getRwzt())) {
+                // 进行中
+                this.changeJxzOrYwc(task, dto, dto.getRwzt());
+            } else if ("3".equals(dto.getRwzt())) {
+                // 已转发
+                this.changeZf(task, dto);
+            } else if ("4".equals(dto.getRwzt())) {
+                // 被驳回
+                this.changeBh(task, dto);
+            }
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> myRwCount() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("登录过期，请重新登录");
+        }
+        return this.baseMapper.myRwCount(user.getIdEntityCard(), String.valueOf(user.getDeptId()));
+    }
+
+    @Override
+    public List<Map<String, Object>> rwCountByState(TbRwTaskInnerQuery dto) {
+        if (!StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (!StringUtils.isEmpty(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 00:00:00");
+        }
+        List<String> rwjsdx = !StringUtils.isEmpty(dto.getRwjsdx()) ? Arrays.asList(dto.getRwjsdx().split(",")) : null;
+        List<String> rwxl = !StringUtils.isEmpty(dto.getRwxl()) ? Arrays.asList(dto.getRwxl().split(",")) : null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("rwjsdxList", rwjsdx);
+        map.put("rwxlList", rwxl);
+        map.put("dto", dto);
+        return this.baseMapper.rwCountByState(map);
+    }
+
+    /**
+     * 被驳回
+     *
+     * @param task
+     * @param dto
+     */
+    private void changeBh(TbRwTask task, TbRwTaskGrChangeStateInnerDto dto) {
+        UserInfo user = UserInfoManager.get();
+
+        TbRwTaskUser taskUser = this.tbRwTaskUserMapper.selectOne(
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(TbRwTaskUser::getJsrsfzh, user.getIdEntityCard())
+                        .eq(TbRwTaskUser::getRwid, task.getId())
+        );
+        TbRwTaskUserAll taskUserAll = this.tbRwTaskUserAllMapper.selectOne(
+                new LambdaQueryWrapper<TbRwTaskUserAll>()
+                        .eq(TbRwTaskUserAll::getJsrsfzh, user.getIdEntityCard())
+                        .eq(TbRwTaskUserAll::getRwid, task.getId())
+        );
+        taskUser.setGrrwzt("4");
+        taskUserAll.setGrrwzt("4");
+        // 记录日志
+        TbRwTaskLog log = new TbRwTaskLog();
+        String rznr = DateUtils.getQueryDateString(new Date(), "2") + "," + user.getUserName()
+                + "驳回了该任务。";
+        String rzlx = "8";
+        log.setId(UUIDGenerator.getUUID())
+                .setRwid(task.getId())
+                .setRzlx(rzlx)
+                .setRznr(rznr)
+                .setJd(dto.getJd())
+                .setWd(dto.getWd())
+                .setBgsj(new Date())
+                .setBgrid(String.valueOf(user.getUserId()))
+                .setBgrxm(user.getUserName())
+                .setBgrsfzh(user.getIdEntityCard())
+                .setSsbm(user.getDeptName())
+                .setSsbmdm(String.valueOf(user.getDeptName()))
+                .setSsxgaj(user.getFxjDeptName())
+                .setSsxgajdm(String.valueOf(user.getFxjDeptId()))
+                .setSssgaj(user.getDszDeptName())
+                .setSssgajdm(String.valueOf(user.getDszDeptId()))
+                .setXtSjly("2");
+        if (log.getJd() != null && log.getWd() != null) {
+            log.setZb(JtsUtils.getPoint(log.getJd(), log.getWd())).setZbhash(GeoHashKit.encode(log.getJd(), log.getWd()));
+        }
+        this.tbRwTaskLogMapper.insertEntity(log);
+        // 发送新任务
+        TbRwTaskUser bhtaskUser = this.tbRwTaskUserMapper.selectById(taskUser.getBhtaskuserid());
+        TbRwTaskUserAll bhtaskUserAll = this.tbRwTaskUserAllMapper.selectById(taskUser.getBhtaskuserid());
+        bhtaskUser.setRwzflx("3");
+        bhtaskUserAll.setRwzflx("3");
+        bhtaskUser.setGrrwzt("0");
+        bhtaskUserAll.setGrrwzt("0");
+        this.tbRwTaskUserMapper.updateById(bhtaskUser);
+        this.tbRwTaskUserAllMapper.updateById(bhtaskUserAll);
+        this.tbRwTaskUserMapper.updateById(taskUser);
+    }
+
+    @Override
+    public void changeGrrwState(TbRwTaskGrChangeStateInnerDto dto) {
+        TbRwTask task = this.baseMapper.selectById(dto.getRwid());
+        if (task != null) {
+            if ("1".equals(dto.getRwzt()) || "2".equals(dto.getRwzt())) {
+                // 进行中
+                this.changeJxzOrYwc(task, dto, dto.getRwzt());
+            } else if ("3".equals(dto.getRwzt())) {
+                // 已转发
+                this.changeZf(task, dto);
+            } else if ("4".equals(dto.getRwzt())) {
+                // 被驳回
+                this.changeBh(task, dto);
+            }
+        }
+    }
+
+    @Override
+    public void changeRwState(TbRwTaskChangeStateInnerDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbRwTask task = this.baseMapper.selectById(dto.getId());
+        if (task != null) {
+            task.setRwzt(dto.getRwzt());
+            this.baseMapper.updateById(task);
+            // 记录日志
+            String rznr = "";
+            String rzlx = "";
+            if ("0".equals(dto.getRwzt())) {
+                rznr = "重启了该任务。";
+                rzlx = "6";
+            } else if ("1".equals(dto.getRwzt())) {
+                rznr = "关闭了该任务。";
+                rzlx = "1";
+            } else if ("2".equals(dto.getRwzt())) {
+                rznr = "暂停了该任务。";
+                rzlx = "5";
+            }
+            TbRwTaskLog log = new TbRwTaskLog();
+            rznr = DateUtils.getQueryDateString(new Date(), "2") + "," + user.getUserName() + rznr;
+            log.setId(UUIDGenerator.getUUID()).setRwid(task.getId()).setRzlx(rzlx).setRznr(rznr)
+                    .setJd(dto.getJd()).setWd(dto.getWd()).setBgsj(new Date())
+                    .setBgrid(String.valueOf(user.getUserId()))
+                    .setBgrxm(user.getUserName())
+                    .setBgrsfzh(user.getIdEntityCard())
+                    .setSsbm(user.getDeptName())
+                    .setSsbmdm(String.valueOf(user.getDeptName()))
+                    .setSsxgaj(user.getFxjDeptName())
+                    .setSsxgajdm(String.valueOf(user.getFxjDeptId()))
+                    .setSssgaj(user.getDszDeptName())
+                    .setSssgajdm(String.valueOf(user.getDszDeptId()))
+                    .setXtSjly("2");
+            if (log.getJd() != null && log.getWd() != null) {
+                log.setZb(JtsUtils.getPoint(log.getJd(), log.getWd())).setZbhash(GeoHashKit.encode(log.getJd(), log.getWd()));
+            }
+            this.tbRwTaskLogMapper.insertEntity(log);
+            // 修改用户表的任务状态
+            List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                    new LambdaQueryWrapper<TbRwTaskUser>()
+                            .eq(TbRwTaskUser::getRwid, task.getId())
+            );
+            userList.forEach(item -> {
+                item.setRwzt(dto.getRwzt());
+                this.tbRwTaskUserMapper.updateById(item);
+            });
+            // 修改所有用户表的状态
+            List<TbRwTaskUserAll> userAllList = this.tbRwTaskUserAllMapper.selectList(
+                    new LambdaQueryWrapper<TbRwTaskUserAll>()
+                            .eq(TbRwTaskUserAll::getRwid, task.getId())
+            );
+            userAllList.forEach(item -> {
+                item.setRwzt(dto.getRwzt());
+                this.tbRwTaskUserAllMapper.updateById(item);
+            });
+        }
+    }
+
+    /**
+     * 单用户更改已查看
+     * 单人模式修改单人状态，并判断是否完成，修改任务状态
+     * 多人模式修改所有人状态，修改任务状态
+     *
+     * @param task 任务
+     * @param dto  dto
+     */
+    private void changeJxzOrYwc(TbRwTask task, TbRwTaskGrChangeStateInnerDto dto, String grrwzt) {
+        UserInfo user = UserInfoManager.get();
+
+        TbRwTaskUser taskUser = this.tbRwTaskUserMapper.selectByRwId(user.getIdEntityCard(), task.getId(),
+                String.valueOf(user.getDeptId()));
+        TbRwTaskUserAll taskUserAll = this.tbRwTaskUserAllMapper.selectByRwId(user.getIdEntityCard(), task.getId(),
+                String.valueOf(user.getDeptId()));
+        if (taskUser != null) {
+            taskUser.setGrrwzt(grrwzt);
+            taskUserAll.setGrrwzt(grrwzt);
+            // 记录日志
+            TbRwTaskLog log = new TbRwTaskLog();
+            String rznr;
+            String rzlx;
+            if ("1".equals(grrwzt)) {
+                rznr = DateUtils.getQueryDateString(new Date(), "2") + "," + user.getUserName() +
+                        "查看了该任务，任务开始！";
+                rzlx = "2";
+            } else {
+                rznr = DateUtils.getQueryDateString(new Date(), "2") + "," + user.getUserName() + "完成了该任务";
+                rzlx = "3";
+            }
+            log.setId(UUIDGenerator.getUUID())
+                    .setRwid(task.getId())
+                    .setRzlx(rzlx)
+                    .setRznr(rznr)
+                    .setJd(dto.getJd())
+                    .setWd(dto.getWd())
+                    .setBgsj(new Date())
+                    .setBgrid(String.valueOf(user.getUserId()))
+                    .setBgrxm(user.getUserName())
+                    .setBgrsfzh(user.getIdEntityCard())
+                    .setSsbm(user.getDeptName())
+                    .setSsbmid(String.valueOf(user.getDeptId()))
+                    .setSsbmdm(user.getDeptCode())
+                    .setSsxgaj(user.getFxjDeptName())
+                    .setSsxgajid(String.valueOf(user.getFxjDeptId()))
+                    .setSsxgajdm(user.getFxjDeptCode())
+                    .setSssgaj(user.getDszDeptName())
+                    .setSssgajid(String.valueOf(user.getDszDeptId()))
+                    .setSssgajdm(user.getDszDeptCode())
+                    .setXtSjly("2");
+            if (log.getJd() != null && log.getWd() != null) {
+                log.setZb(JtsUtils.getPoint(log.getJd(), log.getWd()))
+                        .setZbhash(GeoHashKit.encode(log.getJd(), log.getWd()));
+            }
+            this.tbRwTaskLogMapper.insertEntity(log);
+            if ("2".equals(task.getRwms())) {
+                // 判断当所有用户已读的时候，将消息改为已读
+                List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                        new LambdaQueryWrapper<TbRwTaskUser>()
+                                .eq(TbRwTaskUser::getRwid, task.getId()
+                                )
+                );
+                long count = userList.stream().filter(item -> "0".equals(item.getRwzt()) || "1".equals(item.getRwzt())).count();
+                if (count == 0) {
+                    task.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    taskUser.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    taskUserAll.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    task.setRwwcsj(new Date());
+                    taskUser.setRwwcsj(new Date());
+                    taskUserAll.setRwwcsj(new Date());
+                }
+                this.baseMapper.updateById(task);
+            } else {
+                // 根据一个用户的状态完成任务状态
+                List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                        new LambdaQueryWrapper<TbRwTaskUser>()
+                                .eq(TbRwTaskUser::getRwid, task.getId())
+                );
+                userList.forEach(item -> {
+                    item.setGrrwzt(grrwzt);
+                    if ("1".equals(grrwzt)) {
+                        this.tbRwTaskUserMapper.updateById(item);
+                    } else {
+                        this.tbRwTaskUserMapper.deleteEntity(item.getId());
+                    }
+                });
+                if ("2".equals(grrwzt)) {
+                    task.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    taskUser.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    taskUserAll.setRwjxzt("1".equals(task.getRwjxzt()) || "3".equals(task.getRwjxzt()) ? "3" : "4");
+                    task.setRwwcsj(new Date());
+                    taskUser.setRwwcsj(new Date());
+                    taskUserAll.setRwwcsj(new Date());
+                    this.baseMapper.updateById(task);
+                }
+            }
+            this.tbRwTaskUserAllMapper.updateById(taskUserAll);
+        }
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskServiceImpl.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskServiceImpl.java
new file mode 100644
index 0000000..18f9e09
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/Impl/TbRwTaskServiceImpl.java
@@ -0,0 +1,571 @@
+package com.mosty.rwzx.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.rwzx.*;
+import com.mosty.base.model.entity.qwzx.TbQwJl;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.rwzx.TbRwTaskLog;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.*;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglDsfVo;
+import com.mosty.base.model.vo.rwzx.*;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserDeptVO;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.rwzx.mapper.TbRwTaskUserAllMapper;
+import com.mosty.rwzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rwzx.mapper.TbRwTaskLogMapper;
+import com.mosty.rwzx.mapper.TbRwTaskMapper;
+import com.mosty.rwzx.mapper.TbRwTaskUserMapper;
+import com.mosty.rwzx.remote.TbJcglAdaptRemoteService;
+import com.mosty.rwzx.remote.TbQwzxAdaptRemoteService;
+import com.mosty.rwzx.service.TbRwTaskService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class TbRwTaskServiceImpl extends ServiceImpl<TbRwTaskMapper, TbRwTask> implements TbRwTaskService {
+
+    private final TbRwTaskMapper tbRwTaskMapper;
+    private final TbRwTaskLogMapper tbRwTaskLogMapper;
+    private final TbRwTaskUserMapper tbRwTaskUserMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbRwTaskUserAllMapper tbRwTaskUserAllMapper;
+
+
+    @Override
+    @Transactional
+    public int addRw(TbRwTaskDto dto) {
+        TbRwTask task = new TbRwTask();
+        BeanUtils.copyProperties(dto, task);
+        task.setId(UUIDGenerator.getUUID());
+        task.setRwfqsj(new Date());
+        task.setRwzt("0");
+        task.setRwjxzt("1");
+        task.setCjrid(dto.getCjrid());
+        task.setCjrxm(dto.getCjrxm());
+        task.setCjrsfzh(dto.getCjrsfzh());
+        task.setCjrlxdh("");
+        DeptInfoVo dept;
+        dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+        if (dept != null) {
+            task.setSsbmid(dept.getDeptid());
+            task.setSsbm(dept.getDeptname());
+            task.setSsbmdm(dept.getDeptcode());
+            task.setSsxgajid(dept.getFxjid());
+            task.setSsxgaj(dept.getFxjname());
+            task.setSsxgajdm(dept.getFxjcode());
+            task.setSssgajid(dept.getDszid());
+            task.setSssgaj(dept.getDszname());
+            task.setSssgajdm(dept.getDszcode());
+        }
+        task.setXtSjly("1");
+        // 保存任务接收人信息
+        List<TbRwTaskUserDto> userDtoList = dto.getUserDtoList();
+        if (CollectionUtils.isEmpty(userDtoList)) {
+            throw new BusinessException("请至少选择一个人员接收任务！！");
+        }
+        // TODO 计算任务接收人数量
+        userDtoList.forEach(item -> {
+            TbRwTaskUser taskUser = new TbRwTaskUser();
+            BeanUtils.copyProperties(task, taskUser);
+            taskUser.setId(UUIDGenerator.getUUID());
+            taskUser.setRwid(task.getId());
+            taskUser.setGrrwzt("0");
+            taskUser.setRwid(task.getId());
+            taskUser.setRwjsdx(task.getRwjsdx());
+            taskUser.setRwzflx("1");
+            taskUser.setJsrid(item.getJsrid());
+            taskUser.setJsrlxdh(item.getJsrlxdh());
+            taskUser.setJsrmc(item.getJsrmc());
+            taskUser.setJsrsfzh(item.getJsrsfzh());
+            taskUser.setJsxzmc(item.getJsxzmc());
+            taskUser.setJsxzid(item.getJsxzid());
+            taskUser.setJsbmdm(item.getJsbmdm());
+            taskUser.setJsbmmc(item.getJsbmmc());
+            DeptInfoVo userDept = null;
+            if ("01".equals(dto.getRwjsdx())) {
+                userDept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(item.getJsrid());
+            } else if ("02".equals(dto.getRwjsdx())) {
+                userDept = this.tbBaseAdaptRemoteService.getOrgByDeptId(item.getJsbmdm());
+                taskUser.setJsbmmc(userDept.getDeptname());
+            } else if ("03".equals(dto.getRwjsdx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(item.getJsxzid());
+                if (bb != null) {
+                    taskUser.setJsxzmc(bb.getJzMc());
+                    userDept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bb.getSsbmid());
+                }
+            }
+            if (userDept != null) {
+                taskUser.setSsbmid(userDept.getDeptid());
+                taskUser.setSsbm(userDept.getDeptname());
+                taskUser.setSsbmdm(userDept.getDeptcode());
+                taskUser.setSsxgajid(userDept.getFxjid());
+                taskUser.setSsxgaj(userDept.getFxjname());
+                taskUser.setSsxgajdm(userDept.getFxjcode());
+                taskUser.setSssgajid(userDept.getDszid());
+                taskUser.setSssgaj(userDept.getDszname());
+                taskUser.setSssgajdm(userDept.getDszcode());
+                taskUser.setXtSjly("1");
+            }
+            this.tbRwTaskUserMapper.insert(taskUser);
+            // 保存所有任务
+            TbRwTaskUserAll userAll = new TbRwTaskUserAll();
+            BeanUtils.copyProperties(taskUser, userAll);
+            this.tbRwTaskUserAllMapper.insert(userAll);
+        });
+        // 保存任务日志
+        TbRwTaskLog log = new TbRwTaskLog();
+        log.setId(UUIDGenerator.getUUID());
+        log.setRwid(task.getId());
+        log.setRzlx("09");
+        log.setRznr(DateUtils.getQueryDateString(new Date(), "02") + "," + task.getCjrxm() + "发送了该任务。");
+        log.setBgrid(task.getCjrid());
+        log.setBgsj(new Date());
+        log.setBgrdhhm(task.getCjrlxdh());
+        log.setBgrsfzh(task.getCjrsfzh());
+        log.setBgrxm(task.getCjrxm());
+        if (dept != null) {
+            log.setSsbmid(dept.getDeptid());
+            log.setSsbm(dept.getDeptname());
+            log.setSsbmdm(dept.getDeptcode());
+            log.setSsxgajid(dept.getFxjid());
+            log.setSsxgaj(dept.getFxjname());
+            log.setSsxgajdm(dept.getFxjcode());
+            log.setSssgajid(dept.getDszid());
+            log.setSssgaj(dept.getDszname());
+            log.setSssgajdm(dept.getDszcode());
+        }
+        log.setXtSjly("1");
+        this.tbRwTaskLogMapper.insertEntity(log);
+        return this.baseMapper.insert(task);
+    }
+
+    @Override
+    public TbRwTaskVo getTaskInfo(String id) {
+        UserInfo userInfo = UserInfoManager.get();
+        List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(TbRwTaskUser::getRwid, id)
+                        .eq(TbRwTaskUser::getXtSjzt, "1")
+        );
+        if (userList != null && userList.size() > 0) {
+            List<TbRwTaskUserVo> voList = new ArrayList<>();
+            userList.forEach(item -> {
+                TbRwTaskUserVo userVo = new TbRwTaskUserVo();
+                BeanUtils.copyProperties(item, userVo);
+                voList.add(userVo);
+            });
+            TbRwTaskVo vo = new TbRwTaskVo();
+            BeanUtils.copyProperties(userList.get(0), vo);
+            vo.setUserDtoList(voList);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public IPage<TbRwTaskUserVo> getTaskUserList(TbRwTaskUserQuery dto) {
+        IPage<TbRwTaskUser> userPage = this.tbRwTaskUserMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(!StringUtils.isEmpty(dto.getRwid()), TbRwTaskUser::getRwid, dto.getRwid())
+                        .eq(!StringUtils.isEmpty(dto.getRwzt()), TbRwTaskUser::getRwzt, dto.getRwzt())
+                        .like(!StringUtils.isEmpty(dto.getJsrmc()), TbRwTaskUser::getJsrmc, dto.getJsrmc())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTaskUser::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTaskUser::getSsbmid, dto.getSsbmid()));
+        List<TbRwTaskUserVo> voList = new ArrayList<>();
+        userPage.getRecords().forEach(item -> {
+            TbRwTaskUserVo vo = new TbRwTaskUserVo();
+            BeanUtils.copyProperties(item, vo);
+            voList.add(vo);
+        });
+        IPage<TbRwTaskUserVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(voList);
+        page.setTotal(userPage.getTotal());
+        return page;
+    }
+
+    @Override
+    public IPage<TbRwTaskLogVo> getTaskLogList(TbRwTaskLogQuery dto) {
+        IPage<TbRwTaskLog> userPage = this.tbRwTaskLogMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbRwTaskLog>()
+                        .eq(!StringUtils.isEmpty(dto.getRwid()), TbRwTaskLog::getRwid, dto.getRwid())
+                        .eq(!StringUtils.isEmpty(dto.getRzlx()), TbRwTaskLog::getRzlx, dto.getRzlx())
+                        .like(!StringUtils.isEmpty(dto.getRznr()), TbRwTaskLog::getRznr, dto.getRznr())
+                        .like(!StringUtils.isEmpty(dto.getBgrxm()), TbRwTaskLog::getBgrxm, dto.getBgrxm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTaskLog::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTaskLog::getSsbmid, dto.getSsbmid()));
+        List<TbRwTaskLogVo> voList = new ArrayList<>();
+        userPage.getRecords().forEach(item -> {
+            TbRwTaskLogVo vo = new TbRwTaskLogVo();
+            BeanUtils.copyProperties(item, vo);
+            voList.add(vo);
+        });
+        IPage<TbRwTaskLogVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(voList);
+        page.setTotal(userPage.getTotal());
+        return page;
+    }
+
+    @Override
+    public TbRwTaskStatisticsVo getDataStatistics(TbRwTaskStatisticsDto dto) {
+        Date d = null;
+        if (!StringUtils.isEmpty(dto.getDateType())) {
+            if ("1".equals(dto.getDateType())) {
+                d = new Date();
+            } else if ("2".equals(dto.getDateType())) {
+                d = DateUtils.getNextDate(new Date(), "D", -7);
+            } else {
+                d = DateUtils.getNextDate(new Date(), "M", -1);
+            }
+        }
+        TbRwTaskStatisticsVo vo = new TbRwTaskStatisticsVo();
+        //总任务数
+        Integer all = this.baseMapper.getCount("", d, dto.getSfzh());
+        //进行中
+        Integer jxz = this.baseMapper.getCount("1", d, dto.getSfzh());
+        //超期进行中
+        Integer cqjxz = this.baseMapper.getCount("2", d, dto.getSfzh());
+        //已完成
+        Integer ywc = this.baseMapper.getCount("3", d, dto.getSfzh());
+        //超期完成
+        Integer cqwc = this.baseMapper.getCount("4", d, dto.getSfzh());
+        //超期未完成
+        Integer cqwwc = this.baseMapper.getCount("5", d, dto.getSfzh());
+        vo.setAll(all);
+        vo.setJxz(jxz);
+        vo.setCqjxz(cqjxz);
+        vo.setCqwc(cqwc);
+        vo.setYwc(ywc);
+        vo.setCqwwc(cqwwc);
+        return vo;
+    }
+
+    @Override
+    public List<TbRwTaskLXStatisticsVo> getRWLXDataStatistics(TbRwTaskStatisticsDto dto) {
+        String d;
+        if ("1".equals(dto.getDateType())) {
+            d = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(dto.getDateType())) {
+            d = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else {
+            d = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", -1), "01");
+        }
+        List<SysDictItem> rwxl = tbRwTaskMapper.selectDict("D_BZ_RWXL");
+        List<TbRwTaskLXStatisticsVo> ret = new ArrayList<>();
+        if (null != rwxl) {
+            for (SysDictItem sysDictItem : rwxl) {
+                //分类查询
+                TbRwTaskLXStatisticsVo vo = new TbRwTaskLXStatisticsVo();
+                //后面 通过字典查询
+                vo.setCt(sysDictItem.getZdmc());
+                vo.setDm(sysDictItem.getDm());
+                //总任务数
+                Integer all = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                //进行中
+                Integer jxz = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getRwjxzt, "1")
+                        .eq(TbRwTask::getRwxl, sysDictItem.getDm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTask::getSsbmid, dto.getSsbmid())
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                //超期进行中
+                Integer cqjxz = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getRwjxzt, "2")
+                        .eq(TbRwTask::getRwxl, sysDictItem.getDm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTask::getSsbmid, dto.getSsbmid())
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                //已完成
+                Integer ywc = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getRwjxzt, "3")
+                        .eq(TbRwTask::getRwxl, sysDictItem.getDm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTask::getSsbmid, dto.getSsbmid())
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                // 超期完成
+                Integer cqwc = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getRwjxzt, "4")
+                        .eq(TbRwTask::getRwxl, sysDictItem.getDm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTask::getSsbmid, dto.getSsbmid())
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                // 超期未完成
+                Integer cqwwc = this.baseMapper.selectCount(new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getRwjxzt, "5")
+                        .eq(TbRwTask::getRwxl, sysDictItem.getDm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmdm()), TbRwTask::getSsbmdm, dto.getSsbmdm())
+                        .eq(!StringUtils.isEmpty(dto.getSsbmid()), TbRwTask::getSsbmid, dto.getSsbmid())
+                        .last(" and DATE_FORMAT(rwfqsj,'%Y-%m-%d')" +
+                                " between DATE_FORMAT('" + d + "','%Y-%m-%d')" +
+                                " and DATE_FORMAT(now(),'%Y-%m-%d')")
+                );
+                vo.setAll(all);
+                vo.setJxz(jxz);
+                vo.setCqjxz(cqjxz);
+                vo.setCqwc(cqwc);
+                vo.setYwc(ywc);
+                vo.setCqwwc(cqwwc);
+                ret.add(vo);
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public List<TbRwTaskRankingVo> getTaskRanking(TbRwTaskStatisticsDto dto) {
+        return tbRwTaskMapper.getTaskRanking(dto);
+    }
+
+    @Override
+    public void changeState() {
+        // 任务到期之后还能继续执行的任务，修改状态为超期进行中
+        List<TbRwTask> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getXtSjzt, "1")
+                        .eq(TbRwTask::getRwjxzt, "1")
+                        .le(TbRwTask::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTask::getSfaqwc, "0")
+        );
+        list.forEach(item -> {
+            item.setRwjxzt("2");
+            this.baseMapper.updateById(item);
+        });
+        List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(TbRwTaskUser::getXtSjzt, "1")
+                        .eq(TbRwTaskUser::getRwjxzt, "1")
+                        .le(TbRwTaskUser::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTaskUser::getSfaqwc, "0")
+        );
+        userList.forEach(item -> {
+            item.setRwjxzt("2");
+            this.tbRwTaskUserMapper.updateById(item);
+        });
+        List<TbRwTaskUserAll> userAllList = this.tbRwTaskUserAllMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUserAll>()
+                        .eq(TbRwTaskUserAll::getXtSjzt, "1")
+                        .eq(TbRwTaskUserAll::getRwjxzt, "1")
+                        .le(TbRwTaskUserAll::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTaskUserAll::getSfaqwc, "0")
+        );
+        userAllList.forEach(item -> {
+            item.setRwjxzt("2");
+            this.tbRwTaskUserAllMapper.updateById(item);
+        });
+        // 任务到期之后不能继续执行的任务，修改状态为超期未完成
+        list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getXtSjzt, "1")
+                        .eq(TbRwTask::getRwjxzt, "1")
+                        .le(TbRwTask::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTask::getSfaqwc, "1")
+        );
+        list.forEach(item -> {
+            item.setRwjxzt("5");
+            this.baseMapper.updateById(item);
+        });
+        userAllList = this.tbRwTaskUserAllMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUserAll>()
+                        .eq(TbRwTaskUserAll::getXtSjzt, "1")
+                        .eq(TbRwTaskUserAll::getRwjxzt, "1")
+                        .le(TbRwTaskUserAll::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTaskUserAll::getSfaqwc, "1")
+        );
+        userAllList.forEach(item -> {
+            item.setRwjxzt("5");
+            this.tbRwTaskUserAllMapper.updateById(item);
+        });
+        // 删除进行中表的任务
+        userList = this.tbRwTaskUserMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(TbRwTaskUser::getXtSjzt, "1")
+                        .eq(TbRwTaskUser::getRwjxzt, "1")
+                        .le(TbRwTaskUser::getRwyqwcsj, DateUtils.getQueryDateString(new Date(), "02"))
+                        .eq(TbRwTaskUser::getSfaqwc, "1")
+        );
+        userList.forEach(item -> this.tbRwTaskUserMapper.deleteEntity(item.getId()));
+    }
+
+    @Override
+    public TbRwTask getRwByYwid(TbRwTaskByYwidQuery dto) {
+        return this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getYwid, dto.getYwid())
+                        .eq(TbRwTask::getRwxl, dto.getRwxl())
+                        .last(" limit 1")
+        );
+    }
+
+    @Override
+    public List<TbRwTaskRankingVo> getTaskByDept() {
+        List<TbRwTaskRankingVo> rList = new ArrayList<>();
+        List<Map<String, Object>> list = this.baseMapper.getTaskByDept();
+        list.forEach(item -> {
+            TbRwTaskRankingVo vo = new TbRwTaskRankingVo();
+            vo.setSsbm(item.get("ssbm").toString());
+            // 完成数
+            int ys = this.baseMapper.getCountByDept(item.get("ssbmdm").toString(), "1");
+            // 未完成数
+            int ns = this.baseMapper.getCountByDept(item.get("ssbmdm").toString(), "2");
+            vo.setYS(String.valueOf(ys));
+            vo.setNS(String.valueOf(ns));
+            vo.setRate(String.valueOf(
+                    ns + ys == 0 ? "0.0000" :
+                            (new BigDecimal(String.valueOf(ys)).divide(new BigDecimal(String.valueOf(ns))
+                                    .add(new BigDecimal(String.valueOf(ys))), 4, BigDecimal.ROUND_HALF_UP))
+            ));
+            rList.add(vo);
+        });
+        rList.sort((o1, o2) -> new BigDecimal(o2.getRate()).compareTo(new BigDecimal(o1.getRate())));
+        if (rList.size() >= 10) {
+            return rList.subList(0, 10);
+        } else {
+            return rList;
+        }
+    }
+
+    @Override
+    public Boolean checkMyTask(String id) {
+        UserInfo user = UserInfoManager.get();
+
+        TbRwTaskUserAll taskUser = this.tbRwTaskUserAllMapper.selectByRwId(user.getIdEntityCard(), id, String.valueOf(user.getDeptId()));
+        return taskUser != null;
+    }
+
+    @Override
+    @Transactional
+    public void changeTaskStateByZlid(TbZlxx zl) {
+        TbRwTask task = this.baseMapper.selectById(
+                new LambdaQueryWrapper<TbRwTask>()
+                        .eq(TbRwTask::getXtSjzt, "1")
+                        .eq(TbRwTask::getYwid, zl.getId())
+                        .eq(TbRwTask::getRwxxlx, "01")
+                        .orderByDesc(TbRwTask::getRwfqsj)
+                        .last(" limit 1")
+        );
+        task.setYwid(zl.getId());
+        task.setRwmc(zl.getZlbt());
+        task.setRwnr(zl.getZlnr());
+        task.setRwfqsj(zl.getZlfqsj());
+        task.setSfaqwc("1");
+        task.setRwyqwcsj(DateUtils.getNextDate(new Date(), "H", 1));
+        task.setRwjxzt("01");
+        this.baseMapper.updateById(task);
+        List<TbRwTaskUser> userList = this.tbRwTaskUserMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUser>()
+                        .eq(TbRwTaskUser::getRwid, zl.getId())
+                        .eq(TbRwTaskUser::getXtSjzt, "1")
+        );
+        userList.forEach(item -> {
+            item.setYwid(zl.getId());
+            item.setRwmc(zl.getZlbt());
+            item.setRwnr(zl.getZlnr());
+            item.setRwfqsj(zl.getZlfqsj());
+            item.setSfaqwc("1");
+            item.setRwyqwcsj(DateUtils.getNextDate(new Date(), "H", 1));
+            item.setRwjxzt("01");
+            item.setGrrwzt("01");
+            this.tbRwTaskUserMapper.updateById(item);
+        });
+        List<TbRwTaskUserAll> userAllList = this.tbRwTaskUserAllMapper.selectList(
+                new LambdaQueryWrapper<TbRwTaskUserAll>()
+                        .eq(TbRwTaskUserAll::getRwid, zl.getId())
+                        .eq(TbRwTaskUserAll::getXtSjzt, "1")
+        );
+        userAllList.forEach(item -> {
+            item.setYwid(zl.getId());
+            item.setRwmc(zl.getZlbt());
+            item.setRwnr(zl.getZlnr());
+            item.setRwfqsj(zl.getZlfqsj());
+            item.setSfaqwc("1");
+            item.setRwyqwcsj(DateUtils.getNextDate(new Date(), "H", 1));
+            item.setRwjxzt("01");
+            item.setGrrwzt("01");
+            this.tbRwTaskUserAllMapper.updateById(item);
+        });
+    }
+
+    @Override
+    public Integer getYclTask() {
+        UserInfo user = UserInfoManager.get();
+
+        return this.baseMapper.getYclTask(user.getIdEntityCard(), String.valueOf(user.getDeptId()));
+    }
+
+    @Override
+    public IPage<TbRwTaskUserAll> getYclTaskList(TbRwTaskMyInnerQuery dto) {
+        if (!StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (!StringUtils.isEmpty(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 00:00:00");
+        }
+        UserInfo userInfo = UserInfoManager.get();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("sfzh", userInfo.getIdEntityCard());
+        map.put("dto", dto);
+        map.put("ssbmid", String.valueOf(userInfo.getDeptId()));
+        List<TbRwTaskUserAll> list = this.baseMapper.getMyRwListYwc(map);
+        int count = this.baseMapper.getMyRwCountYwc(map);
+        IPage<TbRwTaskUserAll> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public boolean checkHasNewTask(String sfzh) {
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(sfzh);
+        if (user == null) return false;
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        if (dept == null || StringUtils.isEmpty(dept.getDeptid())) return false;
+        Date time = DateUtils.getNextDate(new Date(), "S", -21);
+        int count = this.baseMapper.checkHasNewTask(sfzh, dept.getDeptid(), DateUtils.getQueryDateString(time, "02"));
+        return count >= 1;
+    }
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskInnerService.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskInnerService.java
new file mode 100644
index 0000000..13d924c
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskInnerService.java
@@ -0,0 +1,43 @@
+package com.mosty.rwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rwzx.TbRwTaskChangeStateByYwidDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskChangeStateInnerDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskGrChangeStateInnerDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskInnerDto;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.query.rwzx.TbRwTaskInnerQuery;
+import com.mosty.base.model.query.rwzx.TbRwTaskMyInnerQuery;
+import com.mosty.base.model.vo.rwzx.TbRwTaskMyVo;
+import com.mosty.base.model.vo.rwzx.TbRwTaskVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbRwTaskInnerService {
+
+    @ApiOperation("添加任务")
+    int addRw(TbRwTaskInnerDto dto);
+
+    @ApiOperation("查询任务列表")
+    IPage<TbRwTaskVo> selectPage(TbRwTaskInnerQuery dto);
+
+    @ApiOperation("查询我的任务列表")
+    IPage<TbRwTaskUser> selectMyPage(TbRwTaskMyInnerQuery dto);
+
+    @ApiOperation("修改个人任务状态")
+    void changeGrrwState(TbRwTaskGrChangeStateInnerDto dto);
+
+    @ApiOperation("修改任务状态")
+    void changeRwState(TbRwTaskChangeStateInnerDto dto);
+
+    @ApiOperation("根据业务ID和业务类型修改任务状态")
+    void changeStateByYwid(TbRwTaskChangeStateByYwidDto dto);
+
+    @ApiOperation("APP统计我的任务数量")
+    List<Map<String, Object>> myRwCount();
+
+    @ApiOperation("APP统计任务列表的数量")
+    List<Map<String, Object>> rwCountByState(TbRwTaskInnerQuery dto);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskService.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskService.java
new file mode 100644
index 0000000..0fd3c1b
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/service/TbRwTaskService.java
@@ -0,0 +1,61 @@
+package com.mosty.rwzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rwzx.*;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUser;
+import com.mosty.base.model.entity.rwzx.TbRwTaskUserAll;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.*;
+import com.mosty.base.model.vo.rwzx.*;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbRwTaskService {
+
+    @ApiOperation("添加任务信息")
+    int addRw(TbRwTaskDto dto);
+
+    @ApiOperation("通过任务Id查询任务详情信息")
+    TbRwTaskVo getTaskInfo(String id);
+
+    @ApiOperation("查询消息接收人列表")
+    IPage<TbRwTaskUserVo> getTaskUserList(TbRwTaskUserQuery dto);
+
+    @ApiOperation("查询任务日志列表")
+    IPage<TbRwTaskLogVo> getTaskLogList(TbRwTaskLogQuery dto);
+
+    @ApiOperation("任务中心首页数量统计接口")
+    TbRwTaskStatisticsVo getDataStatistics(TbRwTaskStatisticsDto dto);
+
+    @ApiOperation("任务中心首页任务类型数量统计接口")
+    List<TbRwTaskLXStatisticsVo> getRWLXDataStatistics(TbRwTaskStatisticsDto dto);
+
+    @ApiOperation("任务中心首页人员任务完成情况排名接口")
+    List<TbRwTaskRankingVo> getTaskRanking(TbRwTaskStatisticsDto dto);
+
+    @ApiOperation("查询所有未超期的任务，判断是否超期")
+    void changeState();
+
+    @ApiOperation("根据任务类型和业务Id查询任务是否存在")
+    TbRwTask getRwByYwid(TbRwTaskByYwidQuery dto);
+
+    @ApiOperation("任务中心首页部门任务完成情况排名接口")
+    List<TbRwTaskRankingVo> getTaskByDept();
+
+    @ApiOperation("查询任务是否是登录人的任务")
+    Boolean checkMyTask(String id);
+
+    @ApiOperation("修改指令任务状态为未完成")
+    void changeTaskStateByZlid(TbZlxx zl);
+
+    @ApiOperation("查询登录用户的已处理的任务数量")
+    Integer getYclTask();
+
+    @ApiOperation("查询登录用户的已处理的任务列表")
+    IPage<TbRwTaskUserAll> getYclTaskList(TbRwTaskMyInnerQuery dto);
+
+    @ApiOperation("查询是否有新的指令任务")
+    boolean checkHasNewTask(String sfzh);
+}
diff --git a/mosty-rwzx/src/main/java/com/mosty/rwzx/task/ChangeRwztTask.java b/mosty-rwzx/src/main/java/com/mosty/rwzx/task/ChangeRwztTask.java
new file mode 100644
index 0000000..77b026a
--- /dev/null
+++ b/mosty-rwzx/src/main/java/com/mosty/rwzx/task/ChangeRwztTask.java
@@ -0,0 +1,24 @@
+package com.mosty.rwzx.task;
+
+import com.mosty.rwzx.service.TbRwTaskService;
+import lombok.AllArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 每隔几分钟执行一次指令的修改与变更
+ * 查询是否有任务已经超期
+ */
+@Component
+@AllArgsConstructor
+public class ChangeRwztTask {
+
+    private final TbRwTaskService tbRwTaskService;
+
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void run() {
+         this.tbRwTaskService.changeState();
+    }
+}
diff --git a/mosty-rwzx/src/main/resources/application.yml b/mosty-rwzx/src/main/resources/application.yml
new file mode 100644
index 0000000..4a57be2
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_rwzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/bootstrap.yml b/mosty-rwzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..69a4971
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8020
+  servlet:
+    context-path: /mosty-rwzx/
+spring:
+  application:
+    name: mosty-rwzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-rwzx/src/main/resources/logback-spring.xml b/mosty-rwzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/mapper/TbRwTaskLogMapper.xml b/mosty-rwzx/src/main/resources/mapper/TbRwTaskLogMapper.xml
new file mode 100644
index 0000000..7938d03
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/mapper/TbRwTaskLogMapper.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.rwzx.mapper.TbRwTaskLogMapper">
+    <resultMap type="com.mosty.base.model.entity.rwzx.TbRwTaskLog" id="tbRwTaskLog">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="rwid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="rzlx" column="jkdbgbh" jdbcType="VARCHAR"/>
+        <result property="rznr" column="sbbh" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="bgsj" column="bgsj" jdbcType="TIMESTAMP"/>
+        <result property="bgrid" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="bgrxm" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="bgrsfzh" column="sblxdm" jdbcType="VARCHAR"/>
+        <result property="bgrdhhm" column="sjlxdm" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+
+                id,rwid,rzlx,rznr,jd,wd,zbhash,bgsj,bgrid,bgrxm,bgrsfzh,bgrdhhm,ssbmid,ssxgajid,sssgajid,
+                ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+
+    </sql>
+
+    <sql id="zb_sql">
+
+                ST_ASWKT
+                (zb) as zb
+
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.rwzx.TbRwTaskLog">
+
+                insert into tb_rw_task_log(
+                id,rwid,rzlx,rznr,jd,wd,zb,zbhash,bgsj,bgrid,bgrxm,bgrsfzh,bgrdhhm,ssbmid,ssxgajid,sssgajid,
+                ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+                )values (
+                #{id},#{rwid},#{rzlx},#{rznr},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash},#{bgsj},#{bgrid},#{bgrxm},#{bgrsfzh},#{bgrdhhm},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz},
+                #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+                #{xtZhgxrid},#{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}
+                )
+
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/mapper/TbRwTaskMapper.xml b/mosty-rwzx/src/main/resources/mapper/TbRwTaskMapper.xml
new file mode 100644
index 0000000..83b3390
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/mapper/TbRwTaskMapper.xml
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.rwzx.mapper.TbRwTaskMapper">
+    <select id="selectDict" resultType="com.mosty.common.config.entity.SysDictItem">
+        select *
+        from mosty_base.sys_dict_item
+        where zdbh = #{dictName}
+          and xt_zxbz = '0'
+    </select>
+
+    <select id="getTaskRanking" parameterType="com.mosty.base.model.dto.rwzx.TbRwTaskStatisticsDto"
+            resultType="com.mosty.base.model.vo.rwzx.TbRwTaskRankingVo">
+        select userinfo.jsrsfzh,
+        userinfo.jsrmc,
+        ssbm,
+        IFNULL(YTable.YS, '0') YS,
+        IFNULL(NTable.NS, '0') NS,
+        (IFNULL( YTable.YS,0) / ( IFNULL( YTable.YS,0) + IFNULL( NTable.NS,0) )) rate
+        from (select jsrsfzh, jsrmc, ssbm
+        from mosty_rwzx.tb_rw_task_user
+        WHERE xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmid != null and ssbmid != ''">
+            and ssbmid = #{ssbmid}
+        </if>
+
+        GROUP BY jsrsfzh, jsrmc, ssbm) userinfo
+        LEFT JOIN (SELECT jsrsfzh,
+        sum(s) YS
+        FROM (SELECT i.dm, u.jsrsfzh, count(u.id) s
+        FROM mosty_base.sys_dict_item i
+        left JOIN (select *
+        from mosty_rwzx.tb_rw_task_user
+        where xt_sjzt = '1' and xt_scbz = '0') u on i.dm = u.rwzt
+        where i.zdbh = 'D_BZ_GRRWZT'
+        and i.xt_zxbz = '0'
+        GROUP BY i.dm, u.jsrsfzh
+        ORDER BY i.dm) g
+        WHERE dm = '2'
+        GROUP BY jsrsfzh) YTable on userinfo.jsrsfzh = YTable.jsrsfzh
+        LEFT JOIN (SELECT jsrsfzh,
+        sum(s) NS
+        FROM (SELECT i.dm, u.jsrsfzh, count(u.id) s
+        FROM mosty_base.sys_dict_item i
+        left JOIN (select *
+        from mosty_rwzx.tb_rw_task_user
+        where xt_sjzt = '1' and xt_scbz = '0') u on i.dm = u.rwzt
+        where i.zdbh = 'D_BZ_GRRWZT'
+        and i.xt_zxbz = '0'
+        GROUP BY i.dm, u.jsrsfzh
+        ORDER BY i.dm) g
+        WHERE dm != '2'
+        GROUP BY
+        jsrsfzh) NTable on userinfo.jsrsfzh = NTable.jsrsfzh
+        order by rate DESC LIMIT 0,10
+    </select>
+
+    <!--获取我的任务列表-->
+    <select id="getMyRwList" resultType="com.mosty.base.model.entity.rwzx.TbRwTaskUser">
+        select * from tb_rw_task_user a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.jssj != null and dto.kssj != '' and dto.jssj != ''">
+            and a.rwfqsj &gt; #{kssj}
+            and a.rwfqsj &lt; #{jssj}
+        </if>
+        <if test="dto.rwxl != null and dto.rwxl != ''">
+            and a.rwxl = #{dto.rwxl}
+        </if>
+        <if test="dto.rwmc != null and dto.rwmc != ''">
+            and a.rwmc like concat('%',#{dto.rwmc},'%')
+        </if>
+        <if test="dto.rwnr != null and dto.rwnr != ''">
+            and a.rwnr like concat('%',#{dto.rwnr},'%')
+        </if>
+        <if test="dto.rwlx != null and dto.rwlx != ''">
+            and a.rwlx = #{dto.rwlx}
+        </if>
+        <if test="dto.rwjjcd != null and dto.rwjjcd != ''">
+            and a.rwjjcd = #{dto.rwjjcd}
+        </if>
+        <if test="dto.rwzt != null and dto.rwzt != ''">
+            and a.rwzt = #{dto.rwzt}
+        </if>
+        and case
+        when a.rwjsdx = '01' then a.jsrsfzh = #{sfzh}
+
+        when a.rwjsdx = '02' then a.jsbmdm = #{ssbmid}
+
+        when a.rwjsdx = '03' then
+        a.jsxzid in (select c.id from mosty_qwgl.tb_qw_xfbb c,mosty_qwgl.tb_qw_jl d where c.id = d.ywid and
+        c.xt_sjzt = '1' and c.xt_scbz = '0' and d.xt_sjzt = '1' and d.xt_scbz = '0' and
+        (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+        end
+        <if test="dto.grrwzt != null and dto.grrwzt != ''">
+            and a.grrwzt = #{dto.grrwzt}
+        </if>
+        order by a.rwfqsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--获取我的任务的数量-->
+    <select id="getMyRwCount" resultType="java.lang.Integer">
+        select count(1) from tb_rw_task a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.jssj != null and dto.kssj != '' and dto.jssj != ''">
+            and a.rwfqsj &gt; #{kssj}
+            and a.rwfqsj &lt; #{jssj}
+        </if>
+        <if test="dto.rwmc != null and dto.rwmc != ''">
+            and a.rwmc like concat('%',#{dto.rwmc},'%')
+        </if>
+        <if test="dto.rwnr != null and dto.rwnr != ''">
+            and a.rwnr like concat('%',#{dto.rwnr},'%')
+        </if>
+        <if test="dto.rwxl != null and dto.rwxl != ''">
+            and a.rwxl = #{dto.rwxl}
+        </if>
+        <if test="dto.rwlx != null and dto.rwlx != ''">
+            and a.rwlx = #{dto.rwlx}
+        </if>
+        <if test="dto.rwjjcd != null and dto.rwjjcd != ''">
+            and a.rwjjcd = #{dto.rwjjcd}
+        </if>
+        <if test="dto.rwzt != null and dto.rwzt != ''">
+            and a.rwzt = #{dto.rwzt}
+        </if>
+        and a.id in (
+        select rwid from tb_rw_task_user b where b.xt_scbz = '0' and b.xt_sjzt = '1'
+        and case
+        when b.rwjsdx = '01' then b.jsrsfzh = #{sfzh}
+
+        when b.rwjsdx = '02' then b.jsbmdm = #{ssbmid}
+
+        when b.rwjsdx = '03' then
+        b.jsxzid in (select c.id from mosty_qwgl.tb_qw_xfbb c,mosty_qwgl.tb_qw_jl d where c.id = d.ywid and
+        c.xt_sjzt = '1' and c.xt_scbz = '0' and d.xt_sjzt = '1' and d.xt_scbz = '0' and
+        (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+        end
+        <if test="dto.grrwzt != null and dto.grrwzt != ''">
+            and b.rwzt = #{dto.grrwzt}
+        </if>
+        )
+    </select>
+
+    <select id="getCount" resultType="java.lang.Integer">
+        select count(1) from tb_rw_task a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="rwjxzt != null and rwjxzt != ''">
+            and a.rwjxzt = #{rwjxzt}
+        </if>
+        <if test="time != null">
+            and DATE_FORMAT(a.rwfqsj,'%Y-%m-%d')
+            between DATE_FORMAT(#{time},'%Y-%m-%d')
+            and DATE_FORMAT(now(),'%Y-%m-%d')
+        </if>
+        <if test="sfzh != null and sfzh != ''">
+            and a.id in (
+            select rwid from tb_rw_task_user b where b.jsrsfzh = #{sfzh}
+            )
+        </if>
+    </select>
+
+    <select id="getTaskByDept" resultType="Map">
+        select ssbmdm, ssbm, count(ssbmdm) as count
+        from tb_rw_task_user a
+        where a.xt_scbz = '0'
+          and a.xt_sjzt = '1'
+          and a.ssbmdm is not null
+        group by ssbmdm, ssbm
+        order by count(ssbmdm) desc;
+    </select>
+
+    <select id="getCountByDept" resultType="Integer">
+        select count(1) from tb_rw_task_user b where b.xt_scbz = '0' and b.xt_sjzt = '1'
+        and ssbmdm = #{ssbmdm}
+        <if test='type == "1"'>
+            and rwzt = '2'
+        </if>
+        <if test='type == "2"'>
+            and rwzt != '2'
+        </if>
+    </select>
+
+    <select id="myRwCount" resultType="Map">
+        select count(1) count, rwxl
+        from tb_rw_task_user b
+        where b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and case
+                when b.rwjsdx = '01' then b.jsrsfzh = #{sfzh}
+
+                when b.rwjsdx = '02' then b.jsbmdm = #{ssbmid}
+
+                when b.rwjsdx = '03' then
+                        b.jsxzid in (select c.id
+                                     from mosty_qwgl.tb_qw_xfbb c,
+                                          mosty_qwgl.tb_qw_jl d
+                                     where c.id = d.ywid
+                                       and c.xt_sjzt = '1'
+                                       and c.xt_scbz = '0'
+                                       and d.xt_sjzt = '1'
+                                       and d.xt_scbz = '0'
+                                       and (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+                end
+        group by rwxl
+    </select>
+
+    <select id="rwCountByState" resultType="java.util.Map">
+        select count(1) count, rwjxzt from tb_rw_task a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.jssj != null and dto.kssj != '' and dto.jssj != ''">
+            and a.rwfqsj &gt; #{dto.kssj}
+            and a.rwfqsj &lt; #{dto.jssj}
+        </if>
+        <if test="dto.rwnr != null and dto.rwnr != ''">
+            and a.rwnr like concat('%',#{dto.rwnr},'%')
+        </if>
+        <if test="rwxlList != null and rwxlList.size() != 0">
+            and a.rwxl in
+            <foreach collection="rwxlList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="rwjsdxList != null and rwjsdxList.size() != 0">
+            and a.rwjsdx in
+            <foreach collection="rwjsdxList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.rwzt != null and dto.rwzt != ''">
+            and a.rwzt = #{dto.rwzt}
+        </if>
+        group by rwjxzt
+    </select>
+
+    <select id="getYclTask" resultType="java.lang.Integer">
+        select count(1)
+        from tb_rw_task_user_all b
+        where b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and case
+                when b.rwjsdx = '01' then b.jsrsfzh = #{sfzh}
+
+                when b.rwjsdx = '02' then b.jsbmdm = #{ssbmid}
+
+                when b.rwjsdx = '03' then
+                        b.jsxzid in (select c.id
+                                     from mosty_qwgl.tb_qw_xfbb c,
+                                          mosty_qwgl.tb_qw_jl d
+                                     where c.id = d.ywid
+                                       and c.xt_sjzt = '1'
+                                       and c.xt_scbz = '0'
+                                       and d.xt_sjzt = '1'
+                                       and d.xt_scbz = '0'
+                                       and (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+                end
+          and (grrwzt = '2' or rwjxzt = '3' or rwjxzt = '4')
+    </select>
+
+    <select id="getMyRwListYwc" resultType="com.mosty.base.model.entity.rwzx.TbRwTaskUserAll">
+        select * from tb_rw_task_user_all a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.jssj != null and dto.kssj != '' and dto.jssj != ''">
+            and a.rwfqsj &gt; #{kssj}
+            and a.rwfqsj &lt; #{jssj}
+        </if>
+        <if test="dto.rwxl != null and dto.rwxl != ''">
+            and a.rwxl = #{dto.rwxl}
+        </if>
+        <if test="dto.rwmc != null and dto.rwmc != ''">
+            and a.rwmc like concat('%',#{dto.rwmc},'%')
+        </if>
+        <if test="dto.rwnr != null and dto.rwnr != ''">
+            and a.rwnr like concat('%',#{dto.rwnr},'%')
+        </if>
+        <if test="dto.rwlx != null and dto.rwlx != ''">
+            and a.rwlx = #{dto.rwlx}
+        </if>
+        <if test="dto.rwjjcd != null and dto.rwjjcd != ''">
+            and a.rwjjcd = #{dto.rwjjcd}
+        </if>
+        <if test="dto.rwzt != null and dto.rwzt != ''">
+            and a.rwzt = #{dto.rwzt}
+        </if>
+        and case
+        when a.rwjsdx = '01' then a.jsrsfzh = #{sfzh}
+
+        when a.rwjsdx = '02' then a.jsbmdm = #{ssbmid}
+
+        when a.rwjsdx = '03' then
+        a.jsxzid in (select c.id from mosty_qwgl.tb_qw_xfbb c,mosty_qwgl.tb_qw_jl d where c.id = d.ywid and
+        c.xt_sjzt = '1' and c.xt_scbz = '0' and d.xt_sjzt = '1' and d.xt_scbz = '0' and
+        (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+        end
+        and (grrwzt = '2' or rwjxzt = '3' or rwjxzt = '4')
+        order by a.rwfqsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="getMyRwCountYwc" resultType="integer">
+        select count(1) from tb_rw_task_user_all a where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.jssj != null and dto.kssj != '' and dto.jssj != ''">
+            and a.rwfqsj &gt; #{kssj}
+            and a.rwfqsj &lt; #{jssj}
+        </if>
+        <if test="dto.rwxl != null and dto.rwxl != ''">
+            and a.rwxl = #{dto.rwxl}
+        </if>
+        <if test="dto.rwmc != null and dto.rwmc != ''">
+            and a.rwmc like concat('%',#{dto.rwmc},'%')
+        </if>
+        <if test="dto.rwnr != null and dto.rwnr != ''">
+            and a.rwnr like concat('%',#{dto.rwnr},'%')
+        </if>
+        <if test="dto.rwlx != null and dto.rwlx != ''">
+            and a.rwlx = #{dto.rwlx}
+        </if>
+        <if test="dto.rwjjcd != null and dto.rwjjcd != ''">
+            and a.rwjjcd = #{dto.rwjjcd}
+        </if>
+        <if test="dto.rwzt != null and dto.rwzt != ''">
+            and a.rwzt = #{dto.rwzt}
+        </if>
+        and case
+        when a.rwjsdx = '01' then a.jsrsfzh = #{sfzh}
+
+        when a.rwjsdx = '02' then a.jsbmdm = #{ssbmid}
+
+        when a.rwjsdx = '03' then
+        a.jsxzid in (select c.id from mosty_qwgl.tb_qw_xfbb c,mosty_qwgl.tb_qw_jl d where c.id = d.ywid and
+        c.xt_sjzt = '1' and c.xt_scbz = '0' and d.xt_sjzt = '1' and d.xt_scbz = '0' and
+        (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+        end
+        and (grrwzt = '2' or rwjxzt = '3' or rwjxzt = '4')
+    </select>
+
+    <select id="checkHasNewTask" resultType="int">
+        select count(1)
+        from tb_rw_task_user b
+        where b.xt_scbz = '0'
+          and b.xt_sjzt = '1'
+          and case
+                when b.rwjsdx = '01' then b.jsrsfzh = #{sfzh}
+
+                when b.rwjsdx = '02' then b.jsbmdm = #{ssbmid}
+
+                when b.rwjsdx = '03' then
+                        b.jsxzid in (select c.id
+                                     from mosty_qwgl.tb_qw_xfbb c,
+                                          mosty_qwgl.tb_qw_jl d
+                                     where c.id = d.ywid
+                                       and c.xt_sjzt = '1'
+                                       and c.xt_scbz = '0'
+                                       and d.xt_sjzt = '1'
+                                       and d.xt_scbz = '0'
+                                       and (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+                end
+          and date_format(rwfqsj, '%Y-%m-%d %H:%i:%s') >= #{time}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserAllMapper.xml b/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserAllMapper.xml
new file mode 100644
index 0000000..67f0d07
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserAllMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.rwzx.mapper.TbRwTaskUserAllMapper">
+
+    <select id="selectByRwId" resultType="com.mosty.base.model.entity.rwzx.TbRwTaskUserAll">
+        select *
+        from tb_rw_task_user_all a
+        where a.xt_scbz = '0'
+          and a.xt_sjzt = '1'
+          and a.rwid = #{rwid}
+          and case
+                when a.rwjsdx = '01' then a.jsrsfzh = #{sfzh}
+
+                when a.rwjsdx = '03' then
+                        a.jsxzid in (select c.id
+                                     from mosty_qwgl.tb_qw_xfbb c,
+                                          mosty_qwgl.tb_qw_jl d
+                                     where c.id = d.ywid
+                                       and c.xt_sjzt = '1'
+                                       and c.xt_scbz = '0'
+                                       and d.xt_sjzt = '1'
+                                       and d.xt_scbz = '0'
+                                       and (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+
+                when a.rwjsdx = '02' then
+                        a.jsbmdm = #{ssbmid}
+                end
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserMapper.xml b/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserMapper.xml
new file mode 100644
index 0000000..21f005a
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/mapper/TbRwTaskUserMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.rwzx.mapper.TbRwTaskUserMapper">
+    <select id="selectByRwId" resultType="com.mosty.base.model.entity.rwzx.TbRwTaskUser">
+        select *
+        from tb_rw_task_user a
+        where a.xt_scbz = '0'
+          and a.xt_sjzt = '1'
+          and a.rwid = #{rwid}
+          and case
+                when a.rwjsdx = '01' then a.jsrsfzh = #{sfzh}
+
+                when a.rwjsdx = '03' then
+                        a.jsxzid in (select c.id
+                                     from mosty_qwgl.tb_qw_xfbb c,
+                                          mosty_qwgl.tb_qw_jl d
+                                     where c.id = d.ywid
+                                       and c.xt_sjzt = '1'
+                                       and c.xt_scbz = '0'
+                                       and d.xt_sjzt = '1'
+                                       and d.xt_scbz = '0'
+                                       and (c.fzr_sfzh = #{sfzh} or d.sfzh = #{sfzh}))
+
+                when a.rwjsdx = '02' then
+                        a.jsbmdm = #{ssbmid}
+                end
+    </select>
+
+    <delete id="deleteEntity">
+        delete
+        from tb_rw_task_user
+        where id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/mosty-rwzx/src/main/resources/rebel.xml b/mosty-rwzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..51a70d2
--- /dev/null
+++ b/mosty-rwzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-rwzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-rwzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-rzzx/mosty-rzzx.iml b/mosty-rzzx/mosty-rzzx.iml
new file mode 100644
index 0000000..9b7bf9f
--- /dev/null
+++ b/mosty-rzzx/mosty-rzzx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353923" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-rzzx/pom.xml b/mosty-rzzx/pom.xml
new file mode 100644
index 0000000..a11cdc4
--- /dev/null
+++ b/mosty-rzzx/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-rzzx</artifactId>
+    <description>日志中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/MostyRzzxApplication.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/MostyRzzxApplication.java
new file mode 100644
index 0000000..884563b
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/MostyRzzxApplication.java
@@ -0,0 +1,25 @@
+package com.mosty.rzzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.rzzx.mapper")
+@EnableScheduling
+@EnableDiscoveryClient
+@SpringBootApplication
+public class MostyRzzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyRzzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/config/FeignConfig.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/FeignConfig.java
new file mode 100644
index 0000000..68c0b38
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.rzzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/config/GlobalYmlConfig.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..363367e
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.rzzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/config/WebMvcConfig.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..2915510
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.rzzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/RzzxStatisticsController.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/RzzxStatisticsController.java
new file mode 100644
index 0000000..e17112d
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/RzzxStatisticsController.java
@@ -0,0 +1,69 @@
+package com.mosty.rzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rzzx.TbRzXtfkInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzXtfk;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import com.mosty.base.model.query.rzzx.TbRzXtfkQueryDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.rzzx.service.RzzxStatisticsService;
+import com.mosty.rzzx.service.TbRzXtfkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 系统反馈日志接口
+ **/
+@Api(tags = "日志中心统计接口--原magic接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/yjsj")
+public class RzzxStatisticsController {
+
+    private final RzzxStatisticsService rzzxStatisticsService;
+
+    @ApiOperation("列表查询")
+    @JwtSysUser
+    @GetMapping("/lbcx")
+    public ResponseResult<IPage<Map<String, Object>>> lbcx(TbRzHjQueryDto dto) {
+        return ResponseResult.success(this.rzzxStatisticsService.lbcx(dto));
+    }
+
+    @ApiOperation("各部门反馈统计(市级权限)")
+    @JwtSysUser
+    @GetMapping("/tjfx/sjfktj")
+    public ResponseResult<List<Map<String, Object>>> sjfktj() {
+        return ResponseResult.success(this.rzzxStatisticsService.sjfktj());
+    }
+
+    @ApiOperation("各部门反馈统计(县级权限)")
+    @JwtSysUser
+    @GetMapping("/tjfx/xjfktj")
+    public ResponseResult<List<Map<String, Object>>> xjfktj() {
+        return ResponseResult.success(this.rzzxStatisticsService.xjfktj());
+    }
+
+    @ApiOperation("各类反馈统计")
+    @JwtSysUser
+    @GetMapping("/tjfx/glfktj")
+    public ResponseResult<List<Map<String, Object>>> glfktj() {
+        return ResponseResult.success(this.rzzxStatisticsService.glfktj());
+    }
+
+    @ApiOperation("各系统反馈统计")
+    @JwtSysUser
+    @GetMapping("/tjfx/gxtfktj")
+    public ResponseResult<List<Map<String, Object>>> gxtfktj() {
+        return ResponseResult.success(this.rzzxStatisticsService.gxtfktj());
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzDyjkController.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzDyjkController.java
new file mode 100644
index 0000000..75bc6a4
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzDyjkController.java
@@ -0,0 +1,63 @@
+package com.mosty.rzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzDyjk;
+import com.mosty.base.model.query.rzzx.TbRzDyjkQueryDto;
+import com.mosty.rzzx.service.TbRzDyjkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 接口调用日志接口
+ **/
+@Api(tags = "日志中心-接口调用日志接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbRzDyjk")
+public class TbRzDyjkController extends BaseController {
+
+    private final TbRzDyjkService tbRzDyjkService;
+
+    @ApiOperation("接口调用日志接口新增")
+    @JwtSysUser
+    @Log(title = "接口调用日志接口新增", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public ResponseResult<Integer> insertEntity(@RequestBody TbRzDyjkInsertDto dto) {
+        return ResponseResult.success(this.tbRzDyjkService.insertEntity(dto));
+    }
+
+    @ApiOperation("接口调用日志接口修改-补充调用结束时间")
+    @JwtSysUser
+    @Log(title = "接口调用日志接口修改-补充调用结束时间", businessType = BusinessType.UPDATE)
+    @PostMapping("update")
+    public ResponseResult<Integer> updateEntity(@RequestBody TbRzDyjkUpdateDto dto) {
+        return ResponseResult.success(this.tbRzDyjkService.updateEntity(dto));
+    }
+
+    @ApiOperation("接口调用日志详情")
+    @JwtSysUser
+    @GetMapping("getInfo/{id}")
+    public ResponseResult<TbRzDyjk> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRzDyjkService.getInfo(id));
+    }
+
+    @ApiOperation("分页查询接口")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<IPage<TbRzDyjk>> getList(TbRzDyjkQueryDto dto) {
+        return ResponseResult.success(this.tbRzDyjkService.getList(dto));
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzHjController.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzHjController.java
new file mode 100644
index 0000000..c2a5740
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzHjController.java
@@ -0,0 +1,62 @@
+package com.mosty.rzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.rzzx.TbRzHjInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzHjUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzHj;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import com.mosty.rzzx.service.TbRzHjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 呼叫日志接口
+ **/
+@Api(tags = "日志中心-呼叫日志接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbRzHj")
+public class TbRzHjController {
+
+    private final TbRzHjService tbRzHjService;
+
+    @ApiOperation("呼叫日志接口新增")
+    @JwtSysUser
+    @Log(title = "呼叫日志接口新增", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public ResponseResult<Integer> insertEntity(@RequestBody TbRzHjInsertDto dto) {
+        return ResponseResult.success(this.tbRzHjService.insertEntity(dto));
+    }
+
+    @ApiOperation("呼叫日志接口修改-修改结束时间")
+    @JwtSysUser
+    @Log(title = "呼叫日志接口修改-修改结束时间", businessType = BusinessType.UPDATE)
+    @PostMapping("update")
+    public ResponseResult<Integer> updateEntity(@RequestBody TbRzHjUpdateDto dto) {
+        return ResponseResult.success(this.tbRzHjService.updateEntity(dto));
+    }
+
+    @ApiOperation("查询呼叫详情接口")
+    @JwtSysUser
+    @GetMapping("getInfo/{id}")
+    public ResponseResult<TbRzHj> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRzHjService.getInfo(id));
+    }
+
+    @ApiOperation("查询分页列表")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<IPage<TbRzHj>> getList(TbRzHjQueryDto dto) {
+        return ResponseResult.success(this.tbRzHjService.getList(dto));
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzSpbfController.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzSpbfController.java
new file mode 100644
index 0000000..4f897dd
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzSpbfController.java
@@ -0,0 +1,70 @@
+package com.mosty.rzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.rzzx.TbRzSpbfInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzSpbf;
+import com.mosty.base.model.query.rzzx.TbRzSpbfQueryDto;
+import com.mosty.rzzx.service.TbRzSpbfService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/12
+ * 视频播放日志接口
+ **/
+@Api(tags = "视频巡逻方案-摄像头接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbSpxlSpxlfaSxt")
+public class TbRzSpbfController {
+
+    private final TbRzSpbfService tbRzSpbfService;
+
+    @ApiOperation("视频开始播放")
+    @JwtSysUser
+    @Log(title = "视频开始播放", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResponseResult<Integer> insertEntity(@RequestBody TbRzSpbfInsertDto dto) {
+        return ResponseResult.success(this.tbRzSpbfService.insertEntity(dto));
+    }
+
+    @ApiOperation("视频结束播放")
+    @JwtSysUser
+    @Log(title = "视频结束播放", businessType = BusinessType.UPDATE)
+    @PutMapping("{id}")
+    public ResponseResult<Integer> updateEntity(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRzSpbfService.updateEntity(id));
+    }
+
+    @ApiOperation("视频播放日志分页查询")
+    @JwtSysUser
+    @Log(title = "视频结束播放", businessType = BusinessType.UPDATE)
+    @GetMapping
+    public ResponseResult<IPage<TbRzSpbf>> getPageList(TbRzSpbfQueryDto dto) {
+        return ResponseResult.success(this.tbRzSpbfService.getPageList(dto));
+    }
+
+    @ApiOperation("查询视频日志详情信息")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbRzSpbf> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRzSpbfService.getInfo(id));
+    }
+    @ApiOperation("来源id修改-视频结束播放")
+    @JwtSysUser
+    @Log(title = "来源id修改-视频结束播放", businessType = BusinessType.UPDATE)
+    @PostMapping("updateLyId")
+    public ResponseResult<Boolean> updateLyId(@RequestBody String lyId) {
+        return ResponseResult.success(this.tbRzSpbfService.updateLyId(lyId));
+    }
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzXtfkController.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzXtfkController.java
new file mode 100644
index 0000000..fbcd965
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/controller/TbRzXtfkController.java
@@ -0,0 +1,70 @@
+package com.mosty.rzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.rzzx.TbRzXtfkInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzXtfk;
+import com.mosty.base.model.query.rzzx.TbRzXtfkQueryDto;
+import com.mosty.rzzx.service.TbRzXtfkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ * 系统反馈日志接口
+ **/
+@Api(tags = "日志中心-系统反馈日志接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbRzXtfk")
+public class TbRzXtfkController {
+
+    private final TbRzXtfkService tbRzXtfkService;
+
+    @ApiOperation("新增系统反馈日志")
+    @PostMapping("addEntity")
+    @JwtSysUser
+    @Log(title = "新增系统反馈日志", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> insertEntity(@RequestBody TbRzXtfkInsertDto dto) {
+        return ResponseResult.success(this.tbRzXtfkService.insertEntity(dto));
+    }
+
+    @ApiOperation("修改系统反馈日志")
+    @JwtSysUser
+    @Log(title = "修改系统反馈日志", businessType = BusinessType.UPDATE)
+    @PostMapping("updateById")
+    public ResponseResult<Boolean> updateById(@RequestBody TbRzXtfkInsertDto dto) {
+        return ResponseResult.success(this.tbRzXtfkService.updateEntity(dto));
+    }
+
+    @ApiOperation("删除系统反馈日志")
+    @JwtSysUser
+    @DeleteMapping("delEntity")
+    @Log(title = "删除系统反馈日志", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> delEntity(String id) {
+        this.tbRzXtfkService.deleteEntity(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询系统反馈日志详情接口")
+    @JwtSysUser
+    @GetMapping("getInfo/{id}")
+    public ResponseResult<TbRzXtfk> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbRzXtfkService.getInfo(id));
+    }
+
+    @ApiOperation("查询系统反馈日志分页列表")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<IPage<TbRzXtfk>> getList(TbRzXtfkQueryDto dto) {
+        return ResponseResult.success(this.tbRzXtfkService.getList(dto));
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/RzzxStatisticsMapper.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/RzzxStatisticsMapper.java
new file mode 100644
index 0000000..0128a2e
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/RzzxStatisticsMapper.java
@@ -0,0 +1,30 @@
+package com.mosty.rzzx.mapper;
+
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RzzxStatisticsMapper {
+
+    @ApiOperation("各部门反馈统计(市级权限)")
+    List<Map<String, Object>> sjfktj(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("各部门反馈统计(县级权限)")
+    List<Map<String, Object>> xjfktj(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("各类反馈统计")
+    List<Map<String, Object>> glfktj(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("各系统反馈统计")
+    List<Map<String, Object>> gxtfktj(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("列表查询数量")
+    int lbcxCount(Map<String, Object> map);
+
+    @ApiOperation("列表查询")
+    List<Map<String, Object>> lbcxList(Map<String, Object> map);
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzDyjkMapper.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzDyjkMapper.java
new file mode 100644
index 0000000..19a5021
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzDyjkMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.rzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rzzx.TbRzDyjk;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 接口调用日志--Mapper
+ **/
+@Mapper
+public interface TbRzDyjkMapper extends BaseMapper<TbRzDyjk> {
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzHjMapper.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzHjMapper.java
new file mode 100644
index 0000000..c15e6ea
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzHjMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.rzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rzzx.TbRzHj;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ **/
+@Mapper
+public interface TbRzHjMapper extends BaseMapper<TbRzHj> {
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzSpbfMapper.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzSpbfMapper.java
new file mode 100644
index 0000000..966f248
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzSpbfMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.rzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rzzx.TbRzSpbf;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/12
+ * 视屏播放日志mapper
+ **/
+@Mapper
+public interface TbRzSpbfMapper extends BaseMapper<TbRzSpbf> {
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzXtfkMapper.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzXtfkMapper.java
new file mode 100644
index 0000000..4fadf83
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mapper/TbRzXtfkMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.rzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.rzzx.TbRzXtfk;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ **/
+@Mapper
+public interface TbRzXtfkMapper extends BaseMapper<TbRzXtfk> {
+
+    Integer updateEntity(String id);
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..8a4cd3f
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,118 @@
+package com.mosty.rzzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+			//根据属性名字设置要填充的值
+			if (metaObject.hasGetter("xtSjzt")) {
+				if (metaObject.getValue("xtSjzt") == null) {
+					this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+				}
+			}
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptCode()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtZhgxrid")) {
+                if (metaObject.getValue("xtZhgxrid") == null) {
+                    this.strictInsertFill(metaObject, "xtZhgxrid", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, userInfo.getDeptCode());
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/MybatisPlusConfig.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..34c0d3f
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.rzzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/remote/TbBaseAdaptRemoteService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..a337597
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,53 @@
+package com.mosty.rzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ *  调用部门信息远程适配层
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+    // 根据部门编码查询部门信息
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/RzzxStatisticsService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/RzzxStatisticsService.java
new file mode 100644
index 0000000..133de72
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/RzzxStatisticsService.java
@@ -0,0 +1,26 @@
+package com.mosty.rzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface RzzxStatisticsService {
+
+    @ApiOperation("各部门反馈统计(市级权限)")
+    List<Map<String,Object>> sjfktj();
+
+    @ApiOperation("各部门反馈统计(县级权限)")
+    List<Map<String,Object>> xjfktj();
+
+    @ApiOperation("各类反馈统计")
+    List<Map<String,Object>> glfktj();
+
+    @ApiOperation("各系统反馈统计")
+    List<Map<String,Object>> gxtfktj();
+
+    @ApiOperation("列表查询")
+    IPage<Map<String,Object>> lbcx(TbRzHjQueryDto dto);
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzDyjkService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzDyjkService.java
new file mode 100644
index 0000000..845c473
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzDyjkService.java
@@ -0,0 +1,28 @@
+package com.mosty.rzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzDyjk;
+import com.mosty.base.model.query.rzzx.TbRzDyjkQueryDto;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 接口调用日志--服务类
+ **/
+public interface TbRzDyjkService {
+
+    @ApiOperation("接口调用日志接口新增")
+    int insertEntity(TbRzDyjkInsertDto dto);
+
+    @ApiOperation("接口调用日志接口修改-补充调用结束时间")
+    int updateEntity(TbRzDyjkUpdateDto dto);
+
+    @ApiOperation("接口调用日志详情")
+    TbRzDyjk getInfo(String id);
+
+    @ApiOperation("分页查询接口")
+    IPage<TbRzDyjk> getList(TbRzDyjkQueryDto dto);
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzHjService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzHjService.java
new file mode 100644
index 0000000..3e49f31
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzHjService.java
@@ -0,0 +1,28 @@
+package com.mosty.rzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rzzx.TbRzHjInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzHjUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzHj;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 呼叫日志接口--实现类
+ **/
+public interface TbRzHjService {
+
+    @ApiOperation("呼叫日志新增")
+    int insertEntity(TbRzHjInsertDto dto);
+
+    @ApiOperation("呼叫日志接口修改-修改结束时间")
+    int updateEntity(TbRzHjUpdateDto dto);
+
+    @ApiOperation("查询呼叫详情接口")
+    TbRzHj getInfo(String id);
+
+    @ApiOperation("分页查询接口")
+    IPage<TbRzHj> getList(TbRzHjQueryDto dto);
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzSpbfService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzSpbfService.java
new file mode 100644
index 0000000..18360a3
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzSpbfService.java
@@ -0,0 +1,29 @@
+package com.mosty.rzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rzzx.TbRzSpbfInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzSpbf;
+import com.mosty.base.model.query.rzzx.TbRzSpbfQueryDto;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/7/12
+ * 视频播放日志服务类
+ **/
+public interface TbRzSpbfService {
+
+    @ApiOperation("视频播放日志新增")
+    int insertEntity(TbRzSpbfInsertDto dto);
+
+    @ApiOperation("视频结束播放")
+    int updateEntity(String id);
+
+    @ApiOperation("视频播放日志查询")
+    IPage<TbRzSpbf> getPageList(TbRzSpbfQueryDto dto);
+
+    @ApiOperation("查询视频日志详情信息")
+    TbRzSpbf getInfo(String id);
+
+    Boolean updateLyId(String lyId);
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzXtfkService.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzXtfkService.java
new file mode 100644
index 0000000..00f4eb4
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/TbRzXtfkService.java
@@ -0,0 +1,30 @@
+package com.mosty.rzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.rzzx.TbRzXtfkInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzXtfk;
+import com.mosty.base.model.query.rzzx.TbRzXtfkQueryDto;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ **/
+public interface TbRzXtfkService {
+
+    @ApiOperation("新增系统反馈日志")
+    int insertEntity(TbRzXtfkInsertDto dto);
+
+    @ApiOperation("查询系统反馈日志详情接口")
+    TbRzXtfk getInfo(String id);
+
+    @ApiOperation("查询系统反馈日志分页列表")
+    IPage<TbRzXtfk> getList(TbRzXtfkQueryDto dto);
+
+    @ApiOperation("更新系统反馈日志")
+    Boolean updateEntity(TbRzXtfkInsertDto dto);
+
+    @ApiOperation("删除系统反馈日志")
+    void deleteEntity(String id);
+
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/RzzxStatisticsServiceImpl.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/RzzxStatisticsServiceImpl.java
new file mode 100644
index 0000000..4489b03
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/RzzxStatisticsServiceImpl.java
@@ -0,0 +1,71 @@
+package com.mosty.rzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rzzx.mapper.RzzxStatisticsMapper;
+import com.mosty.rzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rzzx.service.RzzxStatisticsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class RzzxStatisticsServiceImpl implements RzzxStatisticsService {
+
+    private final RzzxStatisticsMapper rzzxStatisticsMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    @Override
+    public List<Map<String, Object>> sjfktj() {
+//        Map<String, Object> map = new HashMap<>();
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.rzzxStatisticsMapper.sjfktj(ssbmdm);
+    }
+
+    @Override
+    public List<Map<String, Object>> xjfktj() {
+        Map<String, Object> map = new HashMap<>();
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.rzzxStatisticsMapper.xjfktj(ssbmdm);
+    }
+
+    @Override
+    public List<Map<String, Object>> glfktj() {
+        Map<String, Object> map = new HashMap<>();
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.rzzxStatisticsMapper.glfktj(ssbmdm);
+    }
+
+    @Override
+    public List<Map<String, Object>> gxtfktj() {
+        Map<String, Object> map = new HashMap<>();
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        return this.rzzxStatisticsMapper.gxtfktj(ssbmdm);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> lbcx(TbRzHjQueryDto dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        map.put("ssbmdm",ssbmdm);
+        int count = this.rzzxStatisticsMapper.lbcxCount(map);
+        List<Map<String, Object>> list = this.rzzxStatisticsMapper.lbcxList(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzDyjkServiceImpl.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzDyjkServiceImpl.java
new file mode 100644
index 0000000..47fc016
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzDyjkServiceImpl.java
@@ -0,0 +1,94 @@
+package com.mosty.rzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzDyjkUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzDyjk;
+import com.mosty.base.model.query.rzzx.TbRzDyjkQueryDto;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rzzx.mapper.TbRzDyjkMapper;
+import com.mosty.rzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rzzx.service.TbRzDyjkService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 接口调用日志--服务--实现类
+ **/
+@AllArgsConstructor
+@Service
+public class TbRzDyjkServiceImpl extends ServiceImpl<TbRzDyjkMapper, TbRzDyjk>
+        implements TbRzDyjkService {
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int insertEntity(TbRzDyjkInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbRzDyjk item = new TbRzDyjk();
+        BeanUtils.copyProperties(dto, item);
+        item.setXtSjly("1");
+        item.setCzrid(String.valueOf(user.getUserId()));
+        item.setCzrsfzh(user.getIdEntityCard());
+        item.setCzrxm(user.getUserName());
+        item.setSsbm(user.getDeptName());
+        item.setSsbmid(String.valueOf(user.getDeptId()));
+        item.setSsbmdm(user.getDeptCode());
+        item.setSsxgaj(user.getFxjDeptName());
+        item.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        item.setSsxgajdm(user.getFxjDeptCode());
+        item.setSssgaj(user.getDszDeptName());
+        item.setSssgajid(String.valueOf(user.getDszDeptId()));
+        item.setSssgajdm(user.getDszDeptCode());
+        item.setDysj(new Date());
+        return this.baseMapper.insert(item);
+    }
+
+    @Override
+    public int updateEntity(TbRzDyjkUpdateDto dto) {
+        TbRzDyjk item = this.baseMapper.selectById(dto.getId());
+        if (item != null) {
+            item.setJkfh(dto.getJkfh());
+            item.setSfcg(dto.getSfcg());
+            Date endDate = new Date();
+            item.setFhsj(endDate);
+            Integer time = (int) (endDate.getTime() - item.getDysj().getTime()) / 1000;
+            item.setHs(time);
+            return this.baseMapper.updateById(item);
+        }
+        return 0;
+    }
+
+    @Override
+    public TbRzDyjk getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbRzDyjk> getList(TbRzDyjkQueryDto dto) {
+        QueryWrapper<TbRzDyjk> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.lambda()
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbRzDyjk::getSsbmdm, dto.getSsbmdm())
+                        .like(StringUtils.isNotBlank(dto.getCzrxm()), TbRzDyjk::getCzrxm, dto.getCzrxm())
+                        .eq(StringUtils.isNotBlank(dto.getSfcg()), TbRzDyjk::getSfcg, dto.getSfcg())
+                        .like(StringUtils.isNotBlank(dto.getJkxt()), TbRzDyjk::getJkxt, dto.getJkxt())
+                        .ge(StringUtils.isNotBlank(dto.getStartTime()), TbRzDyjk::getDysj, dto.getStartTime())
+                        .le(StringUtils.isNotBlank(dto.getEndTime()), TbRzDyjk::getDysj, dto.getEndTime())
+        );
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzHjServiceImpl.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzHjServiceImpl.java
new file mode 100644
index 0000000..a69f407
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzHjServiceImpl.java
@@ -0,0 +1,88 @@
+package com.mosty.rzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.dto.rzzx.TbRzHjInsertDto;
+import com.mosty.base.model.dto.rzzx.TbRzHjUpdateDto;
+import com.mosty.base.model.entity.rzzx.TbRzHj;
+import com.mosty.base.model.query.rzzx.TbRzHjQueryDto;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rzzx.mapper.TbRzHjMapper;
+import com.mosty.rzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rzzx.service.TbRzHjService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 呼叫接口日志实现类
+ **/
+@AllArgsConstructor
+@Service
+public class TbRzHjServiceImpl extends ServiceImpl<TbRzHjMapper, TbRzHj> implements TbRzHjService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    @Override
+    public int insertEntity(TbRzHjInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbRzHj hj = new TbRzHj();
+        BeanUtils.copyProperties(dto, hj);
+        hj.setFjrId(String.valueOf(user.getUserId()));
+        hj.setFjrSfzh(user.getIdEntityCard());
+        hj.setFjrXm(user.getUserName());
+        hj.setKssj(new Date());
+        hj.setSsbm(user.getDeptName());
+        hj.setSsbmid(String.valueOf(user.getDeptId()));
+        hj.setSsbmdm(user.getDeptCode());
+        hj.setSsxgaj(user.getFxjDeptName());
+        hj.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        hj.setSsxgajdm(user.getFxjDeptCode());
+        hj.setSssgaj(user.getDszDeptName());
+        hj.setSssgajid(String.valueOf(user.getDszDeptId()));
+        hj.setSssgajdm(user.getDszDeptCode());
+        return this.baseMapper.insert(hj);
+    }
+
+    @Override
+    public int updateEntity(TbRzHjUpdateDto dto) {
+        TbRzHj hj = this.baseMapper.selectById(dto.getId());
+        if (hj != null) {
+            hj.setSfcg(dto.getSfcg());
+            hj.setJssj(new Date());
+            return this.baseMapper.updateById(hj);
+        }
+        return 0;
+    }
+
+    @Override
+    public TbRzHj getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbRzHj> getList(TbRzHjQueryDto dto) {
+        QueryWrapper<TbRzHj> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.lambda()
+                        .like(StringUtils.isNotBlank(dto.getFjrXm()), TbRzHj::getFjrXm, dto.getFjrXm())
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbRzHj::getSsbmdm, dto.getSsbmdm())
+                        .eq(StringUtils.isNotBlank(dto.getSfcg()), TbRzHj::getSfcg, dto.getSfcg())
+                        .like(StringUtils.isNotBlank(dto.getHjhm()), TbRzHj::getHjhm, dto.getHjhm())
+                        .ge(StringUtils.isNotBlank(dto.getStartTime()), TbRzHj::getKssj, dto.getStartTime())
+                        .le(StringUtils.isNotBlank(dto.getEndTime()), TbRzHj::getKssj, dto.getEndTime())
+        );
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzSpbfServiceImpl.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzSpbfServiceImpl.java
new file mode 100644
index 0000000..4baa276
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzSpbfServiceImpl.java
@@ -0,0 +1,105 @@
+package com.mosty.rzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.dto.rzzx.TbRzSpbfInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzSpbf;
+import com.mosty.base.model.query.rzzx.TbRzSpbfQueryDto;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rzzx.mapper.TbRzSpbfMapper;
+import com.mosty.rzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rzzx.service.TbRzSpbfService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/12
+ * 视频播放日志服务-实现类
+ **/
+@AllArgsConstructor
+@Service
+public class TbRzSpbfServiceImpl extends ServiceImpl<TbRzSpbfMapper, TbRzSpbf>
+        implements TbRzSpbfService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int insertEntity(TbRzSpbfInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbRzSpbf bf = new TbRzSpbf();
+        BeanUtils.copyProperties(dto, bf);
+        bf.setCzip(IpUtil.getIpAddress());
+        bf.setCzrid(String.valueOf(user.getUserId()));
+        bf.setCzrxm(user.getUserName());
+        bf.setCzrsfzh(user.getIdEntityCard());
+        bf.setSsbm(user.getDeptName());
+        bf.setSsbmid(String.valueOf(user.getDeptId()));
+        bf.setSsbmdm(user.getDeptCode());
+        bf.setSsxgaj(user.getFxjDeptName());
+        bf.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        bf.setSsxgajdm(user.getFxjDeptCode());
+        bf.setSssgaj(user.getDszDeptName());
+        bf.setSssgajid(String.valueOf(user.getDszDeptId()));
+        bf.setSssgajdm(user.getDszDeptCode());
+        bf.setKssj(new Date());
+        bf.setXtSjly("1");
+        return this.baseMapper.insert(bf);
+    }
+
+    @Override
+    public int updateEntity(String id) {
+        TbRzSpbf item = this.baseMapper.selectById(id);
+        item.setJssj(new Date());
+        return this.baseMapper.updateById(item);
+    }
+
+    @Override
+    public IPage<TbRzSpbf> getPageList(TbRzSpbfQueryDto dto) {
+        QueryWrapper<TbRzSpbf> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.ge(StringUtils.isNotBlank(dto.getKssj()), "date_format(kssj,'%Y-%m-%d %H:%i:%s')", dto.getKssj())
+                        .le(StringUtils.isNotBlank(dto.getJssj()), "date_format(kssj,'%Y-%m-%d %H:%i:%s')", dto.getJssj())
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), "ssbmdm", dto.getSsbmdm())
+                        .and(StringUtils.isNotBlank(dto.getKeyword()),
+                                wq -> wq.like("sxtid", dto.getKeyword()).or().like("sxtmc", dto.getKeyword())
+                        )
+                        .orderByDesc("xt_cjsj")
+        );
+    }
+
+    @Override
+    public TbRzSpbf getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public Boolean updateLyId(String lyId) {
+        List<TbRzSpbf> ly_id = baseMapper.selectList(new QueryWrapper<TbRzSpbf>().eq(org.apache.commons.lang3.StringUtils.isNotBlank(lyId), "lyid", lyId)
+        .isNotNull("jssj")
+        );
+        if(!(ly_id !=null && ly_id.size()>0)){
+            TbRzSpbf tbRzSpbf = new TbRzSpbf();
+            tbRzSpbf.setJssj(new Date());
+            tbRzSpbf.setLyid(lyId);
+            baseMapper.update(tbRzSpbf, new QueryWrapper<TbRzSpbf>().eq(org.apache.commons.lang3.StringUtils.isNotBlank(lyId), "lyid", lyId));
+        }
+        return true;
+    }
+}
diff --git a/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzXtfkServiceImpl.java b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzXtfkServiceImpl.java
new file mode 100644
index 0000000..7016637
--- /dev/null
+++ b/mosty-rzzx/src/main/java/com/mosty/rzzx/service/impl/TbRzXtfkServiceImpl.java
@@ -0,0 +1,103 @@
+package com.mosty.rzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.rzzx.TbRzXtfkInsertDto;
+import com.mosty.base.model.entity.rzzx.TbRzXtfk;
+import com.mosty.base.model.query.rzzx.TbRzXtfkQueryDto;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.rzzx.mapper.TbRzXtfkMapper;
+import com.mosty.rzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.rzzx.service.TbRzXtfkService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * @author dw
+ * @since 2022/8/4
+ **/
+@AllArgsConstructor
+@Service
+public class TbRzXtfkServiceImpl extends ServiceImpl<TbRzXtfkMapper, TbRzXtfk>
+        implements TbRzXtfkService {
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int insertEntity(TbRzXtfkInsertDto dto) {
+        TbRzXtfk fk = new TbRzXtfk();
+        BeanUtils.copyProperties(dto, fk);
+        fk.setFksj(new Date());
+        fk.setId(UUIDGenerator.getUUID());
+        UserInfo user = UserInfoManager.get();
+        if (user != null) {
+            fk.setFkrid(String.valueOf(user.getUserId()));
+            fk.setFkrsfzh(user.getIdEntityCard());
+            fk.setFkrxm(user.getUserName());
+            fk.setSsbm(user.getDeptName());
+            fk.setSsbmid(String.valueOf(user.getDeptId()));
+            fk.setSsbmdm(user.getDeptCode());
+            fk.setSsxgaj(user.getFxjDeptName());
+            fk.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            fk.setSsxgajdm(user.getFxjDeptCode());
+            fk.setSssgaj(user.getDszDeptName());
+            fk.setSssgajid(String.valueOf(user.getDszDeptId()));
+            fk.setSssgajdm(user.getDszDeptCode());
+            fk.setXtSjly("2");
+        }
+        return this.baseMapper.insert(fk);
+    }
+
+    @Override
+    public TbRzXtfk getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public IPage<TbRzXtfk> getList(TbRzXtfkQueryDto dto) {
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        QueryWrapper<TbRzXtfk> qw = new QueryWrapper<>();
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                qw.lambda()
+                        .eq(StringUtils.isNotBlank(dto.getFklx()), TbRzXtfk::getFklx, dto.getFklx())
+                        .like(StringUtils.isNotBlank(dto.getFkxt()), TbRzXtfk::getFkxt, dto.getFkxt())
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbRzXtfk::getSsbmdm, dto.getSsbmdm())
+                        .like(StringUtils.isNotBlank(dto.getFknr()), TbRzXtfk::getFknr, dto.getFknr())
+                        .like(StringUtils.isNotBlank(dto.getFkrxm()), TbRzXtfk::getFkrxm, dto.getFkrxm())
+                        .eq(StringUtils.isNotBlank(dto.getSsbmdm()), TbRzXtfk::getSsbmdm, dto.getSsbmdm())
+                        .ge(StringUtils.isNotBlank(dto.getStartTime()), TbRzXtfk::getFksj, dto.getStartTime())
+                        .le(StringUtils.isNotBlank(dto.getEndTime()), TbRzXtfk::getFksj, dto.getEndTime())
+                        .eq(TbRzXtfk::getXtScbz, "0").orderByDesc(TbRzXtfk::getXtCjsj)
+        );
+    }
+
+    @Override
+    public Boolean updateEntity(TbRzXtfkInsertDto dto) {
+        TbRzXtfk fk = new TbRzXtfk();
+        BeanUtils.copyProperties(dto, fk);
+        UserInfo user = UserInfoManager.get();
+        System.err.println(user);
+        fk.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        this.baseMapper.updateById(fk);
+        return true;
+    }
+
+    @Override
+    public void deleteEntity(String id) {
+        this.baseMapper.updateEntity(id);
+    }
+}
diff --git a/mosty-rzzx/src/main/resources/application.yml b/mosty-rzzx/src/main/resources/application.yml
new file mode 100644
index 0000000..87caf25
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/application.yml
@@ -0,0 +1,76 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_rzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+      - /tbRzXtfk/add
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-rzzx/src/main/resources/bootstrap.yml b/mosty-rzzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..b6cedc8
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8011
+  servlet:
+    context-path: /mosty-rzzx/
+spring:
+  application:
+    name: mosty-rzzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-rzzx/src/main/resources/logback-spring.xml b/mosty-rzzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-rzzx/src/main/resources/mapper/RzzxStatisticsMapper.xml b/mosty-rzzx/src/main/resources/mapper/RzzxStatisticsMapper.xml
new file mode 100644
index 0000000..ffee990
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/mapper/RzzxStatisticsMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.rzzx.mapper.RzzxStatisticsMapper">
+    <select id="sjfktj" resultType="java.util.Map">
+        select ssxgajdm, fklx, count(1) as sl
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        group by ssxgajdm, fklx
+    </select>
+
+    <select id="xjfktj" resultType="java.util.Map">
+        select ssbmdm, fklx, count(1) as sl
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        group by ssbmdm, fklx
+    </select>
+
+    <select id="glfktj" resultType="java.util.Map">
+        select fklx, count(1) as sl
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        group by fklx
+    </select>
+
+    <select id="gxtfktj" resultType="java.util.Map">
+        select fkxt, count(1) as sl
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        group by fkxt
+    </select>
+
+    <select id="lbcxCount" resultType="int">
+        select count(1)
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+    </select>
+
+    <select id="lbcxList" resultType="java.util.Map">
+        select *
+        from tb_rz_xtfk
+        where xt_sjzt = '1'
+          and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        order by xt_cjsj desc
+                limit #{pageIndex}, #{pageSize}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-rzzx/src/main/resources/mapper/TbRzXtfkMapper.xml b/mosty-rzzx/src/main/resources/mapper/TbRzXtfkMapper.xml
new file mode 100644
index 0000000..d88da1a
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/mapper/TbRzXtfkMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.rzzx.mapper.TbRzXtfkMapper">
+
+    <!--通过主键修改数据-->
+    <update id="updateEntity">
+        update tb_rz_xtfk set xt_scbz = '1' where id = #{id}
+    </update>
+
+</mapper>
+
diff --git a/mosty-rzzx/src/main/resources/rebel.xml b/mosty-rzzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..ccf5de6
--- /dev/null
+++ b/mosty-rzzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-rzzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-rzzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-sjzx/mosty-sjzx.iml b/mosty-sjzx/mosty-sjzx.iml
new file mode 100644
index 0000000..1d9ca38
--- /dev/null
+++ b/mosty-sjzx/mosty-sjzx.iml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353924" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-sjzx/pom.xml b/mosty-sjzx/pom.xml
new file mode 100644
index 0000000..4f41f92
--- /dev/null
+++ b/mosty-sjzx/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-sjzx</artifactId>
+    <description>事件中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/MostySjzxApplication.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/MostySjzxApplication.java
new file mode 100644
index 0000000..f6b5716
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/MostySjzxApplication.java
@@ -0,0 +1,29 @@
+package com.mosty.sjzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ *	事件中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 19:15 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.sjzx.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+public class MostySjzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostySjzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/config/FeignConfig.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/FeignConfig.java
new file mode 100644
index 0000000..028bb23
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.sjzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/config/GlobalYmlConfig.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..547bf1e
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.sjzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/config/WebMvcConfig.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..b7b3bd4
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.sjzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/AyController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/AyController.java
new file mode 100644
index 0000000..fcc6407
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/AyController.java
@@ -0,0 +1,44 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.base.model.query.sjzx.YszxNyQuery;
+import com.mosty.base.model.query.sjzx.YszxQuery;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.SgfxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "系统字典--原magic接口")
+@RequestMapping("/xtzd")
+public class AyController extends BaseController {
+
+    @Resource
+    private SgfxService sgfxService;
+
+    @GetMapping("/aylx")
+    @ApiOperation(value = "案由类型")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> aylx(String code) {
+        return ResponseResult.success(this.sgfxService.aylx(code));
+    }
+
+    @GetMapping("/zzjg")
+    @ApiOperation(value = "组织机构")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zzjg() {
+        return ResponseResult.success(this.sgfxService.zzjg());
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/SgfxController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/SgfxController.java
new file mode 100644
index 0000000..25b39a7
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/SgfxController.java
@@ -0,0 +1,156 @@
+package com.mosty.sjzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.sjzx.YszxNyQuery;
+import com.mosty.base.model.query.sjzx.YszxQuery;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.SgfxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "四高分析相关接口--原magic接口")
+@RequestMapping("/sgfx")
+public class SgfxController extends BaseController {
+
+    @Resource
+    private SgfxService sgfxService;
+
+    @GetMapping("/gflx/jmjq")
+    @ApiOperation(value = "日统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jmjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.jmjq(dto));
+    }
+
+    @GetMapping("/gflx/wffzjq")
+    @ApiOperation(value = "日统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> wffzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.wffzjq(dto));
+    }
+
+    @GetMapping("/gflx/zjq")
+    @ApiOperation(value = "日统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zjq(dto));
+    }
+
+    @GetMapping("/gflx/yjmjq")
+    @ApiOperation(value = "日统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> yjmjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.yjmjq(dto));
+    }
+
+    @GetMapping("/gflx/yzwffzjq")
+    @ApiOperation(value = "月统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> yzwffzjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.yzwffzjq(dto));
+    }
+
+    @GetMapping("/gflx/yzjq")
+    @ApiOperation(value = "月统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> yzjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.yzjq(dto));
+    }
+
+    @GetMapping("/gflx/zjmjq")
+    @ApiOperation(value = "周统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zjmjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zjmjq(dto));
+    }
+
+    @GetMapping("/gflx/zwffzjq")
+    @ApiOperation(value = "周统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zwffzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zwffzjq(dto));
+    }
+
+    @GetMapping("/gflx/zzjq")
+    @ApiOperation(value = "周统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zzjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/Jmjq")
+    @ApiOperation(value = "日统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxJmjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxJmjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/wffzjq")
+    @ApiOperation(value = "日统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxWffzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxWffzjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/zjq")
+    @ApiOperation(value = "日统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxZjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxZjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/yjmjq")
+    @ApiOperation(value = "月统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxYjmjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxYjmjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/ywffzjq")
+    @ApiOperation(value = "月统计-违法犯罪警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> ywffzjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.ywffzjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/yzjq")
+    @ApiOperation(value = "月统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxYzjq(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxYzjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/zjmjq")
+    @ApiOperation(value = "周统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxZjmjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxZjmjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/zwffzjq")
+    @ApiOperation(value = "周统计-街面警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxZwffzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxZwffzjq(dto));
+    }
+
+    @GetMapping("/gfsdfx/zzjq")
+    @ApiOperation(value = "周统计-总警情")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gfsdfxZzjq(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.gfsdfxZzjq(dto));
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbCaseTypeController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbCaseTypeController.java
new file mode 100644
index 0000000..e996769
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbCaseTypeController.java
@@ -0,0 +1,47 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.base.model.dto.sjzx.TbCaseTypeDto;
+import com.mosty.base.model.entity.sjzx.TbCaseType;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.TbCaseTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 案由表控制层
+ *
+ * @author
+ * @since 2022-09-13 20:44:48
+ */
+@AllArgsConstructor
+@RestController
+@Api(tags = "案由相关接口")
+@RequestMapping("/tbCase")
+public class TbCaseTypeController extends BaseController {
+
+    @Resource
+    private TbCaseTypeService tbCaseTypeService;
+
+    @ApiOperation(value = "根据code查询案由上级拼接")
+    @GetMapping("/code")
+    @JwtSysUser
+    public ResponseResult<String> queryCaseByCode(TbCaseTypeDto dto) {
+        return ResponseResult.success(tbCaseTypeService.queryCaseByCode(dto.getCode()));
+    }
+
+    @ApiOperation(value = "根据code查询案由信息")
+    @GetMapping("/codeObj")
+    @JwtSysUser
+    public ResponseResult<TbCaseType> queryCaseObjByCode(TbCaseTypeDto dto) {
+        return ResponseResult.success(tbCaseTypeService.queryCase(dto.getCode()));
+    }
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbJqController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbJqController.java
new file mode 100644
index 0000000..c959b31
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbJqController.java
@@ -0,0 +1,391 @@
+package com.mosty.sjzx.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.sjzx.TbJqYjbjDto;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.xinzhi.GxCjdb;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.query.sjzx.TbJqCjdbQuery;
+import com.mosty.base.model.query.sjzx.XftjQuery;
+import com.mosty.base.model.vo.xinzhi.GxAlarmAllVo;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.query.sjzx.TbJqListQuery;
+import com.mosty.base.model.query.sjzx.TbJqPageListQuery;
+import com.mosty.base.model.vo.sjzx.GeohashQuery;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.sjzx.service.TbJqService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraintvalidation.SupportedValidationTarget;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 警情表(TbJq)表控制层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-13 20:44:48
+ */
+@AllArgsConstructor
+@RestController
+@Api(tags = "警情相关接口")
+@RequestMapping("/tbJq")
+public class TbJqController extends BaseController {
+
+    private final TbJqService tbJqService;
+
+
+    @GetMapping("/getPageListLz")
+    @ApiOperation(value = "查询警情数据泸州分页")
+    @JwtSysUser
+    public ResponseResult<IPage<TbJqVo>> getPageListLz(TbJqPageListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getPageListLz(dto));
+    }
+
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "查询警情数据分页")
+    @JwtSysUser
+    public ResponseResult<IPage<TbJqVo>> selectPageList(TbJqPageListQuery dto) {
+        return ResponseResult.success(this.tbJqService.selectPageList(dto));
+    }
+
+    @GetMapping("/getListCjd")
+    @ApiOperation(value = "查询处警单表")
+    @JwtSysUser
+    @Log(title = "查询处警单表", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbJqCjdb>> getListCjd(String jjdbh) {
+        return ResponseResult.success(this.tbJqService.getListCjd(jjdbh));
+    }
+
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "查询警情数据不分页")
+    @JwtSysUser
+    public ResponseResult<List<TbJqVo>> getList(TbJqListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getList(dto));
+    }
+
+    @ApiOperation(value = "查询单条数据")
+    @GetMapping("{id}")
+    public ResponseResult<TbJqVo> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbJqService.queryById(id));
+    }
+
+    @ApiOperation("新增警情数据")
+    @PostMapping
+    @JwtSysUser
+    public ResponseResult<TbJq> add(@RequestBody TbJq tbJq) {
+        this.tbJqService.insert(tbJq);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改警情数据")
+    @PutMapping
+    @JwtSysUser
+    public ResponseResult<TbJq> edit(@RequestBody TbJq tbJq) {
+        this.tbJqService.update(tbJq);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("删除警情数据")
+    @DeleteMapping
+    @JwtSysUser
+    public ResponseResult<Boolean> deleteById(String id) {
+        return ResponseResult.success(this.tbJqService.deleteById(id));
+    }
+
+    @ApiOperation("获取警情坐标（热力图使用）")
+    @GetMapping("getJqHotMap")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getJqHotMap(TbJqListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getJqHotMap(dto));
+    }
+
+
+    @GetMapping("/getJqCount")
+    @ApiOperation(value = "根据时间获取警情数量")
+    @JwtSysUser
+    public ResponseResult<Integer> getJqCount(TbJqListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getJqCount(dto));
+    }
+
+    @GetMapping("/getJqBy24h")
+    @ApiOperation(value = "今日警情数量走势")
+    @JwtSysUser
+    public ResponseResult<Object> getJqBy24h(String ssbmdm) {
+        return ResponseResult.success(this.tbJqService.getJqBy24h(ssbmdm));
+    }
+
+    @GetMapping("/getZfgkList")
+    @ApiOperation(value = "查询租房管控信息列表")
+    @JwtSysUser
+    public ResponseResult<IPage<TbJqVo>> getZfgkList(TbJqPageListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getZfgkList(dto));
+    }
+
+    @GetMapping("/getjrjqczfx")
+    @ApiOperation(value = "今日警情处置分析")
+    @JwtSysUser
+    public ResponseResult<Object> getjrjqczfx(String ssbmdm) {
+        return ResponseResult.success(this.tbJqService.getjrjqczfx(ssbmdm));
+    }
+
+    @PostMapping("/addXzjq")
+    @ApiOperation(value = "添加高新新稚警情信息到数据库中")
+    public ResponseResult<Integer> addXzjq(@RequestBody GxAlarmAllVo entity) {
+        return ResponseResult.success(this.tbJqService.addXzjq(entity));
+    }
+
+    @PostMapping("/addRsJq")
+    @ApiOperation(value = "添加仁寿警情信息到数据库中")
+    public ResponseResult<Integer> addRsJq(@RequestBody TbJq entity) {
+        return ResponseResult.success(this.tbJqService.addRsJq(entity));
+    }
+
+    @PostMapping("/addXzJqCjdb")
+    @ApiOperation(value = "添加新稚警情-处警单表到数据库中")
+    public ResponseResult<Integer> addXzJqCjdb(@RequestBody GxCjdb cjdb) {
+        return ResponseResult.success(this.tbJqService.addXzJqCjdb(cjdb));
+    }
+
+    @PostMapping("/getStatistics")
+    @ApiOperation(value = "APP警情统计")
+    public ResponseResult<Map<String, Object>> getStatistics(@RequestBody TbJqListQuery dto) {
+        return ResponseResult.success(this.tbJqService.getStatistics(dto));
+    }
+
+    @GetMapping("/getAllStatistics")
+    @ApiOperation(value = "APP首页-所有警情统计")
+    public ResponseResult<Map<String, Object>> getAllStatistics() {
+        return ResponseResult.success(this.tbJqService.getAllStatistics());
+    }
+
+    @GetMapping("/getJmjqStatistics")
+    @ApiOperation(value = "APP首页-街面警情统计")
+    public ResponseResult<Map<String, Object>> getJmjqStatistics() {
+        return ResponseResult.success(this.tbJqService.getJmjqStatistics());
+    }
+
+    @GetMapping("/getWffzStatistics")
+    @ApiOperation(value = "APP首页-违法犯罪警情统计")
+    public ResponseResult<Map<String, Object>> getWffzStatistics() {
+        return ResponseResult.success(this.tbJqService.getWffzStatistics());
+    }
+
+    @GetMapping("/getDqscStatistics")
+    @ApiOperation(value = "APP首页-盗抢三车警情统计")
+    public ResponseResult<Map<String, Object>> getDqscStatistics() {
+        return ResponseResult.success(this.tbJqService.getDqscStatistics());
+    }
+
+    @GetMapping("/jqtjDbFjjqzs")
+    @ApiOperation(value = "APP警情分析-对比分析-分局警情走势图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "分局代码", name = "ssfjdm", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjDbFjjqzs(String type, String ssfjdm, String jqType) {
+        return ResponseResult.success(this.tbJqService.jqtjDbFjjqzs(type, ssfjdm, jqType));
+    }
+
+    @GetMapping("/jqtjDbCqfjhb")
+    @ApiOperation(value = "APP警情分析-对比分析-城区分局警情环比")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjDbCqfjhb(String type, String jqType) {
+        return ResponseResult.success(this.tbJqService.jqtjDbCqfjhb(type, jqType));
+    }
+
+    @GetMapping("/jqtjDbCqfjhbTable")
+    @ApiOperation(value = "APP警情分析-对比分析-城区分局警情环比-列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "分局代码", name = "ssfjdm", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjDbCqfjhbTable(String type, String ssfjdm, String jqType) {
+        return ResponseResult.success(this.tbJqService.jqtjDbCqfjhbTable(type, ssfjdm, jqType));
+    }
+
+    @GetMapping("/jqtjDbPcsHb")
+    @ApiOperation(value = "APP警情分析-对比分析-派出所总警情环比")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "分局代码", name = "ssfjdm", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjDbPcsHb(String type, String ssfjdm, String jqType) {
+        return ResponseResult.success(this.tbJqService.jqtjDbPcsHb(type, ssfjdm, jqType));
+    }
+
+    @GetMapping("/jqtjDbPcsHbTable")
+    @ApiOperation(value = "APP警情分析-对比分析-派出所总警情环比-表格")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "分局代码", name = "ssfjdm", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjDbPcsHbTable(String type, String ssfjdm, String jqType) {
+        return ResponseResult.success(this.tbJqService.jqtjDbPcsHbTable(type, ssfjdm, jqType));
+    }
+
+    @GetMapping("/jqtjSgFirst")
+    @ApiOperation(value = "APP警情分析-四高分析-第一个统计图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询类型 1.今日 2.近一周 3.近一月 4.近三月", name = "type", dataType = "String"),
+            @ApiImplicitParam(value = "分局代码", name = "ssfjdm", dataType = "String"),
+            @ApiImplicitParam(value = "警情类型 1.总警情 2.街面警情 3.违法犯罪", name = "jqType", dataType = "String"),
+            @ApiImplicitParam(value = "时段类型 3，4，6，8", name = "sdlx", dataType = "String"),
+    })
+    public ResponseResult<Object> jqtjSgFirst(String type, String ssfjdm, String jqType, String sdlx) {
+        return ResponseResult.success(this.tbJqService.jqtjSgFirst(type, ssfjdm, jqType, sdlx));
+    }
+
+    @GetMapping("/getGljq")
+    @ApiOperation(value = "APP首页-获取关联警情")
+    public ResponseResult<List<TbJqVo>> getGljq(String jjdbh) {
+        return ResponseResult.success(this.tbJqService.getGljq(jjdbh));
+    }
+
+    @GetMapping("/getCjList")
+    @ApiOperation(value = "APP获取警情的处警数据")
+    public ResponseResult<IPage<TbJqCjdb>> getCjList(TbJqCjdbQuery dto) {
+        return ResponseResult.success(this.tbJqService.getCjList(dto));
+    }
+
+    @GetMapping("/getLastJq")
+    @ApiOperation(value = "APP获取警情的处警数据")
+    public ResponseResult<TbJqVo> getLastJq() {
+        return ResponseResult.success(this.tbJqService.getLastJq());
+    }
+
+    @GetMapping("/getLastJqCjdb")
+    @ApiOperation(value = "获取最新的一条处警单的数据")
+    public ResponseResult<TbJqCjdb> getLastJqCjdb() {
+        return ResponseResult.success(this.tbJqService.getLastJqCjdb());
+    }
+
+    @PostMapping("/addRsCjdb")
+    @ApiOperation(value = "添加仁寿处警单数据")
+    public ResponseResult<Void> addRsCjdb(@RequestBody TbJqCjdb cjdb) {
+        this.tbJqService.addRsCjdb(cjdb);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("/situation")
+    @ApiOperation(value = "转新稚警情接口（实发案）警情概况")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "开始时间（yyyy-MM-dd HH:mm:ss）", name = "startTime", dataType = "String"),
+            @ApiImplicitParam(value = "结束时间（yyyy-MM-dd HH:mm:ss）", name = "endTime", dataType = "String"),
+    })
+    public ResponseResult<JSONObject> situation(String startTime, String endTime) {
+        return ResponseResult.success(this.tbJqService.situation(startTime, endTime));
+    }
+
+    @GetMapping("/alarmSituation")
+    @ApiOperation(value = "转新稚警情接口--警请态势")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "开始时间（yyyy-MM-dd HH:mm:ss）", name = "startTime", dataType = "String"),
+            @ApiImplicitParam(value = "结束时间（yyyy-MM-dd HH:mm:ss）", name = "endTime", dataType = "String"),
+    })
+    public ResponseResult<JSONObject> alarmSituation(String startTime, String endTime) {
+        return ResponseResult.success(this.tbJqService.alarmSituation(startTime, endTime));
+    }
+
+    @PostMapping("/addLzJq")
+    @ApiOperation(value = "添加泸州警情信息到数据库中")
+    public ResponseResult<Void> addLzJq(@RequestBody VLz110Txj lz110) {
+        this.tbJqService.addLzJq(lz110);
+        return ResponseResult.success();
+    }
+
+
+    @PostMapping("/addLzHndJq")
+    @ApiOperation(value = "添加泸州海能达警情信息到数据库中")
+    public ResponseResult<Void> addLzHndJq(@RequestBody Jjdb jjdb) {
+        System.out.println("添加泸州警情信息到数据库中--->" + JSONArray.toJSONString(jjdb));
+        this.tbJqService.addYbJq(jjdb);
+        return ResponseResult.success();
+    }
+
+    @PostMapping("/addYbJq")
+    @ApiOperation(value = "添加宜宾警情信息到数据库中")
+    public ResponseResult<Void> addYbJq(@RequestBody Jjdb jjdb) {
+        this.tbJqService.addYbJq(jjdb);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("泸州态势统计-警情与巡防工作对比分析")
+    @PostMapping("/getJqAndXfTj")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getJqAndXfTj(XftjQuery dto) {
+        return ResponseResult.success(tbJqService.getJqAndXfTj(dto));
+    }
+
+    @ApiOperation("泸州态势统计-警情与盘查工作对比分析")
+    @PostMapping("/getJqAndPcTj")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getJqAndPcTj(XftjQuery dto) {
+        return ResponseResult.success(tbJqService.getJqAndPcTj(dto));
+    }
+
+
+    @ApiOperation("APP一键报警添加接口")
+    @PostMapping("/addYjbj")
+    @JwtSysUser
+    public ResponseResult<Void> addYjbj(@RequestBody TbJqYjbjDto dto) {
+        tbJqService.addYjbj(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改警情处置状态")
+    @PostMapping("/updateJqCzzt")
+    public ResponseResult<Void> updateJqCzzt(@RequestParam("id") String id, @RequestParam("czzt") String czzt) {
+        tbJqService.updateJqCzzt(id, czzt);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询没得经纬度的接警单编号")
+    @GetMapping("/selectJjdbh")
+    public ResponseResult<List<String>> selectJjdbh() {
+        return ResponseResult.success(this.tbJqService.selectJjdbh());
+    }
+
+
+    @ApiOperation("修改警情经纬度")
+    @PostMapping("/updateJqJwd")
+    public ResponseResult<Void> updateJqJwd(@RequestBody Jjdb jjdb) {
+        System.out.println("修改警情经纬度--->" + JSONArray.toJSONString(jjdb));
+        this.tbJqService.updateJqJwd(jjdb);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("同步接警单号到reids")
+    @GetMapping("/tbJjdhToRedis")
+    public ResponseResult<Void> tbJjdhToRedis() {
+        this.tbJqService.tbJjdhToRedis();
+        return ResponseResult.success();
+    }
+
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjController.java
new file mode 100644
index 0000000..860c82e
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjController.java
@@ -0,0 +1,119 @@
+package com.mosty.sjzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.sjzx.TbSjQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.sjzx.TbSjDto;
+import com.mosty.base.model.dto.sjzx.TbSjQcszDto;
+import com.mosty.base.model.dto.sjzx.TbSjRzDto;
+import com.mosty.base.model.dto.sjzx.TbSjUpdateJwdDto;
+import com.mosty.base.model.entity.sjzx.TbSj;
+import com.mosty.base.model.query.sjzx.SearchDto;
+import com.mosty.sjzx.service.TbSjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@AllArgsConstructor
+@RestController
+@RequestMapping("tbSj")
+@Api(tags = "事件相关接口")
+public class TbSjController {
+
+    @Resource
+    private TbSjService tbSjService;
+
+    @GetMapping("/selectEventList")
+    @ApiOperation(value = "大屏-地图-全局搜索")
+    @JwtSysUser
+    @Log(title = "大屏-地图-全局搜索", businessType = BusinessType.OTHER)
+    public ResponseResult<Object> queryAll(SearchDto dto) {
+        return ResponseResult.success(this.tbSjService.queryAll(dto));
+    }
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "查询事件列表")
+    @JwtSysUser
+    @Log(title = "查询事件列表", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbSjDto>> getPageList(TbSjQuery dto) {
+        return ResponseResult.success(this.tbSjService.getPageList(dto));
+    }
+
+    @GetMapping("selectById")
+    @ApiOperation(value = "id查询单条")
+    @Log(title = "id查询单条", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<TbSjDto> queryById(String id) {
+        return ResponseResult.success(this.tbSjService.queryById(id));
+    }
+
+    @PostMapping
+    @ApiOperation(value = "大屏-地图-手动新增事件")
+    @Log(title = "新增事件信息", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<TbSjDto> add(@RequestBody TbSj tbSj) {
+        return ResponseResult.success(this.tbSjService.insert(tbSj));
+    }
+
+    @PutMapping
+    @ApiOperation(value = "事件-圈层设置")
+    @JwtSysUser
+    @Log(title = "事件-圈层设置", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> editQc(@RequestBody TbSjQcszDto dto) {
+        this.tbSjService.editQc(dto);
+        return ResponseResult.success();
+    }
+
+    @PutMapping("updateJwd")
+    @ApiOperation(value = "事件-修改定位")
+    @JwtSysUser
+    @Log(title = "事件-修改定位", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> updateJwd(@RequestBody TbSjUpdateJwdDto dto) {
+        this.tbSjService.updateJwd(dto);
+        return ResponseResult.success();
+    }
+
+    @PutMapping("addSjRz")
+    @ApiOperation(value = "事件-记录日志")
+    @JwtSysUser
+    @Log(title = "事件-记录日志", businessType = BusinessType.UPDATE)
+    public ResponseResult<Void> addSjRz(@RequestBody TbSjRzDto dto) {
+        this.tbSjService.addSjRz(dto);
+        return ResponseResult.success();
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "id删除数据")
+    @JwtSysUser
+    @Log(title = "id删除数据", businessType = BusinessType.UPDATE)
+    public ResponseResult<Boolean> deleteById(String id) {
+        return ResponseResult.success(this.tbSjService.deleteById(id));
+    }
+
+    @PostMapping("finishDispose")
+    @ApiOperation(value = "大屏-地图-完成处置")
+    @Log(title = "大屏-地图-完成处置", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Boolean> finishDispose(@RequestBody TbSj tbSj) {
+        return ResponseResult.success(this.tbSjService.finishDispose(tbSj));
+    }
+
+    @GetMapping("bxdCreate")
+    @ApiOperation(value = "计算必巡点数据")
+    public ResponseResult<Object> bxdCreate() {
+        return ResponseResult.success(this.tbSjService.bxdCreate());
+    }
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjCyjlController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjCyjlController.java
new file mode 100644
index 0000000..670c9fe
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjCyjlController.java
@@ -0,0 +1,45 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import com.mosty.sjzx.service.TbSjCyjlService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("tbSjCyjl")
+public class TbSjCyjlController {
+
+    @Resource
+    private TbSjCyjlService tbSjCyjlService;
+
+    @GetMapping("slectPolice")
+    @ApiOperation("大屏-查询参与警力列表")
+    @JwtSysUser
+    @Log(title = "大屏-查询参与警力列表", businessType = BusinessType.OTHER)
+    public ResponseResult queryAll() {
+        return ResponseResult.success(this.tbSjCyjlService.queryAll());
+    }
+
+    @ApiOperation("通过主键查询单条数据")
+    @GetMapping("{id}")
+    @JwtSysUser
+    @Log(title = "通过主键查询单条数据", businessType = BusinessType.OTHER)
+    public ResponseResult<TbSjCyjl> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbSjCyjlService.queryById(id));
+    }
+
+    @ApiOperation("大屏-警力调度-参与警力")
+    @PostMapping("/joinCopCount")
+    @Log(title = "大屏-警力调度-参与警力", businessType = BusinessType.OTHER)
+    public ResponseResult joinCopCount(@RequestBody TbSjCyjl tbSjCyjl) {
+        return ResponseResult.success(tbSjCyjlService.joinCopCount(tbSjCyjl));
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjRzController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjRzController.java
new file mode 100644
index 0000000..dc18a27
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjRzController.java
@@ -0,0 +1,51 @@
+package com.mosty.sjzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.sjzx.TbSjRzDto;
+import com.mosty.base.model.dto.sjzx.TbSjRzInsertDto;
+import com.mosty.base.model.entity.sjzx.TbSjRz;
+import com.mosty.base.model.query.jcgl.TbSjRzQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.TbSjRzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@AllArgsConstructor
+@RestController
+@RequestMapping("tbSjRz")
+@Api(tags = "事件日志相关接口")
+public class TbSjRzController {
+
+    @Resource
+    private TbSjRzService tbSjRzService;
+
+    @PostMapping("/saveRz")
+    @ApiOperation(value = "新增事件日志记录")
+    @JwtSysUser
+    @Log(title = "新增事件日志记录", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> saveRz(@RequestBody TbSjRzInsertDto dto) {
+        this.tbSjRzService.saveRz(dto);
+        return ResponseResult.success();
+    }
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "查询事件回溯列表")
+    @JwtSysUser
+    @Log(title = "查询事件回溯列表", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbSjRzDto>> getPageList(TbSjRzQuery dto) {
+        return ResponseResult.success(this.tbSjRzService.getPageList(dto));
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjSpbfController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjSpbfController.java
new file mode 100644
index 0000000..1d7c6cf
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/TbSjSpbfController.java
@@ -0,0 +1,69 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.sjzx.TbSjSpbf;
+import com.mosty.sjzx.service.TbSjSpbfService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("tbSjSpbf")
+@Api("事件-视频播放日志")
+@AllArgsConstructor
+public class TbSjSpbfController {
+
+    @Resource
+    private TbSjSpbfService tbSjSpbfService;
+
+    @ApiOperation("查询视频播放日志所有")
+    @JwtSysUser
+    @Log(title = "查询视频播放日志所有", businessType = BusinessType.OTHER)
+    @GetMapping("All")
+    public ResponseResult<List> queryAll() {
+        return ResponseResult.success(this.tbSjSpbfService.queryAll());
+    }
+
+    @ApiOperation("视频播放日志详情")
+    @JwtSysUser
+    @Log(title = "视频播放日志详情", businessType = BusinessType.OTHER)
+    @GetMapping("{id}")
+    public ResponseResult<TbSjSpbf> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbSjSpbfService.queryById(id));
+    }
+
+    @ApiOperation("视频播放日志新增")
+    @JwtSysUser
+    @Log(title = "视频播放日志新增", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public ResponseResult<TbSjSpbfDTO> add(@RequestBody TbSjSpbfDTO dto) {
+        return ResponseResult.success(this.tbSjSpbfService.insert(dto));
+    }
+
+    @ApiOperation("视频播放日志修改")
+    @JwtSysUser
+    @Log(title = "视频播放日志修改", businessType = BusinessType.UPDATE)
+    @PutMapping("update")
+    public ResponseResult<TbSjSpbf> edit(TbSjSpbf tbSjSpbf) {
+        return ResponseResult.success(this.tbSjSpbfService.update(tbSjSpbf));
+    }
+
+    @ApiOperation("视频播放日志删除")
+    @JwtSysUser
+    @Log(title = "视频播放日志删除", businessType = BusinessType.DELETE)
+    @DeleteMapping("{id}")
+    public ResponseResult<Boolean> deleteById(String id) {
+        return ResponseResult.success(this.tbSjSpbfService.deleteById(id));
+    }
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/XftjController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/XftjController.java
new file mode 100644
index 0000000..2c259d1
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/XftjController.java
@@ -0,0 +1,143 @@
+package com.mosty.sjzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.sjzx.*;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.SgfxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "巡防统计--原magic接口")
+@RequestMapping("/xftj")
+public class XftjController extends BaseController {
+
+    @Resource
+    private SgfxService sgfxService;
+
+    @GetMapping("/jmjq/jrjqczfx")
+    @ApiOperation(value = "今日警情处置分析")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrjqczfx(XftjQuery dto) {
+        return ResponseResult.success(this.sgfxService.jrjqczfx(dto));
+    }
+
+    @GetMapping("/jmjq/jrjqslzs")
+    @ApiOperation(value = "今日警情数量走势")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrjqslzs(XftjQuery dto) {
+        return ResponseResult.success(this.sgfxService.jrjqslzs(dto));
+    }
+
+    @GetMapping("/jmjq/jrjqyj")
+    @ApiOperation(value = "今日警情预警")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrjqyj(XftjQuery dto) {
+        return ResponseResult.success(this.sgfxService.jrjqyj(dto));
+    }
+
+    @GetMapping("/jmjq/jqlxtj")
+    @ApiOperation(value = "警情类型统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jqlxtj(XftjQuery dto) {
+        return ResponseResult.success(this.sgfxService.jqlxtj(dto));
+    }
+
+    @GetMapping("/jmjq/jqlb")
+    @ApiOperation(value = "警情列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> jqlb(XftjJqlbQuery dto) {
+        return ResponseResult.success(this.sgfxService.jqlb(dto));
+    }
+
+    @PostMapping("/xfzytj/gzy/bmlbtj")
+    @ApiOperation(value = "感知源-部门列表统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> gzybmlbtj(XftjJqlbQuery dto) {
+        return ResponseResult.success(this.sgfxService.gzybmlbtj(dto));
+    }
+
+    @PostMapping("/xfzytj/gzy/sblxtj")
+    @ApiOperation(value = "设备类型统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> sblxtj(XftjQuery dto) {
+        return ResponseResult.success(this.sgfxService.sblxtj(dto));
+    }
+
+    @GetMapping("/xfzytj/gzy/sblb")
+    @ApiOperation(value = "设备列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> sblb(XftjJqlbQuery dto) {
+        return ResponseResult.success(this.sgfxService.sblb(dto));
+    }
+
+    @GetMapping("/xfzytj/jwz/bmlbtj")
+    @ApiOperation(value = "部门列表统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jwzbmlbtj(XftjJwzQuery dto) {
+        return ResponseResult.success(this.sgfxService.jwzbmlbtj(dto));
+    }
+
+    @GetMapping("/xfzytj/jwz/bmtjjwz")
+    @ApiOperation(value = "根据部门统计警务站")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> bmtjjwz(XftjJwzQuery dto) {
+        return ResponseResult.success(this.sgfxService.bmtjjwz(dto));
+    }
+
+    @GetMapping("/xfzytj/xfll/clbmtj")
+    @ApiOperation(value = "根据部门统计警务站")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> clbmtj(XftjXfllQuery dto) {
+        return ResponseResult.success(this.sgfxService.clbmtj(dto));
+    }
+
+    @GetMapping("/xfzytj/xfll/fjbmtj")
+    @ApiOperation(value = "辅警部门统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> fjbmtj(XftjXfllQuery dto) {
+        return ResponseResult.success(this.sgfxService.fjbmtj(dto));
+    }
+
+    @GetMapping("/xfzytj/xfll/mjbmtj")
+    @ApiOperation(value = "民警部门统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> mjbmtj(XftjXfllQuery dto) {
+        return ResponseResult.success(this.sgfxService.mjbmtj(dto));
+    }
+
+    @GetMapping("/xfzytj/xfll/zttjz")
+    @ApiOperation(value = "柱状图统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zttjz(XftjXfllQuery dto) {
+        return ResponseResult.success(this.sgfxService.zttjz(dto));
+    }
+
+    @GetMapping("/xfzytj/ydzb/lbtj")
+    @ApiOperation(value = "移动装备--部门列表统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> lbtj(XftjYdzbQuery dto) {
+        return ResponseResult.success(this.sgfxService.lbtj(dto));
+    }
+
+    @GetMapping("/xfzytj/ydzb/bmtj")
+    @ApiOperation(value = "移动装备--根据部门统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> bmtj(XftjYdzbQuery dto) {
+        return ResponseResult.success(this.sgfxService.bmtj(dto));
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZdgzController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZdgzController.java
new file mode 100644
index 0000000..2404f8c
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZdgzController.java
@@ -0,0 +1,37 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.base.model.query.sjzx.YszxQuery;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.SgfxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "重点关注--原magic接口")
+@RequestMapping("/zdgz")
+public class ZdgzController extends BaseController {
+
+    @Resource
+    private SgfxService sgfxService;
+
+    @GetMapping("/jqtj")
+    @ApiOperation(value = "警情统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zdgzJqtj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zdgzJqtj(dto));
+    }
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZtfxController.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZtfxController.java
new file mode 100644
index 0000000..6fec0f7
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/controller/ZtfxController.java
@@ -0,0 +1,107 @@
+package com.mosty.sjzx.controller;
+
+import com.mosty.base.model.query.sjzx.YszxNyQuery;
+import com.mosty.base.model.query.sjzx.YszxQuery;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.sjzx.service.SgfxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "专题分析--原magic接口")
+@RequestMapping("/ztfx")
+public class ZtfxController extends BaseController {
+
+    @Resource
+    private SgfxService sgfxService;
+
+    @GetMapping("/afqsfx/rtj")
+    @ApiOperation(value = "发案趋势分析-日统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> rtj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.rtj(dto));
+    }
+
+    @GetMapping("/afqsfx/ytj")
+    @ApiOperation(value = "发案趋势分析-月统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> ytj(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.ytj(dto));
+    }
+
+    @GetMapping("/afqsfx/ztj")
+    @ApiOperation(value = "发案趋势分析-月统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> ztj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.ztj(dto));
+    }
+
+    @GetMapping("/fascryyj/scryyj")
+    @ApiOperation(value = "日统计-三车人员预警")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> scryyj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.scryyj(dto));
+    }
+
+    @GetMapping("/fascryyj/yscryyj")
+    @ApiOperation(value = "月统计-三车人员预警")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> yscryyj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.yscryyj(dto));
+    }
+
+    @GetMapping("/fascryyj/zscryyj")
+    @ApiOperation(value = "周统计-三车人员预警")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> zscryyj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.zscryyj(dto));
+    }
+
+    @GetMapping("/pcsfafx/rtj")
+    @ApiOperation(value = "派出所发案分析--日统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> pcsfafxRtj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.pcsfafxRtj(dto));
+    }
+
+    @GetMapping("/pcsfafx/ytj")
+    @ApiOperation(value = "派出所发案分析--月统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> pcsfafxytj(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.pcsfafxytj(dto));
+    }
+
+    @GetMapping("/pcsfafx/ztj")
+    @ApiOperation(value = "派出所发案分析--周统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> pcsfafxztj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.pcsfafxztj(dto));
+    }
+
+    @GetMapping("/sjtj/ztsjtj")
+    @ApiOperation(value = "专题分析-数据统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> ztsjtj(YszxQuery dto) {
+        return ResponseResult.success(this.sgfxService.ztsjtj(dto));
+    }
+
+    @GetMapping("/sjtj/yztsjtj")
+    @ApiOperation(value = "专题分析-月数据统计")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> yztsjtj(YszxNyQuery dto) {
+        return ResponseResult.success(this.sgfxService.yztsjtj(dto));
+    }
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/SgfxMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/SgfxMapper.java
new file mode 100644
index 0000000..addda92
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/SgfxMapper.java
@@ -0,0 +1,163 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface SgfxMapper {
+
+    @ApiOperation("日统计-街面警情")
+    List<Map<String, Object>> jmjq(Map<String, Object> map);
+
+    @ApiOperation("日统计-违法犯罪警情")
+    List<Map<String, Object>> wffzjq(Map<String, Object> map);
+
+    @ApiOperation("日统计-总情警")
+    List<Map<String, Object>> zjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-街面警情")
+    List<Map<String, Object>> yjmjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-违法犯罪警情")
+    List<Map<String, Object>> yzwffzjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-总警情")
+    List<Map<String, Object>> yzjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-街面警情")
+    List<Map<String, Object>> zjmjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-违法犯罪警情")
+    List<Map<String, Object>> zwffzjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-总警情")
+    List<Map<String, Object>> zzjq(Map<String, Object> map);
+
+    @ApiOperation("日统计-街面警情")
+    List<Map<String, Object>> gfsdfxJmjq(Map<String, Object> map);
+
+    @ApiOperation("日统计-违法犯罪警情")
+    List<Map<String, Object>> gfsdfxWffzjq(Map<String, Object> map);
+
+    @ApiOperation("日统计-总警情")
+    List<Map<String, Object>> gfsdfxZjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-街面警情")
+    List<Map<String, Object>> gfsdfxYjmjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-违法犯罪警情")
+    List<Map<String, Object>> ywffzjq(Map<String, Object> map);
+
+    @ApiOperation("月统计-总警情")
+    List<Map<String, Object>> gfsdfxYzjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-街面警情")
+    List<Map<String, Object>> gfsdfxZjmjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-违法犯罪警情")
+    List<Map<String, Object>> gfsdfxZwffzjq(Map<String, Object> map);
+
+    @ApiOperation("周统计-总警情")
+    List<Map<String, Object>> gfsdfxZzjq(Map<String, Object> map);
+
+    @ApiOperation("案由类型")
+    List<Map<String, Object>> aylx(@Param("code") String code);
+
+    @ApiOperation("组织机构")
+    List<Map<String, Object>> zzjg();
+
+    @ApiOperation("警情统计")
+    List<Map<String, Object>> zdgzJqtj(Map<String, Object> map);
+
+    @ApiOperation("日统计")
+    List<Map<String, Object>> rtj(Map<String, Object> map);
+
+    @ApiOperation("月统计")
+    List<Map<String, Object>> ytj(Map<String, Object> map);
+
+    @ApiOperation("月统计")
+    List<Map<String, Object>> ztj(Map<String, Object> map);
+
+    @ApiOperation("日统计-三车人员预警")
+    List<Map<String, Object>> scryyj(Map<String, Object> map);
+
+    @ApiOperation("月统计-三车人员预警")
+    List<Map<String, Object>> yscryyj(Map<String, Object> map);
+
+    @ApiOperation("周统计-三车人员预警")
+    List<Map<String, Object>> zscryyj(Map<String, Object> map);
+
+    @ApiOperation("派出所发案分析--日统计")
+    List<Map<String, Object>> pcsfafxRtj(Map<String, Object> map);
+
+    @ApiOperation("派出所发案分析--月统计")
+    List<Map<String, Object>> pcsfafxytj(Map<String, Object> map);
+
+    @ApiOperation("派出所发案分析--周统计")
+    List<Map<String, Object>> pcsfafxztj(Map<String, Object> map);
+
+    @ApiOperation("专题分析-数据统计")
+    List<Map<String, Object>> ztsjtj(Map<String, Object> map);
+
+    @ApiOperation("专题分析-月数据统计")
+    List<Map<String, Object>> yztsjtj(Map<String, Object> map);
+
+    @ApiOperation("今日警情处置分析")
+    List<Map<String, Object>> jrjqczfx(Map<String, Object> map);
+
+    @ApiOperation("今日警情数量走势")
+    List<Map<String, Object>> jrjqslzs(Map<String, Object> map);
+
+    @ApiOperation("今日警情预警")
+    List<Map<String, Object>> jrjqyj(Map<String, Object> map);
+
+    @ApiOperation("警情类型统计")
+    List<Map<String, Object>> jqlxtj(Map<String, Object> map);
+
+    @ApiOperation("警情数量")
+    int jqlbCount(Map<String, Object> map);
+
+    @ApiOperation("警情列表")
+    List<Map<String, Object>> jqlb(Map<String, Object> map);
+
+    @ApiOperation("设备类型统计")
+    List<Map<String, Object>> sblxtj(Map<String, Object> map);
+
+    @ApiOperation("设备列表统计")
+    int sblbCount(Map<String, Object> map);
+
+    @ApiOperation("设备列表")
+    List<Map<String, Object>> sblb(Map<String, Object> map);
+
+    @ApiOperation("部门列表统计")
+    List<Map<String, Object>> jwzbmlbtj(Map<String, Object> map);
+
+    @ApiOperation("根据部门统计警务站")
+    List<Map<String, Object>> bmtjjwz(Map<String, Object> map);
+
+    @ApiOperation("车辆部门统计")
+    List<Map<String, Object>> clbmtj(Map<String, Object> map);
+
+    @ApiOperation("辅警部门统计")
+    List<Map<String, Object>> fjbmtj(Map<String, Object> map);
+
+    @ApiOperation("民警部门统计")
+    List<Map<String, Object>> mjbmtj(Map<String, Object> map);
+
+    @ApiOperation("柱状图统计")
+    List<Map<String, Object>> zttjz(Map<String, Object> map);
+
+    @ApiOperation("移动装备--部门列表统计")
+    List<Map<String, Object>> lbtj(Map<String, Object> map);
+
+    @ApiOperation("移动装备--根据部门统计")
+    List<Map<String, Object>> bmtj(Map<String, Object> map);
+
+    @ApiOperation("感知源-部门列表统计")
+    List<Map<String, Object>> gzybmlbtj(Map<String, Object> map);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbCaseTypeMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbCaseTypeMapper.java
new file mode 100644
index 0000000..8ca617f
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbCaseTypeMapper.java
@@ -0,0 +1,9 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbCaseType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbCaseTypeMapper extends BaseMapper<TbCaseType> {
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqAllMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqAllMapper.java
new file mode 100644
index 0000000..c350f4d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqAllMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbJqAll;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJqAllMapper extends BaseMapper<TbJqAll> {
+
+    @ApiOperation("添加警情信息")
+    Integer insertEntity(TbJqAll jqAll);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqCjdbMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqCjdbMapper.java
new file mode 100644
index 0000000..e9260f0
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqCjdbMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJqCjdbMapper extends BaseMapper<TbJqCjdb> {
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqDzMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqDzMapper.java
new file mode 100644
index 0000000..76b63ef
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqDzMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbJqDz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbJqDzMapper extends BaseMapper<TbJqDz> {
+
+    @ApiOperation("新增警情地址")
+    void insertEntity(TbJqDz dz);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqMapper.java
new file mode 100644
index 0000000..c10f78c
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbJqMapper.java
@@ -0,0 +1,122 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.dto.sjzx.TbJqGeohash;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.sjzx.TbJqListQuery;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.base.model.vo.sjzx.GeohashQuery;
+import com.mosty.common.config.entity.SysDictItem;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 警情表(TbJq)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-13 20:44:48
+ */
+@Mapper
+public interface TbJqMapper extends BaseMapper<TbJq> {
+
+
+    @ApiOperation("通过ID查询单条数据")
+    TbJq queryById(String id);
+
+    @ApiOperation("新增数据")
+    int insertEntity(TbJq tbJq);
+
+    @ApiOperation("修改数据")
+    int updateEntity(TbJq tbJq);
+
+    @ApiOperation("通过主键删除数据")
+    int deleteById(String id);
+
+    @ApiOperation("查询数据总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询数据列表分页")
+    List<TbJq> getListByPage(Map<String, Object> map);
+
+    @ApiOperation("查询警情列表不分页")
+    List<TbJq> getList(Map<String, Object> map);
+
+    @ApiOperation("警情热力图")
+    List<Map<String, Object>> getJqHotMap(Map<String, Object> map);
+
+
+    @ApiOperation("查询租房管控数量")
+    int getZfgkCount(Map<String, Object> map);
+
+    @ApiOperation("查询租房管控列表")
+    List<TbJq> getZfgkList(Map<String, Object> map);
+
+    @ApiOperation("查询警情统计信息")
+    List<Map<String, Object>> getStatistics(TbJqListQuery dto);
+
+    @ApiOperation("查询预警信息")
+    List<Map<String, Object>> getYjxx30Day(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询盘查人员信息")
+    List<Map<String, Object>> getPcryList(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询盘车车辆信息")
+    List<Map<String, Object>> getPcclList(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("警情统计")
+    List<Map<String, Object>> getJqTj(@Param("kssj") String kssj);
+
+    @ApiOperation("警情统计(按时间)")
+    List<Map<String, Object>> getJqTjByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询巡防位置")
+    List<Map<String, Object>> getWzList(@Param("kssj") String kssj);
+
+    @ApiOperation("查询时间段类的报备数据")
+    List<Map<String, Object>> getBbList(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("查询盘查人员统计")
+    List<Map<String, Object>> getPcryTj(@Param("kssj") String kssj);
+
+    @ApiOperation("查询盘查车辆统计")
+    List<Map<String, Object>> getPcclTj(@Param("kssj") String kssj);
+
+    @ApiOperation("查询盘查重点人员数据")
+    List<Map<String, Object>> getPcZdryTj(String kssj);
+
+    @ApiOperation("根据时间查询盘查人员统计")
+    List<Map<String, Object>> getPcryByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("根据时间查询盘查车辆统计")
+    List<Map<String, Object>> getPcclByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("根据时间查询重点人员信息")
+    List<Map<String, Object>> getZdryByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("修改警情处置状态")
+    void updateJqCzzt(@Param("id") String id, @Param("czzt") String czzt);
+
+    @ApiOperation("查询字典")
+    SysDictItem selectDict(@Param("dictName") String dictName, @Param("dm") String dm);
+
+    @ApiOperation("查询没得经纬度的接警单编号")
+    List<String> selectJjdbh(String jwd);
+
+    @ApiOperation("修改警情经纬度")
+    void updateJqJwd(TbJq tbJq);
+
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjCyjlMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjCyjlMapper.java
new file mode 100644
index 0000000..a09e48e
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjCyjlMapper.java
@@ -0,0 +1,29 @@
+package com.mosty.sjzx.mapper;
+
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件-参与警力表(TbSjCyjl)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-13 09:11:18
+ */
+@Mapper
+public interface TbSjCyjlMapper {
+
+    @ApiOperation("查询所有数据")
+    List<TbSjCyjl> queryAll(@Param("useSql") String useSql);
+     
+    @ApiOperation("通过ID查询单条数据")
+    TbSjCyjl queryById(String id);
+
+    @ApiOperation("参与警力统计")
+    Map<String,Integer> joinCopCount(@Param("t") TbSjCyjl tbSjCyjl);
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjDzMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjDzMapper.java
new file mode 100644
index 0000000..72d1a7d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjDzMapper.java
@@ -0,0 +1,17 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbSjDz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/25
+ **/
+@Mapper
+public interface TbSjDzMapper extends BaseMapper<TbSjDz> {
+
+    @ApiOperation("添加事件地址")
+    void insertEntity(TbSjDz dz);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjMapper.java
new file mode 100644
index 0000000..7e44481
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjMapper.java
@@ -0,0 +1,33 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbSj;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 事件表(TbSj)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-14 11:42:30
+ */
+@Mapper
+public interface TbSjMapper extends BaseMapper<TbSj> {
+
+    @ApiOperation("通过ID查询单条数据")
+    TbSj queryById(String id);
+
+    @ApiOperation("新增数据")
+    void insertEntity(TbSj tbSj);
+
+    @ApiOperation("修改数据")
+    int updateEntity(TbSj tbSj);
+
+    @ApiOperation("通过主键删除数据")
+    int deleteById(String id);
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjRzMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjRzMapper.java
new file mode 100644
index 0000000..28a1837
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjRzMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbSjRz;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/25
+ **/
+@Mapper
+public interface TbSjRzMapper extends BaseMapper<TbSjRz> {
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjSpbfMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjSpbfMapper.java
new file mode 100644
index 0000000..0296772
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbSjSpbfMapper.java
@@ -0,0 +1,31 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbSjSpbf;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 事件-视频播放表(TbSjSpbf)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-20 09:45:23
+ */
+@Mapper
+public interface TbSjSpbfMapper extends BaseMapper<TbSjSpbf> {
+
+    @ApiOperation("查询所有数据")
+    List<TbSjSpbf> queryAll(@Param("useSql") String useSql);
+
+    @ApiOperation("通过ID查询单条数据")
+    TbSjSpbf queryById(String id);
+
+    @ApiOperation("通过主键删除数据")
+    int deleteById(String id);
+
+}
+
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbjqZxrMapper.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbjqZxrMapper.java
new file mode 100644
index 0000000..40236b6
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mapper/TbjqZxrMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.sjzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbJqZxr;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/8/31
+ **/
+@Mapper
+public interface TbjqZxrMapper extends BaseMapper<TbJqZxr> {
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..fd83a8d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,118 @@
+package com.mosty.sjzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+			//根据属性名字设置要填充的值
+			if (metaObject.hasGetter("xtSjzt")) {
+				if (metaObject.getValue("xtSjzt") == null) {
+					this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+				}
+			}
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptCode()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtZhgxrid")) {
+                if (metaObject.getValue("xtZhgxrid") == null) {
+                    this.strictInsertFill(metaObject, "xtZhgxrid", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, userInfo.getDeptCode());
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/MybatisPlusConfig.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..aafa6a4
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.sjzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbBaseAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..1af8b2d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,100 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByOrgcode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询分局下的所有的派出所信息
+    public List<SysDeptDTO> getPcsByFxjdm(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return new ArrayList<>();
+        }
+        ResponseResult<List<SysDeptDTO>> responseResult = mostyBaseFeignService.getPcsByFxjdm(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询分局下的所有的派出所信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询分局下的所有的派出所信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询系统配置
+    public String getValue(String pzj) {
+        if (StringUtils.isBlank(pzj)) {
+            return null;
+        }
+        ResponseResult<String> responseResult = mostyBaseFeignService.getValue(pzj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询系统配置异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询系统配置异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取位置信息
+    public String getLocation(String jd, String wd) {
+        String address = "未知位置";
+        ResponseResult<JSONObject> obj = this.mostyBaseFeignService.getLzAddress(jd, wd);
+        if (obj != null && obj.getData() != null) {
+            String city = StringUtils.isNotBlank(obj.getData().getString("state")) ? obj.getData().getString("state") : "";
+            String region = StringUtils.isNotBlank(obj.getData().getString("region")) ? obj.getData().getString("region") : "";
+            String district = StringUtils.isNotBlank(obj.getData().getString("district")) ? obj.getData().getString("district") : "";
+            String suburb = StringUtils.isNotBlank(obj.getData().getString("suburb")) ? obj.getData().getString("suburb") : "";
+            String town = StringUtils.isNotBlank(obj.getData().getString("town")) ? obj.getData().getString("town") : "";
+            String road = StringUtils.isNotBlank(obj.getData().getString("road")) ? obj.getData().getString("road") : "";
+            address = city + region + district + suburb + town + road;
+        }
+        return address;
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbJcglAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbJcglAdaptRemoteService.java
new file mode 100644
index 0000000..ec258d7
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbJcglAdaptRemoteService.java
@@ -0,0 +1,70 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.jcgl.TbJcglPzfzDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.entity.jcgl.TbJcglJwz;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * 外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbJcglAdaptRemoteService {
+
+    @Resource
+    private MostyJcglFeignService mostyJcglFeignService;
+
+    // 查询配置分值
+    public List<TbJcglPzfzDto> getFzList() {
+        ResponseResult<List<TbJcglPzfzDto>> responseResult = mostyJcglFeignService.getFzList();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询配置分值失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询配置分值失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加计算出来的必巡点的数据
+    public void createdBxd(List<Map<String, Object>> rList) {
+        ResponseResult<Void> responseResult = mostyJcglFeignService.createdBxd(rList);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加计算出来的必巡点的数据失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加计算出来的必巡点的数据失败");
+        }
+    }
+
+    // 查询所有快反点数据
+    public List<TbJcglKfdDto> getListKfdAll() {
+        ResponseResult<List<TbJcglKfdDto>> responseResult = mostyJcglFeignService.getListKfdAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所有快反点数据失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所有快反点数据失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询所有巡防区数据
+    public List<TbJcglXfqyDto> getListXfqyAll() {
+        ResponseResult<List<TbJcglXfqyDto>> responseResult = mostyJcglFeignService.getListXfqyAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所有巡防区数据失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所有巡防区数据失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbLzotherAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbLzotherAdaptRemoteService.java
new file mode 100644
index 0000000..3aa8414
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbLzotherAdaptRemoteService.java
@@ -0,0 +1,23 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyLzotherFeignService;
+import com.mosty.base.model.dto.sjzx.TbJqDTO;
+import com.mosty.base.model.entity.lzother.VJcxx;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbLzotherAdaptRemoteService {
+
+    private final MostyLzotherFeignService mostyLzotherFeignService;
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbQwzxAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbQwzxAdaptRemoteService.java
new file mode 100644
index 0000000..cdfbe83
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbQwzxAdaptRemoteService.java
@@ -0,0 +1,65 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 勤务中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbQwzxAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    // 根据设备ID查询该设备所在的巡组
+    public List<TbQwXfbb> getBbList(String sbid) {
+        ResponseResult<List<TbQwXfbb>> responseResult = mostyQwzxFeignService.getBbList(sbid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取巡组信息 失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询报备信息
+    public TbQwXfbb getBbxxInfo(String id) {
+        ResponseResult<TbQwXfbb> responseResult = mostyQwzxFeignService.getBbxxInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询报备信息 失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询报备信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询范围内的最近的巡组信息
+    public TbQwXfbb getBbxxByJi(TbQwXfbbQueryByJlDto dto) {
+        ResponseResult<TbQwXfbb> responseResult = mostyQwzxFeignService.getBbxxByJi(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询范围内的最近的巡组信息 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询范围内的最近的巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据巡区获取报备id
+    public List<TbQwXfbb> getBbidByXq(String xqid) {
+        ResponseResult<List<TbQwXfbb>> responseResult = mostyQwzxFeignService.getBbidByXq(xqid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询范围内的最近的巡组信息 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询范围内的最近的巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbRzSpbfAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbRzSpbfAdaptRemoteService.java
new file mode 100644
index 0000000..1e04f68
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbRzSpbfAdaptRemoteService.java
@@ -0,0 +1,34 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyRzzxFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbRzSpbfAdaptRemoteService {
+
+    private final MostyRzzxFeignService mostyRzzxFeignService;
+
+
+    /**
+     * 修改视频结束时间
+     * @param lyId 内容
+     * @return
+     */
+    public Boolean updateLyId(String lyId) {
+        ResponseResult<Boolean> responseResult = mostyRzzxFeignService.updateLyId(lyId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改失败Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbSjzxAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbSjzxAdaptRemoteService.java
new file mode 100644
index 0000000..9dfab4f
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbSjzxAdaptRemoteService.java
@@ -0,0 +1,36 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.sjzx.TbJqDTO;
+import com.mosty.base.feign.service.MostySjzxFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbSjzxAdaptRemoteService {
+
+    private final MostySjzxFeignService mostySjzxFeignService;
+
+    /**
+     * 查询预警数据
+     * @param nr 内容
+     * @return
+     */
+    public List<TbJqDTO> selectVigilant(String nr) {
+        ResponseResult<List<TbJqDTO>> responseResult = mostySjzxFeignService.selectVigilant(nr);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询预警数据异常Result = {}", JSON.toJSONString(responseResult));
+            return new ArrayList<>();
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbWebSocketAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbWebSocketAdaptRemoteService.java
new file mode 100644
index 0000000..c6ae12b
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbWebSocketAdaptRemoteService.java
@@ -0,0 +1,43 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyWebSocketFeignService;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * websocket外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbWebSocketAdaptRemoteService {
+
+    @Resource
+    private MostyWebSocketFeignService mostyWebSocketFeignService;
+
+    // 发送websocket信息
+    public void sendMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送websocket信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送websocket信息异常");
+        }
+    }
+
+    // 发送websocket信息
+    public void sendBbMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendBbMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送websocket信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送websocket信息异常");
+        }
+    }
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjxxAdaptRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjxxAdaptRemoteService.java
new file mode 100644
index 0000000..b2a608b
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjxxAdaptRemoteService.java
@@ -0,0 +1,32 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.feign.service.MostyYjzlFeignService;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYjxxAdaptRemoteService {
+
+    private final MostyYjzlFeignService mostyYjzlFeignService;
+
+    // 查询预警信息
+    public Object getPageList(TbYjxxQuery dto) {
+        ResponseResult<IPage<TbYjxxDTO>> responseResult = mostyYjzlFeignService.getPageList(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询预警信息异常Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjzlAdaptRrmoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjzlAdaptRrmoteService.java
new file mode 100644
index 0000000..1c98423
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYjzlAdaptRrmoteService.java
@@ -0,0 +1,76 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.feign.service.MostyYjzlFeignService;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.yjzl.TbZlxxVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYjzlAdaptRrmoteService {
+
+    private final MostyYjzlFeignService mostyYjzlFeignService;
+
+    // 查询指令
+    public Object selectInstructList(TbZlxxQuery dto) {
+        ResponseResult<List<TbZlxxVo>> responseResult = mostyYjzlFeignService.selectInstructList(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询指令异常Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    // 查询预警信息
+    public Object getPageList(TbYjxxQuery dto) {
+        ResponseResult<IPage<TbYjxxDTO>> responseResult = mostyYjzlFeignService.getPageList(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询预警信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询预警信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询预警信息
+    public List<TbYjxx> getYjxx30Day(TbYjxxQuery dto) {
+        ResponseResult<List<TbYjxx>> responseResult = mostyYjzlFeignService.getYjxx30Day(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询预警信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询预警信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加指令信息
+    public void addZl(TbZlxxInsertDto dto) {
+        ResponseResult<Void> responseResult = mostyYjzlFeignService.addZl(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询预警信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询预警信息异常");
+        }
+    }
+
+    // 警情转换成指令
+    public void andJqZl(String ssbmid,String jqid,String bbids,String zlxflx) {
+        ResponseResult<Void> responseResult = mostyYjzlFeignService.andJqZl(ssbmid,jqid,bbids,zlxflx);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("警情转换成指令异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("警情转换成指令异常");
+        }
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYszxAdapRemoteService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYszxAdapRemoteService.java
new file mode 100644
index 0000000..7ba25df
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/remote/TbYszxAdapRemoteService.java
@@ -0,0 +1,47 @@
+package com.mosty.sjzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.common.base.domain.ResponseResult;
+//import com.mosty.yszx.bean.vo.TbYsDlVo;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by 张海军 on 2022/7/14 19:50
+ *
+ * @ClassName this.tbYsDlRemoteService
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYszxAdapRemoteService {
+
+    private final MostyYszxFeignService mostyYszxFeignService;
+
+    // 查询地理要素
+    public Object queryAll( TbYsDlQuery dto) {
+        ResponseResult responseResult = this.mostyYszxFeignService.queryAll(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询地理要素异常Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    // 查询公安机关要素
+    public Object getGajgAll( TbYsGajgQuery dto) {
+        ResponseResult responseResult = this.mostyYszxFeignService.getGajgAll(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询公安机关要素异常Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/SgfxService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/SgfxService.java
new file mode 100644
index 0000000..8638f43
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/SgfxService.java
@@ -0,0 +1,155 @@
+package com.mosty.sjzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.sjzx.*;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SgfxService {
+
+    @ApiOperation("日统计-街面警情")
+    List<Map<String, Object>> jmjq(YszxQuery dto);
+
+    @ApiOperation("日统计-违法犯罪警情")
+    List<Map<String, Object>> wffzjq(YszxQuery dto);
+
+    @ApiOperation("日统计-总警情")
+    List<Map<String, Object>> zjq(YszxQuery dto);
+
+    @ApiOperation("月统计-街面警情")
+    List<Map<String, Object>> yjmjq(YszxNyQuery dto);
+
+    @ApiOperation("月统计-违法犯罪警情")
+    List<Map<String, Object>> yzwffzjq(YszxNyQuery dto);
+
+    @ApiOperation("月统计-总警情")
+    List<Map<String, Object>> yzjq(YszxNyQuery dto);
+
+    @ApiOperation("周统计-街面警情")
+    List<Map<String, Object>> zjmjq(YszxQuery dto);
+
+    @ApiOperation("周统计-违法犯罪警情")
+    List<Map<String, Object>> zwffzjq(YszxQuery dto);
+
+    @ApiOperation("周统计-总警情")
+    List<Map<String, Object>> zzjq(YszxQuery dto);
+
+    @ApiOperation("日统计-街面警情")
+    List<Map<String, Object>> gfsdfxJmjq(YszxQuery dto);
+
+    @ApiOperation("日统计-违法犯罪警情")
+    List<Map<String, Object>> gfsdfxWffzjq(YszxQuery dto);
+
+    @ApiOperation("日统计-总警情")
+    List<Map<String, Object>> gfsdfxZjq(YszxQuery dto);
+
+    @ApiOperation("月统计-街面警情")
+    List<Map<String, Object>> gfsdfxYjmjq(YszxNyQuery dto);
+
+    @ApiOperation("月统计-违法犯罪警情")
+    List<Map<String, Object>> ywffzjq(YszxNyQuery dto);
+
+    @ApiOperation("月统计-总警情")
+    List<Map<String, Object>> gfsdfxYzjq(YszxNyQuery dto);
+
+    @ApiOperation("周统计-街面警情")
+    List<Map<String, Object>> gfsdfxZjmjq(YszxQuery dto);
+
+    @ApiOperation("周统计-违法犯罪警情")
+    List<Map<String, Object>> gfsdfxZwffzjq(YszxQuery dto);
+
+    @ApiOperation("周统计-总警情")
+    List<Map<String, Object>> gfsdfxZzjq(YszxQuery dto);
+
+    @ApiOperation("案由类型")
+    List<Map<String, Object>> aylx(String code);
+
+    @ApiOperation("组织机构")
+    List<Map<String, Object>> zzjg();
+
+    @ApiOperation("警情统计")
+    List<Map<String, Object>> zdgzJqtj(YszxQuery dto);
+
+    @ApiOperation("日统计")
+    List<Map<String, Object>> rtj(YszxQuery dto);
+
+    @ApiOperation("月统计")
+    List<Map<String, Object>> ytj(YszxNyQuery dto);
+
+    @ApiOperation("周统计")
+    List<Map<String, Object>> ztj(YszxQuery dto);
+
+    @ApiOperation("日统计-三车人员预警")
+    List<Map<String, Object>> scryyj(YszxQuery dto);
+
+    @ApiOperation("月统计-三车人员预警")
+    List<Map<String, Object>> yscryyj(YszxQuery dto);
+
+    @ApiOperation("周统计-三车人员预警")
+    List<Map<String, Object>> zscryyj(YszxQuery dto);
+
+    @ApiOperation("派出所发案分析--日统计")
+    List<Map<String, Object>> pcsfafxRtj(YszxQuery dto);
+
+    @ApiOperation("派出所发案分析--月统计")
+    List<Map<String, Object>> pcsfafxytj(YszxNyQuery dto);
+
+    @ApiOperation("派出所发案分析--周统计")
+    List<Map<String, Object>> pcsfafxztj(YszxQuery dto);
+
+    @ApiOperation("专题分析-数据统计")
+    List<Map<String, Object>> ztsjtj(YszxQuery dto);
+
+    @ApiOperation("专题分析-月数据统计")
+    List<Map<String, Object>> yztsjtj(YszxNyQuery dto);
+
+    @ApiOperation("今日警情处置分析")
+    List<Map<String, Object>> jrjqczfx(XftjQuery dto);
+
+    @ApiOperation("今日警情数量走势")
+    List<Map<String, Object>> jrjqslzs(XftjQuery dto);
+
+    @ApiOperation("今日警情预警")
+    List<Map<String, Object>> jrjqyj(XftjQuery dto);
+
+    @ApiOperation("警情类型统计")
+    List<Map<String, Object>> jqlxtj(XftjQuery dto);
+
+    @ApiOperation("警情列表")
+    IPage<Map<String, Object>> jqlb(XftjJqlbQuery dto);
+
+    @ApiOperation("设备类型统计")
+    List<Map<String, Object>> sblxtj(XftjQuery dto);
+
+    @ApiOperation("设备列表")
+    IPage<Map<String, Object>> sblb(XftjJqlbQuery dto);
+
+    @ApiOperation("部门列表统计")
+    List<Map<String, Object>> jwzbmlbtj(XftjJwzQuery dto);
+
+    @ApiOperation("根据部门统计警务站")
+    List<Map<String, Object>> bmtjjwz(XftjJwzQuery dto);
+
+    @ApiOperation("车辆部门统计")
+    List<Map<String, Object>> clbmtj(XftjXfllQuery dto);
+
+    @ApiOperation("辅警部门统计")
+    List<Map<String, Object>> fjbmtj(XftjXfllQuery dto);
+
+    @ApiOperation("民警部门统计")
+    List<Map<String, Object>> mjbmtj(XftjXfllQuery dto);
+
+    @ApiOperation("柱状图统计")
+    List<Map<String, Object>> zttjz(XftjXfllQuery dto);
+
+    @ApiOperation("移动装备--部门列表统计")
+    List<Map<String, Object>> lbtj(XftjYdzbQuery dto);
+
+    @ApiOperation("移动装备--根据部门统计")
+    List<Map<String, Object>> bmtj(XftjYdzbQuery dto);
+
+    @ApiOperation("感知源-部门列表统计")
+    List<Map<String, Object>> gzybmlbtj(XftjJqlbQuery dto);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbCaseTypeService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbCaseTypeService.java
new file mode 100644
index 0000000..573ae6a
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbCaseTypeService.java
@@ -0,0 +1,22 @@
+package com.mosty.sjzx.service;
+
+import com.mosty.base.model.entity.sjzx.TbCaseType;
+
+public interface TbCaseTypeService {
+
+    /**
+     * 根据CODE查询案由上级
+     * @param code
+     * @return
+     */
+    public String queryCaseByCode(String code);
+
+    /**
+     *
+     * @param code
+     * @return
+     */
+    public TbCaseType queryCase(String code);
+
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbJqService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbJqService.java
new file mode 100644
index 0000000..9792669
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbJqService.java
@@ -0,0 +1,162 @@
+package com.mosty.sjzx.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.sjzx.TbJqYjbjDto;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.entity.xinzhi.GxCjdb;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.query.sjzx.TbJqCjdbQuery;
+import com.mosty.base.model.query.sjzx.TbJqListQuery;
+import com.mosty.base.model.query.sjzx.TbJqPageListQuery;
+import com.mosty.base.model.query.sjzx.XftjQuery;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.model.vo.xinzhi.GxAlarmAllVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 警情表(TbJq)表服务接口
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-13 20:44:48
+ */
+public interface TbJqService {
+
+    @ApiOperation("通过ID查询单条数据")
+    TbJqVo queryById(String id);
+
+    @ApiOperation("新增数据")
+    int insert(TbJq tbJq);
+
+    @ApiOperation("修改数据")
+    void update(TbJq tbJq);
+
+    @ApiOperation("通过主键删除数据")
+    boolean deleteById(String id);
+
+    @ApiOperation("分页查询警情信息")
+    IPage<TbJqVo> selectPageList(TbJqPageListQuery dto);
+
+    @ApiOperation("查询处警单表")
+    List<TbJqCjdb> getListCjd(String jjdbh);
+
+
+    @ApiOperation("分页查询警情信息")
+    IPage<TbJqVo> getPageListLz(TbJqPageListQuery dto);
+
+    @ApiOperation("查询警情列表不分页")
+    List<TbJqVo> getList(TbJqListQuery dto);
+
+
+    @ApiOperation("获取警情坐标（热力图撒点使用）")
+    List<Map<String, Object>> getJqHotMap(TbJqListQuery dto);
+
+
+    @ApiOperation("根据时间获取警情数量")
+    int getJqCount(TbJqListQuery dto);
+
+    @ApiOperation("今日警情数量走势")
+    Object getJqBy24h(String ssbmdm);
+
+    @ApiOperation("查询租房管控信息")
+    IPage<TbJqVo> getZfgkList(TbJqPageListQuery dto);
+
+    @ApiOperation("今日警情处置分析")
+    Object getjrjqczfx(String ssbmdm);
+
+    @ApiOperation("添加新稚警情信息到数据库中")
+    Integer addXzjq(GxAlarmAllVo entity);
+
+    @ApiOperation("APP警情统计")
+    Map<String, Object> getStatistics(TbJqListQuery dto);
+
+    @ApiOperation("APP首页-所有统计")
+    Map<String, Object> getAllStatistics();
+
+    @ApiOperation("APP首页-街面警情统计")
+    Map<String, Object> getJmjqStatistics();
+
+    @ApiOperation("APP首页-违法犯罪警情统计")
+    Map<String, Object> getWffzStatistics();
+
+    @ApiOperation("APP首页-盗抢三车警情统计")
+    Map<String, Object> getDqscStatistics();
+
+    @ApiOperation("APP警情分析-对比分析-分局警情走势图")
+    Object jqtjDbFjjqzs(String type, String ssfjdm, String jqType);
+
+    @ApiOperation("APP警情分析-对比分析-城区分局警情环比")
+    Object jqtjDbCqfjhb(String type, String jqType);
+
+    @ApiOperation("APP警情分析-对比分析-城区分局警情环比-列表")
+    Object jqtjDbCqfjhbTable(String type, String ssfjdm, String jqType);
+
+    @ApiOperation("APP警情分析-对比分析-派出所总警情环比")
+    Object jqtjDbPcsHb(String type, String ssfjdm, String jqType);
+
+    @ApiOperation("APP警情分析-对比分析-派出所总警情环比-表格")
+    Object jqtjDbPcsHbTable(String type, String ssfjdm, String jqType);
+
+    @ApiOperation("APP警情分析-四高分析-第一个统计图")
+    Object jqtjSgFirst(String type, String ssfjdm, String jqType, String sdlx);
+
+    @ApiOperation("APP首页-获取关联警情")
+    List<TbJqVo> getGljq(String jjdbh);
+
+    @ApiOperation("添加新稚警情-处警单表到数据库中")
+    Integer addXzJqCjdb(GxCjdb cjdb);
+
+    @ApiOperation("APP获取警情的处警数据")
+    IPage<TbJqCjdb> getCjList(TbJqCjdbQuery dto);
+
+    @ApiOperation("添加仁寿警情信息")
+    int addRsJq(TbJq entity);
+
+    @ApiOperation("获取最新的一条警情信息")
+    TbJqVo getLastJq();
+
+    @ApiOperation("获取最新一条的处警的数据")
+    TbJqCjdb getLastJqCjdb();
+
+    @ApiOperation("添加仁寿处警单数据")
+    void addRsCjdb(TbJqCjdb cjdb);
+
+    @ApiOperation("转新稚警情接口（实发案）警情概况")
+    JSONObject situation(String startTime, String endTime);
+
+    @ApiOperation("转新稚警情接口--警请态势")
+    JSONObject alarmSituation(String startTime, String endTime);
+
+    @ApiOperation("添加泸州警情到数据库中")
+    void addLzJq(VLz110Txj lz110);
+
+    @ApiOperation("添加宜宾警情到数据库中")
+    void addYbJq(Jjdb jjdb);
+
+    @ApiOperation("泸州态势统计-警情与巡防工作对比分析")
+    Map<String, Object> getJqAndXfTj(XftjQuery dto);
+
+    @ApiOperation("泸州态势统计-警情与盘查工作对比分析")
+    Map<String, Object> getJqAndPcTj(XftjQuery dto);
+
+    @ApiOperation("APP添加一键报警")
+    void addYjbj(TbJqYjbjDto dto);
+
+    @ApiOperation("修改警情处置状态")
+    void updateJqCzzt(String id, String czzt);
+
+    @ApiOperation("查询没得经纬度的接警单编号")
+    List<String> selectJjdbh();
+
+    @ApiOperation("修改警情经纬度")
+    void updateJqJwd(Jjdb jjdb);
+
+    @ApiOperation("同步接警单号到reids")
+    void tbJjdhToRedis();
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjCyjlService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjCyjlService.java
new file mode 100644
index 0000000..246367c
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjCyjlService.java
@@ -0,0 +1,19 @@
+package com.mosty.sjzx.service;
+
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbSjCyjlService {
+
+    @ApiOperation("查询所有数据")
+    List<TbSjCyjl> queryAll();
+
+    @ApiOperation("通过ID查询单条数据")
+    TbSjCyjl queryById(String id);
+
+    @ApiOperation("参与警力统计")
+    Object joinCopCount(TbSjCyjl tbSjCyjl);
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjRzService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjRzService.java
new file mode 100644
index 0000000..a29317c
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjRzService.java
@@ -0,0 +1,16 @@
+package com.mosty.sjzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.sjzx.TbSjRzDto;
+import com.mosty.base.model.dto.sjzx.TbSjRzInsertDto;
+import com.mosty.base.model.entity.sjzx.TbSjRz;
+import com.mosty.base.model.query.jcgl.TbSjRzQuery;
+
+public interface TbSjRzService {
+
+    // 新增时间日志记录
+    void saveRz(TbSjRzInsertDto dto);
+
+    // 查询事件日志列表
+    IPage<TbSjRzDto> getPageList(TbSjRzQuery dto);
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjService.java
new file mode 100644
index 0000000..e0d50f5
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjService.java
@@ -0,0 +1,49 @@
+package com.mosty.sjzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.sjzx.TbSjDto;
+import com.mosty.base.model.dto.sjzx.TbSjQcszDto;
+import com.mosty.base.model.dto.sjzx.TbSjRzDto;
+import com.mosty.base.model.dto.sjzx.TbSjUpdateJwdDto;
+import com.mosty.base.model.entity.sjzx.TbSj;
+import com.mosty.base.model.query.sjzx.SearchDto;
+import com.mosty.base.model.query.sjzx.TbSjQuery;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author zhangHaiJun
+ * @since 2022-07-14 11:42:31
+ */
+public interface TbSjService {
+
+    @ApiOperation("大屏-地图-全局搜索")
+    Object queryAll(SearchDto dto);
+
+    @ApiOperation("通过ID查询单条数据")
+    TbSjDto queryById(String id);
+
+    @ApiOperation("新增数据")
+    TbSjDto insert(TbSj tbSj);
+
+    @ApiOperation("大屏-地图-圈层设置")
+    void editQc(TbSjQcszDto tbSj);
+
+    @ApiOperation("通过主键删除数据")
+    boolean deleteById(String id);
+
+    @ApiOperation("大屏-地图-完成处置")
+    Boolean finishDispose(TbSj tbSj);
+
+    @ApiOperation("大屏-地图-修改定位")
+    void updateJwd(TbSjUpdateJwdDto dto);
+
+    @ApiOperation("事件-记录日志")
+    void addSjRz(TbSjRzDto dto);
+
+    @ApiOperation("每天计算必巡点的数据")
+    Object bxdCreate();
+
+    @ApiOperation("分页查询事件信息")
+    IPage<TbSjDto> getPageList(TbSjQuery dto);
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjSpbfService.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjSpbfService.java
new file mode 100644
index 0000000..265d301
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/TbSjSpbfService.java
@@ -0,0 +1,27 @@
+package com.mosty.sjzx.service;
+
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.base.model.entity.sjzx.TbSjSpbf;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbSjSpbfService {
+
+    @ApiOperation("查询所有数据")
+    List<TbSjSpbf> queryAll();
+    
+    @ApiOperation("通过ID查询单条数据")
+    TbSjSpbf queryById(String id);
+
+    @ApiOperation("新增数据")
+    TbSjSpbfDTO insert(TbSjSpbfDTO dto);
+
+    @ApiOperation("修改数据")
+    TbSjSpbf update(TbSjSpbf tbSjSpbf);
+
+    @ApiOperation("通过主键删除数据")
+    boolean deleteById(String id);
+
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/DistanceRunnable.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/DistanceRunnable.java
new file mode 100644
index 0000000..724405d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/DistanceRunnable.java
@@ -0,0 +1,42 @@
+package com.mosty.sjzx.service.impl;
+
+import com.mosty.base.model.dto.sjzx.BxdCreatedDto;
+import com.mosty.base.model.dto.sjzx.NeighborDTO;
+import com.mosty.base.utils.PositionUtil;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DistanceRunnable implements Runnable {
+
+    private BxdCreatedDto point;
+    private List<BxdCreatedDto> points;
+    private List<NeighborDTO> neighborList;
+    private long scope;
+
+    public DistanceRunnable(BxdCreatedDto point, List<BxdCreatedDto> points, List<NeighborDTO> neighborList, long scope) {
+        super();
+        this.point = point;
+        this.points = points;
+        this.neighborList = neighborList;
+        this.scope = scope;
+    }
+
+    @Override
+    public void run() {
+        Map<BxdCreatedDto, Long> map = new HashMap<>();
+        for (BxdCreatedDto point2 : points) {
+            if (point.equals(point2)) {
+                continue;
+            }
+            long distance = PositionUtil.getDistance(point.getWd().doubleValue(), point.getJd().doubleValue(),
+                    point2.getWd().doubleValue(), point2.getJd().doubleValue());
+            if (distance < scope) {
+                map.put(point2, distance);
+            }
+        }
+        neighborList.add(new NeighborDTO(point, map));
+    }
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/SgfxServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/SgfxServiceImpl.java
new file mode 100644
index 0000000..e4d0fa6
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/SgfxServiceImpl.java
@@ -0,0 +1,427 @@
+package com.mosty.sjzx.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.query.sjzx.*;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.sjzx.mapper.SgfxMapper;
+import com.mosty.sjzx.service.SgfxService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class SgfxServiceImpl implements SgfxService {
+
+    private final SgfxMapper sgfxMapper;
+
+    @Override
+    public List<Map<String, Object>> jmjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.jmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> wffzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.wffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjmjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.yjmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yzwffzjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.yzwffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yzjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.yzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zjmjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zjmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zwffzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zwffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxJmjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxJmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxWffzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxWffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxZjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxZjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxYjmjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxYjmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ywffzjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.ywffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxYzjq(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxYzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxZjmjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxZjmjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxZwffzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxZwffzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gfsdfxZzjq(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.gfsdfxZzjq(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> aylx(String code) {
+        return this.sgfxMapper.aylx(code);
+    }
+
+    @Override
+    public List<Map<String, Object>> zzjg() {
+        return this.sgfxMapper.zzjg();
+    }
+
+    @Override
+    public List<Map<String, Object>> zdgzJqtj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zdgzJqtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> rtj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.rtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ytj(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.ytj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ztj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.ztj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> scryyj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.scryyj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yscryyj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.yscryyj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zscryyj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.zscryyj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> pcsfafxRtj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.pcsfafxRtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> pcsfafxytj(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.pcsfafxytj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> pcsfafxztj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.pcsfafxztj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ztsjtj(YszxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.ztsjtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yztsjtj(YszxNyQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.yztsjtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrjqczfx(XftjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.jrjqczfx(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrjqslzs(XftjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.jrjqslzs(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrjqyj(XftjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.jrjqyj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jqlxtj(XftjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", UserInfoManager.get()));
+        map.put("dto", dto);
+        return this.sgfxMapper.jqlxtj(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> jqlb(XftjJqlbQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        int count = this.sgfxMapper.jqlbCount(map);
+        List<Map<String, Object>> list = this.sgfxMapper.jqlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> sblxtj(XftjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.sblxtj(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> sblb(XftjJqlbQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        int count = this.sgfxMapper.sblbCount(map);
+        List<Map<String, Object>> list = this.sgfxMapper.sblb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> jwzbmlbtj(XftjJwzQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.jwzbmlbtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> bmtjjwz(XftjJwzQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.bmtjjwz(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> clbmtj(XftjXfllQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.clbmtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> fjbmtj(XftjXfllQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.fjbmtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> mjbmtj(XftjXfllQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.mjbmtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zttjz(XftjXfllQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.zttjz(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> lbtj(XftjYdzbQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.lbtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> bmtj(XftjYdzbQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.bmtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gzybmlbtj(XftjJqlbQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSqlOfCode("", user));
+        map.put("dto", dto);
+        return this.sgfxMapper.gzybmlbtj(map);
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbCaseTypeServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbCaseTypeServiceImpl.java
new file mode 100644
index 0000000..8dea342
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbCaseTypeServiceImpl.java
@@ -0,0 +1,88 @@
+package com.mosty.sjzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwBmjlbbCountDto;
+import com.mosty.base.model.entity.jcgl.TbJcglBxd;
+import com.mosty.base.model.entity.sjzx.TbCaseType;
+import com.mosty.sjzx.mapper.TbCaseTypeMapper;
+import com.mosty.sjzx.service.TbCaseTypeService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TbCaseTypeServiceImpl extends ServiceImpl<TbCaseTypeMapper, TbCaseType> implements TbCaseTypeService {
+
+    private TbCaseTypeMapper tbCaseTypeMapper;
+
+    @Override
+    public String queryCaseByCode(String code) {
+        List<TbCaseType> list = getCaseList(code);
+        if(CollectionUtils.isEmpty(list)) {
+            return "";
+        }
+        String oneCode = code.substring(0, 2) + "000000";
+        String twoCode = code.substring(0, 4) + "0000";
+        String threeCode = code.substring(0, 6) + "00";
+        String oneCase = getCase(list, oneCode);
+        String twoCase = getCase(list, twoCode);
+        String threeCase = getCase(list, threeCode);
+        String caseStr = "";
+        if(StringUtils.isNotBlank(oneCase)) {
+            caseStr = caseStr + oneCase + "-";
+        }
+        if(StringUtils.isNotBlank(twoCase)) {
+            caseStr = caseStr + twoCase + "-";
+        }
+        if(StringUtils.isNotBlank(threeCase)) {
+            caseStr = caseStr + threeCase + "-";
+        }
+        if(StringUtils.isNotBlank(caseStr) && !twoCase.equals(threeCase)) {
+            caseStr = caseStr.substring(0, caseStr.length() - 1);
+        }
+        return caseStr;
+    }
+
+    @Override
+    public TbCaseType queryCase(String code) {
+        QueryWrapper<TbCaseType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(TbCaseType::getCode, code);
+        return tbCaseTypeMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 获取案由
+     * @param code
+     * @return
+     */
+    public List<TbCaseType> getCaseList(String code) {
+        if(StringUtils.isNotBlank(code)) {
+            String firstCode = code.substring(0, 2);
+            QueryWrapper<TbCaseType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().likeRight(TbCaseType::getCode, firstCode);
+            return tbCaseTypeMapper.selectList(queryWrapper);
+        }
+        return null;
+    }
+
+    /**
+     * 获取案由
+     * @param list
+     * @param code
+     * @return
+     */
+    public String getCase(List<TbCaseType> list, String code) {
+        TbCaseType caseType = list.stream().filter(item -> item.getCode().equals(code)).findFirst().orElse(null);
+        if(caseType != null) {
+            return caseType.getName();
+        }
+        return "";
+    }
+
+
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbJqServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbJqServiceImpl.java
new file mode 100644
index 0000000..2c58a13
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbJqServiceImpl.java
@@ -0,0 +1,2070 @@
+package com.mosty.sjzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.ImmutableList;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.jcgl.TbJcglKfdDto;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.sjzx.TbJqYjbjDto;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.sjzx.*;
+import com.mosty.base.model.entity.xinzhi.GxCjdb;
+import com.mosty.base.model.entity.xinzhi.Jjdb;
+import com.mosty.base.model.query.sjzx.TbJqCjdbQuery;
+import com.mosty.base.model.query.sjzx.TbJqListQuery;
+import com.mosty.base.model.query.sjzx.TbJqPageListQuery;
+import com.mosty.base.model.query.sjzx.XftjQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.model.vo.xinzhi.GxAlarmAllVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.config.entity.SysDictItem;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.sjzx.mapper.*;
+import com.mosty.sjzx.remote.*;
+import com.mosty.sjzx.service.TbJqService;
+import org.locationtech.jts.geom.Coordinate;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @author zhangHaiJun
+ * @since 2022-07-13 20:44:48
+ * 警情表(TbJq)表服务实现类
+ */
+@Service
+@AllArgsConstructor
+public class TbJqServiceImpl extends ServiceImpl<TbJqMapper, TbJq> implements TbJqService {
+
+    private final TbjqZxrMapper tbjqZxrMapper;
+    private final TbSjMapper tbSjMapper;
+    private final TbJqDzMapper tbJqDzMapper;
+    private final TbJqCjdbMapper tbJqCjdbMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbWebSocketAdaptRemoteService tbWebSocketAdaptRemoteService;
+    private final TbJqAllMapper tbJqAllMapper;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbYjzlAdaptRrmoteService tbYjzlAdaptRrmoteService;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final RedisService redisService;
+
+
+    // 5+2主城区城市代码
+    private final String[] orgcodes = new String[]{"510104000000", "510105000000", "510106000000", "510107000000", "510108000000"
+            , "510109000000", "510156000000"};
+    // 街面警情
+    private final String[] JmjqList = new String[]{"01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000",
+            "01130100", "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100", "02050400",
+            "02121700", "02130000"};
+    // 违法犯罪警情
+    private final String[] wffzList = new String[]{"01000000", "02000000"};
+    // 街面刑事警情
+    private final String[] jmxsjqList = new String[]{"01110200", "01110300", "01120300", "01120400", "01120700", "01120800",
+            "01121000", "01130100", "01140100", "01149900"};
+    // 街面行政警情
+    private final String[] jmxzjqList = new String[]{"02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+            "02050400", "02121700", "02130000"};
+
+    @Override
+    public Map<String, Object> getJqAndXfTj(XftjQuery dto) {
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) {
+            throw new BusinessException("请选择查询时间");
+        }
+        Map<String, Object> map = new HashMap<>();
+        if (dto.getKssj().equals(dto.getJssj())) {
+            // 查询警情数据
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTj(dto.getKssj());
+            List<String> timeList = ImmutableList.of("00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
+                    "10", "11", "12", "13", "14", "15", "16", "17",
+                    "18", "19", "20", "21", "22", "23");
+            timeList.forEach(item -> {
+                boolean flag = false;
+                for (Map<String, Object> jq : jqList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        flag = true;
+                    }
+                }
+                if (!flag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+            });
+            jqList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            // 查询寻访时长和巡防里程
+            List<Map<String, Object>> wzList = this.baseMapper.getWzList(dto.getKssj());
+            timeList.forEach(item -> {
+                boolean flag = false;
+                for (Map<String, Object> jq : wzList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        flag = true;
+                    }
+                }
+                if (!flag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("xfsc", 0);
+                    mp.put("xflc", 0);
+                    wzList.add(mp);
+                }
+            });
+            wzList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            map.put("xflcList", wzList.stream().map(item ->
+                    Integer.parseInt(item.get("xflc").toString()))
+                    .collect(Collectors.toList()));
+            map.put("xfscList", wzList.stream().map(item ->
+                    Integer.parseInt(item.get("xfsc").toString()))
+                    .collect(Collectors.toList()));
+        } else {
+            // 警情
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTjByTime(dto.getKssj(), dto.getJssj());
+            // 巡逻时长和巡逻里程
+            List<Map<String, Object>> bbList = this.baseMapper.getBbList(dto.getKssj(), dto.getJssj());
+            Date kssj = DateUtils.strToDate(dto.getKssj(), "01");
+            Date jssj = DateUtils.strToDate(dto.getJssj(), "01");
+            while (kssj.getTime() <= jssj.getTime()) {
+                boolean jqFlag = false;
+                boolean bbFlag = false;
+                for (Map<String, Object> item : jqList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : bbList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        bbFlag = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!bbFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("xfsc", 0);
+                    mp.put("xflc", 0);
+                    bbList.add(mp);
+                }
+                kssj = DateUtils.getNextDate(kssj, "D", 1);
+            }
+            jqList.sort((a, b) -> { // Tzc
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            bbList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("xflcList", bbList.stream().map(item ->
+                    Integer.parseInt(item.get("xflc").toString()))
+                    .collect(Collectors.toList()));
+            map.put("xfscList", bbList.stream().map(item ->
+                    Integer.parseInt(item.get("xfsc").toString()))
+                    .collect(Collectors.toList()));
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getJqAndPcTj(XftjQuery dto) {
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) {
+            throw new BusinessException("请选择查询时间");
+        }
+        Map<String, Object> map = new HashMap<>();
+        if (dto.getKssj().equals(dto.getJssj())) {
+            // 查询警情数据
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTj(dto.getKssj());
+            // 查询盘查人员数据
+            List<Map<String, Object>> pcRyList = this.baseMapper.getPcryTj(dto.getKssj());
+            // 查询盘查车辆数据
+            List<Map<String, Object>> pcClList = this.baseMapper.getPcclTj(dto.getKssj());
+            // 查询盘查重点人员数据
+            List<Map<String, Object>> zdryList = this.baseMapper.getPcZdryTj(dto.getKssj());
+            List<String> timeList = ImmutableList.of("00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
+                    "10", "11", "12", "13", "14", "15", "16", "17",
+                    "18", "19", "20", "21", "22", "23");
+            timeList.forEach(item -> {
+                boolean jqFlag = false;
+                boolean ryFlag = false;
+                boolean pcFlag = false;
+                boolean zdFlag = false;
+                for (Map<String, Object> jq : jqList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : pcRyList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        ryFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : pcClList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        pcFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : zdryList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        zdFlag = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!ryFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    pcRyList.add(mp);
+                }
+                if (!pcFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    pcClList.add(mp);
+                }
+                if (!zdFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    zdryList.add(mp);
+                }
+            });
+            jqList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            pcRyList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            pcClList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            zdryList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("pcRyList", pcRyList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("pcClList", pcClList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zdryList", zdryList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        } else {
+            // 警情
+            List<Map<String, Object>> jqList = this.baseMapper.getJqTjByTime(dto.getKssj(), dto.getJssj());
+            // 查询盘查人员
+            List<Map<String, Object>> pcRyList = this.baseMapper.getPcryByTime(dto.getKssj(), dto.getJssj());
+            // 查询盘查车辆信息
+            List<Map<String, Object>> pcClList = this.baseMapper.getPcclByTime(dto.getKssj(), dto.getJssj());
+            // 查询重点人员信息
+            List<Map<String, Object>> zdryList = this.baseMapper.getZdryByTime(dto.getKssj(), dto.getJssj());
+            Date kssj = DateUtils.strToDate(dto.getKssj(), "01");
+            Date jssj = DateUtils.strToDate(dto.getJssj(), "01");
+            while (kssj.getTime() <= jssj.getTime()) {
+                boolean jqFlag = false;
+                boolean ryFlag = false;
+                boolean clFlag = false;
+                boolean zdFlag = false;
+                for (Map<String, Object> item : jqList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : zdryList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        zdFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : pcClList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        clFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : pcRyList) { //Tzc
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        ryFlag = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!ryFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    pcRyList.add(mp);
+                }
+                if (!clFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    pcClList.add(mp);
+                }
+                if (!zdFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    zdryList.add(mp);
+                }
+                kssj = DateUtils.getNextDate(kssj, "D", 1);
+            }
+            jqList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            pcRyList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            pcClList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            zdryList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("pcRyList", pcRyList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("pcClList", pcClList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zdryList", zdryList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        }
+        return map;
+    }
+
+    @Override
+    public void addYjbj(TbJqYjbjDto dto) {
+        String sfdz;
+        UserInfo user = UserInfoManager.get();
+        TbJq jq = new TbJq();
+        BeanUtils.copyProperties(dto, jq);
+        if (dto.getJd() != null && dto.getWd() != null) {
+//            jq.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+//            jq.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+            sfdz = this.tbBaseAdaptRemoteService.getLocation(String.valueOf(dto.getJd()),
+                    String.valueOf(dto.getWd()));
+        } else {
+            throw new BusinessException("没有获取到位置信息！！");
+        }
+        jq.setId(UUIDGenerator.getUUID());
+        jq.setHrsj(new Date());
+        jq.setBjrq(new Date());
+        jq.setBjsj(new Date());
+        jq.setJjsj(new Date());
+        String time = DateUtils.getQueryDateString(jq.getBjsj(), "02");
+        String jqfsksnf = time.substring(0, 4);
+        String jqfsksyf = time.substring(5, 7);
+        String jqfsksxs = time.substring(11, 13);
+        String jqfsksny = jqfsksnf + jqfsksyf;
+        Calendar ca = Calendar.getInstance();
+        ca.setTime(jq.getBjsj());
+        Integer jqfskszs = ca.get(Calendar.WEEK_OF_YEAR);
+        jq.setJqfsksnf(Integer.valueOf(jqfsksnf));
+        jq.setJqfsksyf(Integer.valueOf(jqfsksyf));
+        jq.setJqfsksny(Integer.valueOf(jqfsksny));
+        jq.setJqfskszs(jqfskszs);
+        jq.setJqfsksxs(Integer.parseInt(jqfsksxs));
+        jq.setJqfsksrq(jq.getBjsj());
+        jq.setJqfskssj(jq.getBjsj());
+        jq.setBjdh(user.getPhone());
+        jq.setBjdhYhxm(user.getUserName());
+        jq.setBjdhYhdz(sfdz);
+        jq.setSfdz(sfdz);
+        jq.setBjrSfzh(user.getIdEntityCard());
+        jq.setBjrXm(user.getUserName());
+        jq.setBjrXb(IDCardUtil.getSex(user.getIdEntityCard()));
+        jq.setBjrLxdh(user.getPhone());
+        jq.setSfdzxzqh(user.getDszDeptCode().substring(0, 6));
+        jq.setBjnr("民警" + user.getUserName() + "于" + DateUtils.getQueryDateString(jq.getBjsj(), "02") +
+                "在" + sfdz + "发出一键报警，请立即支援！！");
+        jq.setJqjb("10");
+        jq.setBjlb("90000000");
+        jq.setBjlbmc("其他警情");
+        jq.setBjlx("90900000");
+        jq.setBjlxmc("其他警情");
+        jq.setSfzdjq("1");
+        jq.setCzzt("0");
+        jq.setZdjqtjlx("03");
+        jq.setSsbm(user.getDeptName());
+        jq.setSsbmdm(user.getDeptCode());
+        jq.setSsxgaj(user.getFxjDeptName());
+        jq.setSsxgajdm(user.getFxjDeptCode());
+        jq.setSssgaj(user.getDszDeptName());
+        jq.setSssgajdm(user.getDszDeptCode());
+        jq.setXtSjly("2");
+        this.baseMapper.insertEntity(jq);
+        // 发送警情数据到前端
+        WebSocketObject obj = new WebSocketObject("01", jq, null);
+        this.tbWebSocketAdaptRemoteService.sendMessage(obj);
+        // 查询附近巡组发送指令最近的巡组
+        this.sendZlxx(jq, user);
+    }
+
+    @Override
+    public void updateJqCzzt(String id, String czzt) {
+        this.baseMapper.updateJqCzzt(id, czzt);
+    }
+
+    // 查询周边巡组下发指令
+    private void sendZlxx(TbJq jq, UserInfo user) {
+        // 查询周边最近巡组
+        TbQwXfbbQueryByJlDto dto = new TbQwXfbbQueryByJlDto();
+        dto.setJd(jq.getJd());
+        dto.setWd(jq.getWd());
+        dto.setRadius(new BigDecimal("500"));
+        TbQwXfbb bb = this.tbQwzxAdaptRemoteService.getBbxxByJi(dto);
+        if (bb != null) {
+            TbZlxxInsertDto zl = new TbZlxxInsertDto();
+            zl.setId(UUIDGenerator.getUUID()).setYwId(jq.getId()).setZllx("05").setZlly("05").setZlzxlx("1")
+                    .setZlbt("一键报警指令")
+                    .setZlnr("民警" + user.getUserName() + "于" + DateUtils.getQueryDateString(jq.getBjsj(), "02") + "在" +
+                            jq.getSfdz() + "发出一键报警，请立即支援！！")
+                    .setZldj(jq.getJqjb()).setJd(jq.getJd()).setWd(jq.getWd()).setZlfsddxzqh(jq.getSfdzxzqh())
+                    .setZlfsdd(jq.getSfdz()).setZljsdx("03")
+                    .setSsbmid(bb.getSsbmid());
+            List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+            TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+            zxr.setZlId(zl.getId()).setZxrLx("03").setZxrXzid(bb.getId());
+            zxrDtoList.add(zxr);
+            zl.setZxrDtoList(zxrDtoList);
+            this.tbYjzlAdaptRrmoteService.addZl(zl);
+        }
+    }
+
+    @Override
+    public TbJqVo queryById(String id) {
+        TbJq jq = this.baseMapper.queryById(id);
+        if (jq == null) {
+            return null;
+        }
+        TbJqVo vo = new TbJqVo();
+        BeanUtils.copyProperties(jq, vo);
+        TbSj sj = this.tbSjMapper.selectOne(
+                new LambdaQueryWrapper<TbSj>()
+                        .eq(TbSj::getYwId, jq.getId())
+        );
+        vo.setSj(sj);
+        return vo;
+    }
+
+
+    @Override
+    public int insert(TbJq jq) {
+        if (jq.getJd() != null && jq.getWd() != null) {
+            // 计算hash值和经纬度坐标
+            jq.setZb(JtsUtils.getPoint(jq.getJd(), jq.getWd()));
+            jq.setZbhash(GeoHashKit.encode(jq.getJd(), jq.getWd()));
+        }
+
+        int integer = this.baseMapper.selectCount(new LambdaQueryWrapper<TbJq>().eq(TbJq::getJjdbh, jq.getJjdbh()));
+        if (integer < 1) {
+            //接警单编号存到redis
+            int i = this.baseMapper.insertEntity(jq);
+            if (i > 0) {
+//                redisService.setCacheObject(Constant.JQ + jq.getJjdbh(), DateUtils.getQueryDateString(jq.getBjsj(), "02"), 3L, TimeUnit.HOURS);
+//                //推送socket 发送警情数据到前端
+//                jq.setZb(null);
+//                WebSocketObject obj = new WebSocketObject("06", jq, null);
+//                this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+//                this.xfzl(jq);
+            }
+            return i;
+        }
+        return 0;
+    }
+
+
+    @Override
+    public void update(TbJq jq) {
+        this.baseMapper.updateEntity(jq);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return this.baseMapper.deleteById(id) > 0;
+    }
+
+    @Override
+    public IPage<TbJqVo> getPageListLz(TbJqPageListQuery dto) {
+        List<String> jqjbList = StringUtils.isNotEmpty(dto.getJqjb()) ?
+                Arrays.asList(dto.getJqjb().split(",")) : null;
+        List<String> czztList = StringUtils.isNotEmpty(dto.getCzzt()) ?
+                Arrays.asList(dto.getCzzt().split(",")) : null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("list", jqjbList);
+        map.put("czztList", czztList);
+        int count = this.baseMapper.getCount(map);
+        List<TbJq> list = this.baseMapper.getListByPage(map);
+        List<TbJqVo> rList = new ArrayList<>();
+        // 查询对应的处警状态
+        list.forEach(item -> {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(item, vo);
+            List<TbJqCjdb> cjdbList = this.tbJqCjdbMapper.selectList(
+                    new LambdaQueryWrapper<TbJqCjdb>()
+                            .eq(TbJqCjdb::getJjdbh, item.getJjdbh())
+                            .orderByDesc(TbJqCjdb::getRksj)
+            );
+            vo.setCjdbList(cjdbList);
+            rList.add(vo);
+        });
+        IPage<TbJqVo> page = new Page<>();
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public List<TbJqCjdb> getListCjd(String jjdbh) {
+        List<TbJqCjdb> cjdbList = this.tbJqCjdbMapper.selectList(
+                new LambdaQueryWrapper<TbJqCjdb>()
+                        .eq(TbJqCjdb::getJjdbh, jjdbh)
+                        .orderByDesc(TbJqCjdb::getRksj)
+        );
+        return cjdbList;
+    }
+
+    @Override
+    public IPage<TbJqVo> selectPageList(TbJqPageListQuery dto) {
+        List<String> jqjbList = StringUtils.isNotEmpty(dto.getJqjb()) ?
+                Arrays.asList(dto.getJqjb().split(",")) : null;
+        List<String> czztList = StringUtils.isNotEmpty(dto.getCzzt()) ?
+                Arrays.asList(dto.getCzzt().split(",")) : null;
+        List<String> bjlbList = StringUtils.isNotEmpty(dto.getBjlbs()) ?
+                Arrays.asList(dto.getBjlbs().split(",")) : null;
+
+        if (StringUtils.isNotBlank(dto.getType())) {
+            if (dto.getType().equals("02") || dto.getType().equals("03")) {
+                UserInfo user = UserInfoManager.getUser();
+                if (user.getDeptName().substring(user.getDeptName().length() - 1).equals("队")) {
+                    if (user.getDeptCode().substring(user.getDeptCode().length() - 4).equals("0000")) {
+                        dto.setSsbmdm(user.getDeptCode().substring(0, 8));
+                    } else {
+                        dto.setSsbmdm(user.getDeptCode());
+                    }
+                } else {
+                    dto.setSsbmdm(user.getDeptCode().substring(0, 8));
+                }
+            } else {
+                dto.setSsbmdm(null);
+            }
+        } else {
+            dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("list", jqjbList);
+        map.put("czztList", czztList);
+        map.put("bjlbList", bjlbList);
+        int count = this.baseMapper.getCount(map);
+        List<TbJq> list = this.baseMapper.getListByPage(map);
+        List<TbJqVo> rList = new ArrayList<>();
+        // 查询对应的处警状态
+        list.forEach(item -> {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(item, vo);
+//            List<TbJqCjdb> cjdbList = this.tbJqCjdbMapper.selectList(
+//                    new LambdaQueryWrapper<TbJqCjdb>()
+//                            .eq(TbJqCjdb::getJjdbh, item.getJjdbh())
+//                            .orderByDesc(TbJqCjdb::getRksj)
+//            );
+//            vo.setCjdbList(cjdbList);
+            rList.add(vo);
+        });
+        IPage<TbJqVo> page = new Page<>();
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public List<TbJqVo> getList(TbJqListQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime()) && dto.getStartTime().length() < 19) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime()) && dto.getEndTime().length() < 19) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        List<String> bjlbList = StringUtils.isNotEmpty(dto.getBjlbs()) ?
+                Arrays.asList(dto.getBjlbs().split(",")) : null;
+        List<String> mylbList = StringUtils.isNotEmpty(dto.getMylb()) ?
+                Arrays.asList(dto.getMylb().split(",")) : null;
+        List<String> nrlb = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(mylbList)) {
+            for (String s : mylbList) {
+                switch (s) {
+                    case "1":
+                        nrlb.add("打架");
+                        nrlb.add("斗殴");
+                        break;
+                    case "2":
+                        nrlb.add("抢");
+                        nrlb.add("盗");
+                        nrlb.add("窃");
+                        break;
+                }
+            }
+        }
+        map.put("bjlbList", bjlbList);
+        map.put("mylbList", nrlb);
+        List<TbJq> list = this.baseMapper.getList(map);
+        List<TbJqVo> rList = new ArrayList<>();
+        // 查询对应的处警状态
+        list.forEach(item -> {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(item, vo);
+            rList.add(vo);
+        });
+        return rList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getJqHotMap(TbJqListQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        List<String> bjlbList = StringUtils.isNotEmpty(dto.getBjlbs()) ?
+                Arrays.asList(dto.getBjlbs().split(",")) : null;
+        map.put("bjlbList", bjlbList);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        List<Map<String, Object>> list = this.baseMapper.getJqHotMap(map);
+
+        return list;
+    }
+
+
+    @Override
+    public int getJqCount(TbJqListQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        return this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getXtSjzt, "1")
+                        .eq(StringUtils.isNotEmpty(dto.getJqjb()), TbJq::getJqjb, dto.getJqjb())
+                        .ge(StringUtils.isNotBlank(dto.getStartTime()), TbJq::getBjsj, dto.getStartTime())
+                        .le(StringUtils.isNotBlank(dto.getEndTime()), TbJq::getBjsj, dto.getEndTime())
+        );
+    }
+
+    // 查询今日当前24小时的警情趋势图
+    @Override
+    public Object getJqBy24h(String ssbmdm) {
+        List<String> timeList = new ArrayList<String>() {{
+            this.add("00-02");
+            this.add("02-04");
+            this.add("04-06");
+            this.add("06-08");
+            this.add("08-10");
+            this.add("10-12");
+            this.add("12-14");
+            this.add("14-16");
+            this.add("16-18");
+            this.add("18-20");
+            this.add("20-22");
+            this.add("22-23");
+        }};
+        String date = DateUtils.getQueryDateString(new Date(), "01");
+        List<Integer> list = new ArrayList<>();
+        timeList.forEach(item -> {
+            String kssj = date + " " + item.split("-")[0] + ":00:00";
+            String jssj = date + " " + item.split("-")[1] + ":00:00";
+            list.add(this.getJqCountByTime(ssbmdm, kssj, jssj));
+        });
+        Map<String, Object> map = new HashMap<>();
+        map.put("time", timeList);
+        map.put("count", list);
+        return map;
+    }
+
+    @Override
+    public IPage<TbJqVo> getZfgkList(TbJqPageListQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        UserInfo userInfo = UserInfoManager.get();
+        map.put("useSql", userInfo != null ? PermissionsUtil.createSqlOfCode("", userInfo) : "");
+        int count = this.baseMapper.getZfgkCount(map);
+        List<TbJq> list = this.baseMapper.getZfgkList(map);
+        List<TbJqVo> rList = new ArrayList<>();
+        // 查询对应的处警状态
+        list.forEach(item -> {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(item, vo);
+            List<TbJqCjdb> cjdbList = this.tbJqCjdbMapper.selectList(
+                    new LambdaQueryWrapper<TbJqCjdb>()
+                            .eq(TbJqCjdb::getJjdbh, item.getJjdbh())
+                            .orderByDesc(TbJqCjdb::getRksj)
+            );
+            vo.setCjdbList(cjdbList);
+            rList.add(vo);
+        });
+        IPage<TbJqVo> page = new Page<>();
+        page.setRecords(rList);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public Object getjrjqczfx(String ssbmdm) {
+        String date = DateUtils.getQueryDateString(new Date(), "01");
+        // 查询警情信息列表
+        List<TbJq> jqList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getXtSjzt, "1")
+                        .last(" and jqfsksrq >= '" + date + "'  and jqfsksrq <= '" + date + "'")
+        );
+        int data1 = 0;
+        int data2 = 0;
+        int data3 = 0;
+        int data5 = 0;
+        int data7 = 0;
+        int data9 = 0;
+        for (TbJq item : jqList) {// 查询警情的最新的处置状态
+            TbJqZxr zxr = this.tbjqZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbJqZxr>()
+                            .eq(TbJqZxr::getJjdbh, item.getJjdbh())
+                            .last(" order by czsj desc limit 1")
+            );
+            if (zxr != null) {
+                if (1 == zxr.getZt()) {
+                    data1++;
+                } else if (2 == zxr.getZt()) {
+                    data2++;
+                } else if (3 == zxr.getZt()) {
+                    data3++;
+                } else if (5 == zxr.getZt()) {
+                    data5++;
+                } else if (7 == zxr.getZt()) {
+                    data7++;
+                } else if (9 == zxr.getZt()) {
+                    data9++;
+                }
+            }
+        }
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", "1");
+        map.put("data", data1);
+        list.add(map);
+        map = new HashMap<>();
+        map.put("type", "2");
+        map.put("data", data2);
+        list.add(map);
+        map = new HashMap<>();
+        map.put("type", "3");
+        map.put("data", data3);
+        list.add(map);
+        map = new HashMap<>();
+        map.put("type", "5");
+        map.put("data", data5);
+        list.add(map);
+        map = new HashMap<>();
+        map.put("type", "7");
+        map.put("data", data7);
+        list.add(map);
+        map = new HashMap<>();
+        map.put("type", "9");
+        map.put("data", data9);
+        list.add(map);
+        return list;
+    }
+
+    @Override
+    public Integer addXzjq(GxAlarmAllVo item) {
+        TbJqAll jqAll = this.tbJqAllMapper.selectOne(
+                new LambdaQueryWrapper<TbJqAll>()
+                        .eq(TbJqAll::getJq110Id, item.getId())
+                        .eq(TbJqAll::getXtSjzt, "1")
+        );
+        if (jqAll == null) {
+            // 添加警情5+2主城区表
+            jqAll = new TbJqAll();
+            jqAll.setId(UUIDGenerator.getUUID());
+            jqAll.setJq110Id(item.getId());
+            jqAll.setJjdbh(item.getIncidentCode());
+            jqAll.setJjdwbh(item.getMainOrgId());
+            jqAll.setJjdwmc(item.getMainOrgName());
+            jqAll.setGljjdbh(item.getRelatedIncidentCode());
+            jqAll.setJjybh(item.getFirstReceivePersonId());
+            jqAll.setJjyxm(item.getFirstReceivePersonName());
+            jqAll.setHrsj(item.getFirstCallinTime());
+            jqAll.setLhlxbh(item.getCallinType());
+            jqAll.setBjfsbh(item.getAlarmMode());
+            jqAll.setBjrq(item.getFirstCallinTime());
+            jqAll.setBjsj(item.getFirstCallinTime());
+            jqAll.setJqfsksnf(Integer.valueOf(DateUtils.getQueryDateString(item.getFirstCallinTime(), "13")));
+            jqAll.setJqfsksyf(Integer.valueOf(DateUtils.getQueryDateString(item.getFirstCallinTime(), "14")));
+            jqAll.setJqfsksny(Integer.valueOf(com.mosty.base.utils.DateUtils.getQueryDateString(item.getFirstCallinTime(), "15")));
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(item.getFirstCallinTime());
+            int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+            jqAll.setJqfskszs(yjfszs);
+            jqAll.setJqfskssj(item.getFirstCallinTime());
+            jqAll.setJqfsksxs(Integer.valueOf(com.mosty.base.utils.DateUtils.getQueryDateString(item.getFirstCallinTime(), "16")));
+            jqAll.setBjdh(item.getContactTelNo());
+            jqAll.setBjdhYhxm(item.getAlarmPersonName());
+            jqAll.setBjrXm(item.getAlarmPersonName());
+            jqAll.setBjrLxdh(item.getContactTelNo());
+            jqAll.setSfdzxzqh(item.getAdminCode());
+            jqAll.setSfdz(item.getAlarmAddress());
+            jqAll.setBjnr(item.getAlarmContent());
+            jqAll.setJqjb(item.getAlarmLevel());
+            jqAll.setBjlbmc(item.getLbmc());
+            jqAll.setBjlxmc(item.getLxmc());
+            jqAll.setBjxlmc(item.getXlmc());
+            jqAll.setBjlb(item.getAlarmMajorType());
+            jqAll.setBjlx(item.getAlarmSubType());
+            jqAll.setBjxl(item.getAlarmMinorType());
+            jqAll.setSfzdjq("1".equals(jqAll.getJqjb()) ? "1" : "0");
+            if (item.getLongitude() != null) {
+                jqAll.setJd(item.getLongitude());
+            }
+            if (item.getLatitude() != null) {
+                jqAll.setWd(item.getLatitude());
+            }
+            if (jqAll.getJd() != null && jqAll.getWd() != null) {
+                jqAll.setZb(JtsUtils.getPoint(jqAll.getJd(), jqAll.getWd()));
+                jqAll.setZbhash(GeoHashKit.encode(jqAll.getJd(), jqAll.getWd()));
+            }
+            jqAll.setSsbmdm(item.getMainOrgId());
+            jqAll.setSsbm(item.getMainOrgName());
+            jqAll.setSsxgajdm(item.getSubBureauId());
+            jqAll.setSsxgaj(item.getSubBureauName());
+            jqAll.setSssgaj(item.getFirstReceiveOrgName());
+            jqAll.setSssgajdm(item.getFirstReceiveOrgId());
+            jqAll.setXtSjly("1");
+            jqAll.setCzzt("0");
+            if ("510109000000".equals(item.getSubBureauId())) {
+                TbJq jq = new TbJq();
+                BeanUtils.copyProperties(jqAll, jq);
+                // 添加所属派出所名称和所属分县局名称
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jq.getSsbmdm());
+                if (dept != null) {
+                    jq.setSsbmdm(dept.getDeptcode());
+                    jq.setSsbm(dept.getDeptname());
+                    jq.setSsxgaj(dept.getFxjname());
+                    jq.setSsxgajdm(dept.getFxjcode());
+                    jq.setSssgaj(dept.getDszname());
+                    jq.setSssgajdm(dept.getDszcode());
+                }
+                // 判断是否为街面警情
+                this.checkJmjq(jq);
+                this.insert(jq);
+            }
+            // 判断是否为街面警情
+            this.checkJmjq(jqAll);
+            return this.tbJqAllMapper.insertEntity(jqAll);
+        }
+        return 0;
+    }
+
+    // 添加警情地址
+    private void addJqdz(TbJq jq, DeptInfoVo dept) {
+        TbJqDz dz = new TbJqDz();
+        dz.setId(UUIDGenerator.getUUID());
+        dz.setJqId(jq.getId());
+        dz.setDztzSj(jq.getBjsj());
+        dz.setDztzRyid("-1");
+        dz.setDztzRysfzh("000000");
+        dz.setDztzRyxm("系统");
+        if (jq.getJd() != null && jq.getWd() != null) {
+            dz.setJd(jq.getJd());
+            dz.setWd(jq.getWd());
+            dz.setZb(JtsUtils.getPoint(jq.getJd(), jq.getWd()));
+            dz.setZbhash(GeoHashKit.encode(jq.getJd(), jq.getWd()));
+        }
+        dz.setDzxzqh(jq.getSfdzxzqh());
+        dz.setDz(jq.getSfdz());
+        dz.setXtSjly("1");
+        if (dept != null) {
+            dz.setSsbmdm(dept.getDeptcode());
+            dz.setSsbm(dept.getDeptname());
+            dz.setSsxgaj(dept.getFxjname());
+            dz.setSsxgajdm(dept.getFxjcode());
+            dz.setSssgaj(dept.getDszname());
+            dz.setSssgajdm(dept.getDszcode());
+        }
+        this.tbJqDzMapper.insertEntity(dz);
+    }
+
+
+    @Override
+    public Map<String, Object> getStatistics(TbJqListQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        List<Map<String, Object>> list = this.baseMapper.getStatistics(dto);
+        int xsCount = 0, xzCount = 0, jtCount = 0, qtCount = 0;
+        for (Map<String, Object> item : list) {
+            if ("01000000".equals(String.valueOf(item.get("bjlb")))) {
+                xsCount += Integer.parseInt(String.valueOf(item.get("count")));
+            } else if ("02000000".equals(String.valueOf(item.get("bjlb")))) {
+                xzCount += Integer.parseInt(String.valueOf(item.get("count")));
+            } else if ("03000000".equals(String.valueOf(item.get("bjlb")))) {
+                jtCount += Integer.parseInt(String.valueOf(item.get("count")));
+            } else {
+                qtCount += Integer.parseInt(String.valueOf(item.get("count")));
+            }
+        }
+        map.put("xsCount", xsCount);
+        map.put("xzCount", xzCount);
+        map.put("jtCount", jtCount);
+        map.put("qtCount", qtCount);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getAllStatistics() {
+        String time = DateUtils.getQueryDateString(new Date(), "01");
+        String yesterday = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        Map<String, Object> map = new HashMap<>();
+        map.put("xsjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xzjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "02000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("qt", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .notIn(TbJq::getBjlb, "02000000", "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xsjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        map.put("xzjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "02000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        map.put("qtY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .notIn(TbJq::getBjlb, "02000000", "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getJmjqStatistics() {
+        String time = DateUtils.getQueryDateString(new Date(), "01");
+        String yesterday = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        Map<String, Object> map = new HashMap<>();
+        map.put("xsjmjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "01110200", "01110300", "01120300", "01120400", "01120700", "01120800",
+                                "01121000", "01130100", "01140100", "01149900")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xzjmjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "02030200", "02030300", "02030400", "02030500", "02040100",
+                                "02050100", "02050400", "02121700", "02130000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xsjmjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "01110200", "01110300", "01120300", "01120400", "01120700", "01120800",
+                                "01121000", "01130100", "01140100", "01149900")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        map.put("xzjmjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "02030200", "02030300", "02030400", "02030500", "02040100",
+                                "02050100", "02050400", "02121700", "02130000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getWffzStatistics() {
+        String time = DateUtils.getQueryDateString(new Date(), "01");
+        String yesterday = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        Map<String, Object> map = new HashMap<>();
+        map.put("xsjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xzjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "02000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xsjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "01000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        map.put("xzjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getBjlb, "02000000")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDqscStatistics() {
+        String time = DateUtils.getQueryDateString(new Date(), "01");
+        String yesterday = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        Map<String, Object> map = new HashMap<>();
+        map.put("xsscjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "01120400", "01120800")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xzscjq", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "02030200", "02030300")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + time + "'")
+        ));
+        map.put("xsscjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "01120400", "01120800")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        map.put("xzscjqY", this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .in(TbJq::getBjxl, "02030200", "02030300")
+                        .eq(TbJq::getSsxgajdm, "510109000000")
+                        .last(" and date_format(bjrq,'%Y-%m-%d') = '" + yesterday + "'")
+        ));
+        return map;
+    }
+
+    @Override
+    // 警情类型 1.总警情 2.街面警情 3.违法犯罪
+    public Object jqtjDbFjjqzs(String type, String ssfjdm, String jqType) {
+        Map<String, Object> map = new HashMap<>();
+        List<String> timeList = new ArrayList<>();
+        List<Integer> data1 = new ArrayList<>();
+        List<Integer> data2 = new ArrayList<>();
+        List<Integer> data3 = new ArrayList<>();
+        if ("1".equals(type)) {
+            String t = DateUtils.getQueryDateString(new Date(), "01") + " ";
+            String m = ":00:00";
+            String s = ":59:59";
+            timeList.add(t + "23" + s);
+            timeList.add(t + "20" + m);
+            timeList.add(t + "16" + m);
+            timeList.add(t + "12" + m);
+            timeList.add(t + "08" + m);
+            timeList.add(t + "04" + m);
+            timeList.add(t + "00" + m);
+        } else if ("2".equals(type)) {
+            for (int i = 0; i < 8; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i), "02"));
+            }
+        } else if ("3".equals(type)) {
+            for (int i = 0; i < 7; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 6), "02"));
+            }
+        } else if ("4".equals(type)) {
+            for (int i = 0; i < 8; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 9), "02"));
+            }
+        }
+        Collections.reverse(timeList);
+        for (int i = 0; i < timeList.size() - 1; i++) {
+            if ("1".equals(jqType)) {
+                data1.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+                data2.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .in(TbJq::getBjxl, Arrays.asList(JmjqList))
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+                data3.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .in(TbJq::getBjlb, Arrays.asList(wffzList))
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+            } else if ("2".equals(jqType)) {
+                data1.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .in(TbJq::getBjxl, Arrays.asList(jmxsjqList))
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+                data2.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .in(TbJq::getBjxl, Arrays.asList(jmxzjqList))
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+            } else if ("3".equals(jqType)) {
+                data1.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .eq(TbJq::getBjlb, "01000000")
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+                data2.add(this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(StringUtils.isNotEmpty(ssfjdm), TbJq::getSsxgajdm, ssfjdm)
+                                .eq(TbJq::getBjlb, "02000000")
+                                .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') between '" + timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+                ));
+            }
+        }
+        timeList.remove(0);
+        List<String> tempList = new ArrayList<>();
+        timeList.forEach(item -> {
+            String time = "";
+            if ("1".equals(type)) {
+                time = DateUtils.getQueryDateString(DateUtils.strToDate(item, "02"), "16");
+            } else {
+                time = DateUtils.getQueryDateString(DateUtils.strToDate(item, "02"), "18");
+            }
+            tempList.add(time);
+        });
+        timeList = tempList;
+        map.put("timeList", timeList);
+        map.put("data1", data1);
+        map.put("data2", data2);
+        map.put("data3", data3);
+        return map;
+    }
+
+    @Override
+    // type 查询类型 1.今日 2.近一周 3.近一月
+    public Object jqtjDbCqfjhb(String type, String jqType) {
+        // 各分局行政区划代码
+        List<Map<String, String>> orgList = this.getCode();
+        List<Map<String, Object>> list = new ArrayList<>();
+        String kssj = "", jssj = "", startTime = "", endTime = "";
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -180), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+        }
+        for (Map<String, String> org : orgList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("orgcode", org.get("orgcode"));
+            map.put("orgname", org.get("orgname"));
+
+
+            int count;
+            int count1;
+            int count2;
+            count = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsxgajdm, org.get("orgcode"))
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+            );
+            count1 = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsxgajdm, org.get("orgcode"))
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + startTime + "' and '" + endTime + "'")
+            );
+            count2 = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+            );
+
+            // 本
+            map.put("count", count);
+            // 上
+            map.put("count1", count1);
+            // 本-所有
+            map.put("count2", count2);
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    // type 查询类型 1.今日 2.近一周 3.近一月
+    public Object jqtjDbCqfjhbTable(String type, String ssfjdm, String jqType) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, String>> orgList = this.getCode();
+        List<Map<String, String>> bjlbList = this.getBjlbList();
+        List<String> bjlbs = bjlbList.stream().map(item -> item.get("code")).collect(Collectors.toList());
+        String kssj = "", jssj = "";
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        }
+        for (Map<String, String> bjlb : bjlbList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("code", bjlb.get("code"));
+            map.put("name", bjlb.get("name"));
+            for (Map<String, String> org : orgList) {
+                map.put(org.get("orgname"), this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(TbJq::getSsxgajdm, org.get("orgcode"))
+                                .eq(TbJq::getBjlb, bjlb.get("code"))
+                                .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+                ));
+
+            }
+            list.add(map);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", "00000000");
+        map.put("name", "其他");
+        for (Map<String, String> org : orgList) {
+            map.put("orgcode", org.get("orgcode"));
+            try {
+                map.put(org.get("orgname"), this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(TbJq::getSsxgajdm, org.get("orgcode"))
+                                .notIn(TbJq::getBjlb, bjlbs)
+                                .between(TbJq::getBjsj, DateUtils.strToDate(kssj, "1").getTime(), DateUtils.strToDate(jssj, "1").getTime()))
+                        .intValue());
+            } catch (Exception e) {
+                System.err.println("APP警情分析-对比分析-城区分局警情环比-列表 ES失败" + e.getMessage());
+                map.put(org.get("orgname"), this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(TbJq::getSsxgajdm, org.get("orgcode"))
+                                .notIn(TbJq::getBjlb, bjlbs)
+                                .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+                ));
+            }
+        }
+        list.add(map);
+        return list;
+    }
+
+    @Override
+    public Object jqtjDbPcsHb(String type, String ssfjdm, String jqType) {
+        // 查询派出所代码
+        List<SysDeptDTO> orgList = this.tbBaseAdaptRemoteService.getPcsByFxjdm(ssfjdm);
+        List<Map<String, Object>> list = new ArrayList<>();
+        String kssj = "", jssj = "", startTime = "", endTime = "";
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", -180), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", -90), "01");
+        }
+        for (SysDeptDTO org : orgList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("orgcode", org.getOrgCode());
+            map.put("orgname", org.getOrgJc());
+            int count;
+            int count1;
+            int count2;
+            count = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsbmdm, org.getOrgCode())
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+            );
+            count1 = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsbmdm, org.getOrgCode())
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + startTime + "' and '" + endTime + "'")
+            );
+            count2 = this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsxgajdm, ssfjdm)
+                            .in(StringUtils.isNotEmpty(jqType) && "2".equals(jqType), TbJq::getBjxl, Arrays.asList(JmjqList))
+                            .in(StringUtils.isNotEmpty(jqType) && "3".equals(jqType), TbJq::getBjlb, Arrays.asList(wffzList))
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+            );
+
+            // 本
+            map.put("count", count);
+            // 上
+            map.put("count1", count1);
+            // 本-所有
+            map.put("count2", count2);
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public Object jqtjDbPcsHbTable(String type, String ssfjdm, String jqType) {
+        Map<String, Object> resMap = new HashMap<>();
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<SysDeptDTO> orgList = this.tbBaseAdaptRemoteService.getPcsByFxjdm(ssfjdm);
+        List<Map<String, String>> bjlbList = this.getBjlbList();
+        List<String> bjlbs = bjlbList.stream().map(item -> item.get("code")).collect(Collectors.toList());
+        String kssj = "", jssj = "", startTime = "", endTime = "";
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -180), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+        }
+        for (Map<String, String> bjlb : bjlbList) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("code", bjlb.get("code"));
+            map.put("name", bjlb.get("name"));
+            for (SysDeptDTO org : orgList) {
+                map.put(org.getOrgJc() + "_data1", this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(TbJq::getSsbmdm, org.getOrgCode())
+                                .eq(TbJq::getBjlb, bjlb.get("code"))
+                                .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+                ));
+                map.put(org.getOrgJc() + "_data2", this.baseMapper.selectCount(
+                        new LambdaQueryWrapper<TbJq>()
+                                .eq(TbJq::getSsbmdm, org.getOrgCode())
+                                .eq(TbJq::getBjlb, bjlb.get("code"))
+                                .last(" and date_format(bjrq,'%Y-%m-%d') between '" + startTime + "' and '" + endTime + "'")
+                ));
+
+
+            }
+            list.add(map);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", "00000000");
+        map.put("name", "其他");
+        for (SysDeptDTO org : orgList) {
+            map.put(org.getOrgJc() + "_data1", this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsbmdm, org.getOrgCode())
+                            .notIn(TbJq::getBjlb, bjlbs)
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+            ));
+            map.put(org.getOrgJc() + "_data2", this.baseMapper.selectCount(
+                    new LambdaQueryWrapper<TbJq>()
+                            .eq(TbJq::getSsbmdm, org.getOrgCode())
+                            .notIn(TbJq::getBjlb, bjlbs)
+                            .last(" and date_format(bjrq,'%Y-%m-%d') between '" + startTime + "' and '" + endTime + "'")
+            ));
+
+        }
+        list.add(map);
+        return list;
+    }
+
+    @Override
+    public Object jqtjSgFirst(String type, String ssfjdm, String jqType, String sdlx) {
+        String kssj = "", jssj = "";
+        List<String> timeList = new ArrayList<>();
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        }
+        return null;
+    }
+
+    @Override
+    public List<TbJqVo> getGljq(String jjdbh) {
+        List<TbJq> jqList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getGljjdbh, jjdbh)
+                        .or(item -> item.eq(TbJq::getJjdbh, jjdbh))
+        );
+        List<TbJqVo> voList = new ArrayList<>();
+        jqList.forEach(item -> {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(item, vo);
+            voList.add(vo);
+        });
+        return voList;
+    }
+
+    @Override
+    public Integer addXzJqCjdb(GxCjdb cjdb) {
+        TbJqCjdb jqCjdb = new TbJqCjdb();
+        BeanUtils.copyProperties(cjdb, jqCjdb);
+        jqCjdb.setXtSjly("1");
+        jqCjdb.setId(UUIDGenerator.getUUID());
+        return this.tbJqCjdbMapper.insert(jqCjdb);
+    }
+
+    @Override
+    public IPage<TbJqCjdb> getCjList(TbJqCjdbQuery dto) {
+        return this.tbJqCjdbMapper.selectPage(
+                new Page<TbJqCjdb>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbJqCjdb>()
+                        .eq(TbJqCjdb::getJjdbh, dto.getJjdbh())
+                        .eq(TbJqCjdb::getXtSjzt, "1")
+                        .orderByDesc(TbJqCjdb::getCjsj)
+        );
+    }
+
+    @Override
+    public int addRsJq(TbJq entity) {
+        TbJq jq = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getJq110Id, entity.getJq110Id())
+        );
+        if (jq == null) {
+            entity.setId(UUIDGenerator.getUUID());
+            // 判断是否为街面警情
+            this.checkJmjq(entity);
+            return this.insert(entity);
+        }
+        return 0;
+    }
+
+    @Override
+    public TbJqVo getLastJq() {
+        TbJq jq = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbJq>()
+//                        .eq(TbJq::getBjrq, new Date())
+                        .orderByDesc(TbJq::getBjsj)
+                        .last(" limit 1")
+        );
+        if (jq != null) {
+            TbJqVo vo = new TbJqVo();
+            BeanUtils.copyProperties(jq, vo);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public TbJqCjdb getLastJqCjdb() {
+        return this.tbJqCjdbMapper.selectOne(
+                new LambdaQueryWrapper<TbJqCjdb>()
+                        .orderByDesc(TbJqCjdb::getRksj)
+                        .last(" limit 1")
+        );
+    }
+
+    @Override
+    public void addRsCjdb(TbJqCjdb cjdb) {
+        //补全警情经纬度
+        TbJq tbJq = this.baseMapper.selectOne(new LambdaQueryWrapper<TbJq>().eq(TbJq::getJjdbh, cjdb.getJjdbh()).last(" limit 1"));
+        if (ObjectUtils.isNotEmpty(tbJq) && ObjectUtils.isNotEmpty(cjdb.getFkdwxzb()) && !String.valueOf(cjdb.getFkdwxzb()).equals("0.00000")) {
+            tbJq.setJd(cjdb.getFkdwxzb());
+            tbJq.setWd(cjdb.getFkdwyzb());
+
+
+            this.baseMapper.updateById(tbJq);
+        }
+        this.tbJqCjdbMapper.insert(cjdb);
+    }
+
+
+    @Override
+    public JSONObject situation(String startTime, String endTime) {
+        String url = Constant.XZ_URL + "faAlarm/situation";
+        JSONObject map = new JSONObject();
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        String res = HttpUtils.executePostJSON(url, map.toString(), null);
+        if (res != null) return JSONObject.parseObject(res);
+        return null;
+    }
+
+    @Override
+    public JSONObject alarmSituation(String startTime, String endTime) {
+        String url = Constant.XZ_URL + "synthesis/alarmSituation";
+        JSONObject map = new JSONObject();
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        String res = HttpUtils.executePostJSON(url, map.toString(), null);
+        if (res != null) return JSONObject.parseObject(res);
+        return null;
+    }
+
+
+    @Override
+    public void addYbJq(Jjdb jjdb) {
+        TbJq jq = new TbJq();
+        jq.setId(UUIDGenerator.getUUID());
+        jq.setJjdbh(jjdb.getJjdbh());
+        jq.setJjdwbh(jjdb.getJjdwdm());
+        DeptInfoVo dept1 = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jjdb.getJjdwdm());
+        if (dept1 != null) {
+            jq.setJjdwmc(dept1.getDeptname());
+        }
+        jq.setGljjdbh(jjdb.getJjdbh());
+        jq.setJjybh(jjdb.getJjybh());
+        jq.setJjyxm(jjdb.getJjyxm());
+        jq.setHrsj(jjdb.getBjsj());
+        jq.setLhlxbh(jjdb.getLhlx());
+        jq.setBjfsbh(jjdb.getJqlyfs());
+        jq.setBjrq(jjdb.getBjsj());
+        jq.setBjsj(jjdb.getBjsj());
+        jq.setJjsj(jjdb.getBjsj());
+        jq.setJjlyh(jjdb.getJjlyh());
+        String time = DateUtils.getQueryDateString(jq.getBjsj(), "02");
+        if (time != null) {
+            String jqfsksnf = time.substring(0, 4);
+            String jqfsksyf = time.substring(5, 7);
+            String jqfsksxs = time.substring(11, 13);
+            String jqfsksny = jqfsksnf + jqfsksyf;
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(jjdb.getBjsj());
+            Integer jqfskszs = ca.get(Calendar.WEEK_OF_YEAR);
+            jq.setJqfsksnf(Integer.valueOf(jqfsksnf));
+            jq.setJqfsksyf(Integer.valueOf(jqfsksyf));
+            jq.setJqfsksny(Integer.valueOf(jqfsksny));
+            jq.setJqfskszs(jqfskszs);
+            jq.setJqfsksxs(Integer.parseInt(jqfsksxs));
+            jq.setJqfsksrq(jq.getBjsj());
+            jq.setJqfskssj(jq.getBjsj());
+        }
+        jq.setBjdh(jjdb.getBjdh());
+        jq.setBjdhYhxm(jjdb.getBjdhyhm());
+        jq.setBjdhYhdz(jjdb.getBjdhyhdz());
+        jq.setBjrXm(jjdb.getBjrmc());
+        jq.setBjrXb(jjdb.getBjrxbdm());
+        jq.setBjrLxdh(jjdb.getLxdh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jjdb.getGxdwdm());
+        if (ObjectUtils.isEmpty(dept) || ObjectUtils.isEmpty(dept.getDeptid())) {
+            dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jjdb.getGxdwdm().substring(0, 6) + "000000");
+        }
+        if (ObjectUtils.isEmpty(dept) || ObjectUtils.isEmpty(dept.getDeptid())) {
+            dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(jjdb.getGxdwdm().substring(0, 4) + "00000000");
+        }
+        jq.setSfdzxzqh((StringUtils.isNotEmpty(jjdb.getGxdwdm()) && jjdb.getGxdwdm().length() >= 6)
+                ? jjdb.getGxdwdm().substring(0, 6) : "");
+        jq.setSfdz(jjdb.getJqdz());
+        jq.setBjnr(jjdb.getBjnr());
+        jq.setJqjb(jjdb.getJqdjdm());
+        jq.setBjlb(jjdb.getJqlbdm());
+        jq.setBjlx(jjdb.getJqlxdm());
+        jq.setBjxl(jjdb.getJqxldm());
+        jq.setSfzdjq("0");
+        if (jjdb.getFxdwjd() != null && !String.valueOf(jjdb.getFxdwjd()).equals("0.00000")) {
+            jq.setJd(jjdb.getFxdwjd());
+            jq.setWd(jjdb.getFxdwwd());
+        }
+        jq.setCzzt(jjdb.getJqclztdm());
+        jq.setZdjqtjlx("01");
+        if (dept != null) {
+            jq.setSsbm(dept.getDeptname());
+            jq.setSsbmdm(dept.getDeptcode());
+            jq.setSsxgajdm(dept.getFxjcode());
+            jq.setSsxgaj(dept.getFxjname());
+            jq.setSssgaj(dept.getDszname());
+            jq.setSssgajdm(dept.getDszcode());
+        }
+        jq.setXtSjly("1");
+        if (StringUtils.isNotBlank(jq.getBjlb())) {
+            SysDictItem d_bz_jqfl = this.baseMapper.selectDict("D_BZ_JQFL", jq.getBjlb());
+            if (ObjectUtils.isNotEmpty(d_bz_jqfl)) {
+                jq.setBjlbmc(d_bz_jqfl.getZdmc());
+            }
+        }
+        if (StringUtils.isNotBlank(jq.getBjlx())) {
+            SysDictItem d_bz_jqfl = this.baseMapper.selectDict("D_BZ_JQFL", jq.getBjlx());
+            if (ObjectUtils.isNotEmpty(d_bz_jqfl)) {
+                jq.setBjlxmc(d_bz_jqfl.getZdmc());
+            }
+        }
+        if (StringUtils.isNotBlank(jq.getBjxl())) {
+            SysDictItem d_bz_jqfl = this.baseMapper.selectDict("D_BZ_JQFL", jq.getBjxl());
+            if (ObjectUtils.isNotEmpty(d_bz_jqfl)) {
+                jq.setBjxlmc(d_bz_jqfl.getZdmc());
+            }
+        }
+
+        this.checkJmjq(jq);
+        // 判断是否重大警情
+        this.checkZdjq(jq);
+        // 判断是否颜色
+        this.checkColor(jq);
+        this.insert(jq);
+    }
+
+    @Override
+    public void addLzJq(VLz110Txj lz110) {
+        TbJq jq = new TbJq();
+        jq.setId(UUIDGenerator.getUUID());
+        jq.setJjdbh(lz110.getJjdbh());
+        jq.setJjdwbh(lz110.getJjdwbh());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(lz110.getJjdwbh());
+        if (dept != null) {
+            jq.setJjdwmc(dept.getDeptname());
+        }
+        jq.setGljjdbh(lz110.getGljjdbh());
+        jq.setJjybh(lz110.getJjybh());
+        jq.setJjyxm(lz110.getJjyxm());
+        jq.setHrsj(lz110.getBjsj());
+        jq.setLhlxbh((StringUtils.isNotEmpty(lz110.getLhlxbh()) && lz110.getLhlxbh().contains("teleType"))
+                ? lz110.getLhlxbh().replace("teleType", "") : lz110.getLhlxbh());
+        jq.setBjfsbh((StringUtils.isNotEmpty(lz110.getBjfsbh()) && lz110.getBjfsbh().contains("callMode"))
+                ? lz110.getBjfsbh().replace("callMode", "") : lz110.getBjfsbh());
+        jq.setBjrq(lz110.getBjsj());
+        jq.setBjsj(lz110.getBjsj());
+        jq.setJjsj(lz110.getJjsj());
+        String time = DateUtils.getQueryDateString(jq.getBjsj(), "02");
+        if (time != null) {
+            String jqfsksnf = time.substring(0, 4);
+            String jqfsksyf = time.substring(5, 7);
+            String jqfsksxs = time.substring(11, 13);
+            String jqfsksny = jqfsksnf + jqfsksyf;
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(jq.getBjsj());
+            Integer jqfskszs = ca.get(Calendar.WEEK_OF_YEAR);
+            jq.setJqfsksnf(Integer.valueOf(jqfsksnf));
+            jq.setJqfsksyf(Integer.valueOf(jqfsksyf));
+            jq.setJqfsksny(Integer.valueOf(jqfsksny));
+            jq.setJqfskszs(jqfskszs);
+            jq.setJqfsksxs(Integer.parseInt(jqfsksxs));
+            jq.setJqfsksrq(jq.getBjsj());
+            jq.setJqfskssj(jq.getBjsj());
+        }
+        jq.setBjdh(lz110.getBjdh());
+        jq.setBjdhYhxm(lz110.getBjdhyhxm());
+        jq.setBjdhYhdz(lz110.getBjdhyhdz());
+        jq.setBjrXm(lz110.getBjrxm());
+        jq.setBjrXb((StringUtils.isNotEmpty(lz110.getBjrxb()) && lz110.getBjrxb().contains("sex")) ?
+                lz110.getBjrxb().replace("sex", "") : "");
+        jq.setBjrLxdh(lz110.getLxdh());
+        jq.setSfdzxzqh((StringUtils.isNotEmpty(lz110.getGxdwbh()) && lz110.getGxdwbh().length() >= 6)
+                ? lz110.getGxdwbh().substring(0, 6) : "");
+        jq.setSfdz(lz110.getSfdz());
+        jq.setBjnr(lz110.getBjnr());
+        // TODO 确认警情级别
+        jq.setJqjb("4");
+//        this.setBjlblxxlMc(jq, lz110);
+        jq.setSfzdjq("0");
+        if (lz110.getSddwxzb() == null || lz110.getSddwxzb().equals(BigDecimal.ZERO)) {
+            if (lz110.getZddwxzb() != null && !lz110.getZddwxzb().equals(BigDecimal.ZERO)) {
+                jq.setJd(lz110.getZddwxzb());
+            }
+        } else {
+            jq.setJd(lz110.getSddwxzb());
+        }
+        if (lz110.getSddwyzb() == null || lz110.getSddwyzb().equals(BigDecimal.ZERO)) {
+            if (lz110.getZddwyzb() != null && !lz110.getZddwyzb().equals(BigDecimal.ZERO)) {
+                jq.setWd(lz110.getZddwyzb());
+            }
+        } else {
+            jq.setWd(lz110.getSddwyzb());
+        }
+
+//        if (jq.getJd() != null && jq.getWd() != null) {
+//            jq.setZb(JtsUtils.getPoint(jq.getJd(), jq.getWd()));
+//            jq.setZbhash(GeoHashKit.encode(jq.getJd(), jq.getWd()));
+//        }
+        jq.setCzzt("0");
+        jq.setZdjqtjlx("01");
+        if (dept != null) {
+            jq.setSsbm(dept.getDeptname());
+            jq.setSsbmdm(dept.getDeptcode());
+            jq.setSsxgajdm(dept.getFxjcode());
+            jq.setSsxgaj(dept.getFxjname());
+            jq.setSssgaj(dept.getDszname());
+            jq.setSssgajdm(dept.getDszcode());
+        }
+        jq.setXtSjly("1");
+        // 判断是否为街面警情
+        this.checkJmjq(jq);
+        // 判断是否重大警情
+        this.checkZdjq(jq);
+        this.insert(jq);
+
+
+    }
+
+    private void xfzl(TbJq jq) {
+        //如果是重大警情和走失 判断点位是那个巡防区快反点
+        if ((jq.getSfzdjq().equals("1") || jq.getBjnr().contains("走失")) && ObjectUtils.isNotEmpty(jq.getJd()) && ObjectUtils.isNotEmpty(jq.getWd())) {
+            //查询所有巡防区
+            List<TbJcglXfqyDto> listXfqyAll = this.tbJcglAdaptRemoteService.getListXfqyAll();
+            //现在暂时随便定一个单位
+            String ssbmid = null;
+
+
+            Set<String> xfq = new HashSet<>();
+            if (!CollectionUtils.isEmpty(listXfqyAll)) {
+                for (TbJcglXfqyDto dto : listXfqyAll) {
+                    Coordinate[] coordinates = new Coordinate[dto.getPgis().size()];
+                    for (int i = 0; i < dto.getPgis().size(); i++) {
+                        BigDecimal[] jwd = dto.getPgis().get(i);
+                        Coordinate coor = new Coordinate();
+                        coor.x = jwd[0].doubleValue();
+                        coor.y = jwd[1].doubleValue();
+                        coordinates[i] = coor;
+                    }
+                    boolean s = Kit.isInGeometry(coordinates, jq.getJd() + "," + jq.getWd());
+                    if (s) {
+                        xfq.add(dto.getId());
+                        ssbmid = dto.getSsbmid();
+                    }
+                }
+            }
+            //查询所有快反点
+            List<TbJcglKfdDto> listKfdAll = this.tbJcglAdaptRemoteService.getListKfdAll();
+            if (!CollectionUtils.isEmpty(listKfdAll)) {
+                for (TbJcglKfdDto dto : listKfdAll) {
+                    Coordinate[] coordinates = new Coordinate[dto.getWfzfw().size()];
+                    for (int i = 0; i < dto.getWfzfw().size(); i++) {
+                        BigDecimal[] jwd = dto.getWfzfw().get(i);
+                        Coordinate coor = new Coordinate();
+                        coor.x = jwd[0].doubleValue();
+                        coor.y = jwd[1].doubleValue();
+                        coordinates[i] = coor;
+                    }
+                    boolean s = Kit.isInGeometry(coordinates, jq.getJd() + "," + jq.getWd());
+                    if (s) {
+                        xfq.add(dto.getKfdId());
+                        ssbmid = dto.getSsbmid();
+                    }
+                }
+            }
+            Set<String> setBbid = new HashSet<>();
+            if (!CollectionUtils.isEmpty(xfq)) {
+                for (String xqid : xfq) {
+                    List<TbQwXfbb> bbidByXq = this.tbQwzxAdaptRemoteService.getBbidByXq(xqid);
+                    if (!CollectionUtils.isEmpty(bbidByXq)) {
+                        Set<String> bbids = bbidByXq.stream().map(TbQwXfbb::getId).collect(Collectors.toSet());
+                        setBbid.addAll(bbids);
+                    }
+                }
+            }
+            if (!CollectionUtils.isEmpty(setBbid)) {
+                String bbids = String.join(",", setBbid);
+                System.out.println("警情下发指令报备id------------>" + bbids);
+                this.tbYjzlAdaptRrmoteService.andJqZl(ssbmid, jq.getId(), bbids, "3");
+            }
+
+        }
+
+    }
+
+    // 判断是否为街面警情（抢夺、抢劫,入盗，行窃）
+    private void checkJmjq(TbJq jq) {
+        jq.setSfjmjq("0");
+        String[] xlList = new String[]{"抢", "盗", "窃"};
+        if (StringUtils.isNotEmpty(jq.getBjnr())) {
+            for (String xl : xlList) {
+                if (jq.getBjnr().contains(xl)) {
+                    jq.setSfjmjq("1");
+                    break;
+                }
+            }
+        }
+    }
+
+
+    //判断颜色
+    private void checkColor(TbJq jq) {
+        jq.setColor("4");
+        String[] yellow = new String[]{"走失", "走丢", "老人", "儿童", "小孩"};
+        String[] orange = new String[]{"盗", "偷", "手机", "电瓶车", "电瓶", "盗窃"};
+        String[] red = new String[]{"抢劫", "抢夺", "杀人", "自杀", "死亡", "跳楼", "跳河", "煤气", "暴恐", "袭击", "持刀", "劫持", "打架", "斗殴", "聚众", "爆炸", "杀", "刀", "暴", "死", "抢", "砍", "枪"};
+        if (StringUtils.isNotEmpty(jq.getBjnr())) {
+            for (String xl : yellow) {
+                if (jq.getBjnr().contains(xl)) {
+                    jq.setBz(xl);
+                    jq.setColor("3");
+                    break;
+                }
+            }
+            for (String xl : orange) {
+                if (jq.getBjnr().contains(xl)) {
+                    jq.setBz(xl);
+                    jq.setColor("2");
+                    break;
+                }
+            }
+            for (String xl : red) {
+                if (jq.getBjnr().contains(xl) && !jq.getBjnr().contains("家暴") && !jq.getBjnr().contains("情况说明")) {
+                    jq.setBz(xl);
+                    jq.setColor("1");
+                    break;
+                }
+            }
+        }
+    }
+
+
+    //判断是否重大警情
+    private void checkZdjq(TbJq jq) {
+        jq.setSfzdjq("0");
+        String[] xlList = new String[]{"杀", "爆炸", "恐吓", "抢", "袭击", "持刀", "劫持", "跳楼", "死亡", "打架", "斗殴"};
+        if (StringUtils.isNotEmpty(jq.getBjnr())) {
+            for (String xl : xlList) {
+                if (jq.getBjnr().contains(xl) && !jq.getBjnr().contains("情况说明")) {
+                    jq.setSfzdjq("1");
+                    break;
+                }
+            }
+        }
+    }
+
+    // 判断是否为街面警情（车财、汽车、扒窃、三车、入盗、抢夺、抢劫）
+    private void checkJmjq(TbJqAll jqAll) {
+        jqAll.setSfjmjq("0");
+        String[] xlList = new String[]{"01120700", "01120300", "01121000", "01120800", "02030200", "02030300", "02030400",
+                "02050100", "02020900", "01120100", "01120400"};
+        String[] lxList = new String[]{"02150000", "01190000", "01160000"};
+        if (StringUtils.isNotEmpty(jqAll.getBjxl()) && Arrays.asList(xlList).contains(jqAll.getBjxl())) {
+            jqAll.setSfjmjq("1");
+        }
+        if (StringUtils.isNotEmpty(jqAll.getBjlx()) && Arrays.asList(lxList).contains(jqAll.getBjlx())) {
+            jqAll.setSfjmjq("1");
+        }
+    }
+
+    // 根据时间获取警情数量
+    private int getJqCountByTime(String ssbmdm, String kssj, String jssj) {
+        return this.baseMapper.selectCount(
+                new LambdaQueryWrapper<TbJq>()
+                        .eq(TbJq::getXtSjzt, "1")
+                        .eq(StringUtils.isNotBlank(ssbmdm), TbJq::getSsbm, ssbmdm)
+                        .last(" and date_format(bjsj,'%Y-%m-%d %H:%i:%s') >= '" + kssj +
+                                "' and date_format(bjsj,'%Y-%m-%d %H:%i:%s') <= '" + jssj + "'")
+        );
+    }
+
+    // 获取主城区城市代码
+    private List<Map<String, String>> getCode() {
+        List<Map<String, String>> list = new ArrayList<>();
+        Map<String, String> map = new HashMap<>();
+        map.put("orgcode", "510104000000");
+        map.put("orgname", "锦江区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510105000000");
+        map.put("orgname", "青羊区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510106000000");
+        map.put("orgname", "金牛区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510107000000");
+        map.put("orgname", "武侯区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510108000000");
+        map.put("orgname", "成华区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510109000000");
+        map.put("orgname", "高新区");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("orgcode", "510156000000");
+        map.put("orgname", "天府新区");
+        list.add(map);
+        return list;
+    }
+
+    // 获取主要的警情类型代码
+    private List<Map<String, String>> getBjlbList() {
+        List<Map<String, String>> list = new ArrayList<>();
+        Map<String, String> map = new HashMap<>();
+        map.put("code", "01000000");
+        map.put("name", "刑事");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("code", "02000000");
+        map.put("name", "行政");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("code", "08000000");
+        map.put("name", "纠纷");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("code", "05000000");
+        map.put("name", "求助");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("code", "11000000");
+        map.put("name", "投诉");
+        list.add(map);
+        map = new HashMap<>();
+        map.put("code", "03000000");
+        map.put("name", "交通");
+        list.add(map);
+        return list;
+    }
+
+    @Override
+    public List<String> selectJjdbh() {
+        return this.baseMapper.selectJjdbh("1");
+    }
+
+    @Override
+    public void updateJqJwd(Jjdb jjdb) {
+        TbJq tbJq = new TbJq();
+        tbJq.setJjdbh(jjdb.getJjdbh());
+        tbJq.setJd(jjdb.getFxdwjd());
+        tbJq.setWd(jjdb.getFxdwwd());
+        tbJq.setZb(JtsUtils.getPoint(tbJq.getJd(), tbJq.getWd()));
+        tbJq.setZbhash(GeoHashKit.encode(tbJq.getJd(), tbJq.getWd()));
+        this.baseMapper.updateJqJwd(tbJq);
+    }
+
+
+    @Override
+    @PostConstruct
+    public void tbJjdhToRedis() {
+        List<String> list = this.baseMapper.selectJjdbh(null);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (String s : list) {
+                redisService.setCacheObject(Constant.JQ + s, null, 3L, TimeUnit.HOURS);
+            }
+        }
+        System.out.println("PostConstruct------------》存入redis数据");
+    }
+
+
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjCyjlServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjCyjlServiceImpl.java
new file mode 100644
index 0000000..aa8966d
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjCyjlServiceImpl.java
@@ -0,0 +1,41 @@
+package com.mosty.sjzx.service.impl;
+
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.sjzx.mapper.TbSjCyjlMapper;
+import com.mosty.sjzx.service.TbSjCyjlService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+/**
+ * 事件-参与警力表(TbSjCyjl)表服务实现类
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-13 09:11:18
+ */
+@Service("tbSjCyjlService")
+public class TbSjCyjlServiceImpl implements TbSjCyjlService {
+    @Resource
+    private TbSjCyjlMapper tbSjCyjlMapper;
+
+    @Override
+    public List<TbSjCyjl> queryAll() {
+        UserInfo user = UserInfoManager.get();
+        return this.tbSjCyjlMapper.queryAll(PermissionsUtil.createSql("", user));
+    }
+
+    @Override
+    public TbSjCyjl queryById(String id) {
+        return this.tbSjCyjlMapper.queryById(id);
+    }
+
+    @Override
+    public Object joinCopCount(TbSjCyjl tbSjCyjl) {
+        return tbSjCyjlMapper.joinCopCount(tbSjCyjl);
+    }
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjRzServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjRzServiceImpl.java
new file mode 100644
index 0000000..8285cf1
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjRzServiceImpl.java
@@ -0,0 +1,83 @@
+package com.mosty.sjzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.sjzx.TbSjRzDto;
+import com.mosty.base.model.dto.sjzx.TbSjRzInsertDto;
+import com.mosty.base.model.entity.sjzx.TbSj;
+import com.mosty.base.model.entity.sjzx.TbSjRz;
+import com.mosty.base.model.query.jcgl.TbSjRzQuery;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.sjzx.mapper.TbSjRzMapper;
+import com.mosty.sjzx.service.TbSjRzService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class TbSjRzServiceImpl extends ServiceImpl<TbSjRzMapper, TbSjRz>
+        implements TbSjRzService {
+
+    @Override
+    public void saveRz(TbSjRzInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbSjRz rz = new TbSjRz();
+        BeanUtils.copyProperties(dto, rz);
+        Date time = new Date();
+        rz.setCzsj(time);
+        rz.setRzms(user.getDeptName() + "(" + user.getUserName() + ")于" +
+                DateUtils.getQueryDateString(time, "02") + dto.getRzms());
+        rz.setCzryId(String.valueOf(user.getUserId()));
+        rz.setCzrySfzh(user.getIdEntityCard());
+        rz.setCzryXm(user.getUserName());
+        rz.setXtSjly("1");
+        rz.setSsbm(user.getDeptName());
+        rz.setSsbmid(String.valueOf(user.getDeptId()));
+        rz.setSsbmdm(user.getDeptCode());
+        rz.setSsxgaj(user.getFxjDeptName());
+        rz.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        rz.setSsxgajdm(user.getFxjDeptCode());
+        rz.setSssgaj(user.getDszDeptName());
+        rz.setSssgajid(String.valueOf(user.getDszDeptId()));
+        rz.setSssgajdm(user.getDszDeptCode());
+        this.baseMapper.insert(rz);
+    }
+
+    @Override
+    public IPage<TbSjRzDto> getPageList(TbSjRzQuery dto) {
+        if (StringUtils.isBlank(dto.getSjId()))
+            throw new BusinessException("sjId不能为空！");
+        IPage<TbSjRz> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbSjRz>()
+                        .eq(TbSjRz::getSjId, dto.getSjId())
+                        .like(StringUtils.isNotBlank(dto.getRzms()), TbSjRz::getRzms, dto.getRzms())
+                        .orderByDesc(TbSjRz::getCzsj)
+        );
+        IPage<TbSjRzDto> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbSjRzDto> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbSjRzDto res = new TbSjRzDto();
+                BeanUtils.copyProperties(item, res);
+                resList.add(res);
+            });
+        }
+        resPage.setTotal(page.getTotal());
+        resPage.setRecords(resList);
+        return resPage;
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjServiceImpl.java
new file mode 100644
index 0000000..03de62b
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjServiceImpl.java
@@ -0,0 +1,708 @@
+package com.mosty.sjzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.jcgl.TbJcglPzfzDto;
+import com.mosty.base.model.dto.sjzx.*;
+import com.mosty.base.model.entity.jcgl.TbJcglKhbm;
+import com.mosty.base.model.entity.jcgl.TbJcglPzfz;
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.mosty.base.model.query.sjzx.TbSjQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglKhbmVo;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.query.yjzl.TbYjxxQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.model.entity.sjzx.*;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.query.sjzx.SearchDto;
+import com.mosty.base.model.query.sjzx.TbJqPageListQuery;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.sjzx.mapper.*;
+import com.mosty.sjzx.remote.*;
+import com.mosty.sjzx.service.TbJqService;
+import com.mosty.sjzx.service.TbSjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * 事件表(TbSj)表服务实现类
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-14 11:42:31
+ */
+@Service("tbSjService")
+@AllArgsConstructor
+public class TbSjServiceImpl implements TbSjService {
+    private TbSjMapper tbSjMapper;
+    private TbYszxAdapRemoteService tbYszxAdapRemoteService;
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private TbYjzlAdaptRrmoteService tbYjzlAdaptRrmoteService;
+    private TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private TbSjSpbfMapper tbSjSpbfMapper;
+    private TbRzSpbfAdaptRemoteService tbRzSpbfAdaptRemoteService;
+    private TbJqMapper tbJqMapper;
+    private TbJqService tbJqService;
+    private TbSjDzMapper tbSjDzMapper;
+    private TbSjRzMapper tbSjRzMapper;
+
+    @Override
+    public Object bxdCreate() {
+        String kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -30), "01");
+        String jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        // 查询最近30天的所有的警情数据
+        List<TbJq> jqList = this.tbJqMapper.selectList(
+                new LambdaQueryWrapper<TbJq>()
+                        .ge(TbJq::getBjrq, kssj)
+                        .le(TbJq::getBjrq, jssj)
+                        .last(" and jd is not null and wd is not null and bjlb is not null")
+        );
+        List<BxdCreatedDto> list = jqList.stream().map(item -> {
+            BxdCreatedDto dto = new BxdCreatedDto();
+            dto.setJd(item.getJd());
+            dto.setWd(item.getWd());
+            dto.setSsbmdm(item.getSsbmdm());
+            if ("01000000".equals(item.getBjlb())) {
+                dto.setPzlx("01");
+            } else if ("02000000".equals(item.getBjlb())) {
+                dto.setPzlx("02");
+            } else {
+                dto.setPzlx("03");
+            }
+            return dto;
+        }).collect(Collectors.toList());
+        // 查询最近30天的所有的预警数据
+        List<Map<String, Object>> yjList = this.tbJqMapper.getYjxx30Day(kssj, jssj);
+        list.addAll(yjList.stream().map(item -> {
+            BxdCreatedDto dto = new BxdCreatedDto();
+            dto.setJd(new BigDecimal(String.valueOf(item.get("jd"))));
+            dto.setWd(new BigDecimal(String.valueOf(item.get("wd"))));
+            String yjlx = String.valueOf(item.get("yj_lx"));
+            if ("1".equals(yjlx)) {
+                dto.setPzlx("04");
+            } else if ("2".equals(yjlx)) {
+                dto.setPzlx("05");
+            } else if ("3".equals(yjlx)) {
+                dto.setPzlx("06");
+            }
+            return dto;
+        }).collect(Collectors.toList()));
+        // 查询最近30天的所有的盘查人员数据
+        List<Map<String, Object>> ryList = this.tbJqMapper.getPcryList(kssj, jssj);
+        list.addAll(ryList.stream().map(item -> {
+            BxdCreatedDto dto = new BxdCreatedDto();
+            dto.setJd(new BigDecimal(String.valueOf(item.get("jd"))));
+            dto.setWd(new BigDecimal(String.valueOf(item.get("wd"))));
+            dto.setSsbmdm(String.valueOf(item.get("ssbmdm")));
+            dto.setPzlx("07");
+            return dto;
+        }).collect(Collectors.toList()));
+        // 查询最近30天的所有的盘查车辆数据
+        List<Map<String, Object>> clList = this.tbJqMapper.getPcclList(kssj, jssj);
+        list.addAll(clList.stream().map(item -> {
+            BxdCreatedDto dto = new BxdCreatedDto();
+            dto.setJd(new BigDecimal(String.valueOf(item.get("jd"))));
+            dto.setWd(new BigDecimal(String.valueOf(item.get("wd"))));
+            dto.setPzlx("08");
+            dto.setSsbmdm(String.valueOf(item.get("ssbmdm")));
+            return dto;
+        }).collect(Collectors.toList()));
+        return this.filterJwd(list);
+    }
+
+    @Override
+    public IPage<TbSjDto> getPageList(TbSjQuery dto) {
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+
+        QueryWrapper<TbSj> qw = new QueryWrapper<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        IPage<TbSj> page = this.tbSjMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                qw.lambda()
+                        .eq(!StringUtils.isEmpty(dto.getSjFl()), TbSj::getSjFl, dto.getSjFl())
+                        .likeRight(!StringUtils.isEmpty(dto.getSsbmdm()), TbSj::getSsbmdm, dto.getSsbmdm())
+        );
+        IPage<TbSjDto> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbSjDto> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbSjDto vo = new TbSjDto();
+                BeanUtils.copyProperties(item, vo);
+                resList.add(vo);
+            });
+        }
+        resPage.setRecords(resList);
+        resPage.setTotal(page.getTotal());
+        return resPage;
+    }
+
+    // 计算必巡点
+    private Object filterJwd(List<BxdCreatedDto> points) {
+        ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(100);
+        List<NeighborDTO> neighborList = Collections.synchronizedList(new ArrayList<>(30000));
+        // 计算每个点一定范围内所有点坐标
+        for (BxdCreatedDto point : points) {
+            // 范围，从系统配置中获取，没有的话直接范围为500
+            String fw = this.tbBaseAdaptRemoteService.getValue("BXDFW");
+            int bxdfw = StringUtils.isNotBlank(fw) ? Integer.parseInt(fw) : 500;
+            threadPool.execute(new DistanceRunnable(point, points, neighborList, bxdfw));
+        }
+        // 等待线程池执行完毕
+        while (neighborList.size() != points.size()) {
+            System.out.println(neighborList.size());
+        }
+        threadPool.shutdown();
+        // 排序
+        Collections.sort(neighborList);
+        // 筛选(附近点位低于20个不进入计算)
+        Map<BxdCreatedDto, Long> map = new HashMap<>();
+        Iterator<NeighborDTO> it = neighborList.iterator();
+        // 计算必巡点点位 默认20个点位开始计算
+        String dw = this.tbBaseAdaptRemoteService.getValue("BXDDW");
+        int bxddw = StringUtils.isNotBlank(dw) ? Integer.parseInt(dw) : 500;
+        while (it.hasNext()) {
+            NeighborDTO neighborDTO = it.next();
+            Map<BxdCreatedDto, Long> neighbors = neighborDTO.getNeighbors();
+            if (map.containsKey(neighborDTO.getPoint()) || neighbors.size() <= bxddw) {
+                it.remove();
+            }
+            map.putAll(neighbors);
+        }
+        // 业务操作
+        List<Map<String, Object>> rList = new ArrayList<>();
+        // 查询重点区域的分值配置
+        List<TbJcglPzfzDto> fzList = this.tbJcglAdaptRemoteService.getFzList();
+        for (NeighborDTO item : neighborList) {
+            BxdCreatedDto point = item.getPoint();
+            Map<BxdCreatedDto, Long> neighbors = item.getNeighbors();
+            int size = neighbors.size() + 1;
+            int score = 0;
+            int a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0;
+            for (BxdCreatedDto i : neighbors.keySet()) {
+                score += this.getFz(fzList, i.getPzlx());
+                switch (i.getPzlx()) {
+                    case "01":
+                        a++;
+                        break;
+                    case "02":
+                        b++;
+                        break;
+                    case "03":
+                        c++;
+                        break;
+                    case "04":
+                        d++;
+                        break;
+                    case "05":
+                        e++;
+                        break;
+                    case "06":
+                        f++;
+                        break;
+                    case "07":
+                        g++;
+                        break;
+                    case "08":
+                        h++;
+                        break;
+                }
+            }
+            // // 获取分值阈值，超过阈值生成必巡点
+            String yz = this.tbBaseAdaptRemoteService.getValue("BXDFZYZ");
+            int fzyz = StringUtils.isNotBlank(yz) ? Integer.parseInt(yz) : 100;
+            if (score >= fzyz) {
+                String bz = String.format("刑事警情：%s个，行政警情：%s个  其他警情：%s个  人员预警：%s个  " +
+                        "车辆预警：%s个  事件预警：%s个  盘查重点人员：%s个  盘查重点车辆：%s个", a, b, c, d, e, f, g, h);
+                System.err.println(bz);
+                System.err.println("point: " + point.getJd() + ", " + point.getWd() + " n: " + size + " s：" + score);
+
+                Map<String, Object> mp = new HashMap<>();
+                mp.put("jd", point.getJd());
+                mp.put("wd", point.getWd());
+                mp.put("score", size + 1);
+                mp.put("bz", bz);
+                mp.put("ssbmdm", item.getPoint().getSsbmdm());
+                rList.add(mp);
+            }
+        }
+        this.tbJcglAdaptRemoteService.createdBxd(rList);
+        return rList;
+    }
+
+    // 获取系统配置的分值
+    private int getFz(List<TbJcglPzfzDto> fzList, String pzlx) {
+        int score = -1;
+        List<TbJcglPzfzDto> tempList = fzList.stream().filter(item -> pzlx.equals(item.getPzlx())).collect(Collectors.toList());
+        if (tempList.size() > 0) {
+            TbJcglPzfzDto dto = tempList.get(0);
+            score = dto.getPzfz();
+        }
+        if (score == -1) {
+            switch (pzlx) {
+                case "01":
+                case "02":
+                case "04":
+                case "05":
+                case "07":
+                case "08":
+                    score = 2;
+                    break;
+                case "03":
+                case "06":
+                    score = 1;
+                    break;
+            }
+        }
+        return score;
+    }
+
+    @Override
+    public Object queryAll(SearchDto dto) {
+//        UserInfo user = UserInfoManager.get();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        // 警情
+        if ("01".equals(dto.getType())) {
+            TbJqPageListQuery query = new TbJqPageListQuery();
+            query.setPageNum(dto.getPageNum());
+            query.setPageSize(dto.getPageSize());
+            query.setBjnr(dto.getKeyword());
+            return this.tbJqService.selectPageList(query);
+        } else if ("02".equals(dto.getType())) {
+            // 预警
+            TbYjxxQuery query = new TbYjxxQuery();
+            query.setPageNum(dto.getPageNum());
+            query.setPageSize(dto.getPageSize());
+            query.setYjNr(dto.getKeyword());
+            return tbYjzlAdaptRrmoteService.getPageList(query);
+        } else if ("03".equals(dto.getType())) {
+            //指令
+            TbZlxxQuery query = new TbZlxxQuery();
+            query.setPageNum(dto.getPageNum());
+            query.setPageSize(dto.getPageSize());
+            query.setZlnr(dto.getKeyword());
+            return tbYjzlAdaptRrmoteService.selectInstructList(query);
+        } else if ("04".equals(dto.getType())) {
+            // 事件
+            QueryWrapper<TbSj> qw = new QueryWrapper<>();
+//            PermissionsUtil.queryWrapperUtil(qw, user);
+
+            return this.tbSjMapper.selectPage(
+                    new Page<>(dto.getPageNum(), dto.getPageSize()),
+                    qw.lambda().eq(TbSj::getXtSjzt, "1")
+                            .like(TbSj::getSjNr, dto.getKeyword())
+                            .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbSj::getSsbmdm, dto.getSsbmdm())
+
+            );
+        } else if ("05".equals(dto.getType())) {
+            // 地理要素
+            TbYsDlQuery query = new TbYsDlQuery();
+            query.setPageNum(dto.getPageNum());
+            query.setPageSize(dto.getPageSize());
+            query.setJsnr(dto.getKeyword());
+            return tbYszxAdapRemoteService.queryAll(query);
+        } else if ("06".equals(dto.getType())) {
+            // 公安机关
+            TbYsGajgQuery query = new TbYsGajgQuery();
+            query.setPageNum(dto.getPageNum());
+            query.setPageSize(dto.getPageSize());
+            query.setJsnr(dto.getKeyword());
+            return tbYszxAdapRemoteService.getGajgAll(query);
+        }
+        return null;
+    }
+
+    @Override
+    public TbSjDto queryById(String id) {
+        TbSj sj = this.tbSjMapper.selectById(id);
+        TbSjDto dto = new TbSjDto();
+        BeanUtils.copyProperties(sj, dto);
+        return dto;
+    }
+
+    @Override
+    @Transactional
+    public TbSjDto insert(TbSj tbSj) {
+        TbSjDto dto = new TbSjDto();
+        UserInfo user = UserInfoManager.get();
+        // 查询来源id是否存在
+        TbSj sj = this.tbSjMapper.selectOne(
+                new QueryWrapper<TbSj>()
+                        .eq("yw_id", tbSj.getYwId())
+                        .eq("xt_sjzt", "1")
+                        .eq("sj_fl", tbSj.getSjFl()));
+        if (null != sj) {
+            BeanUtils.copyProperties(sj, dto);
+            // 保存事件日志
+            this.insertSjRz(sj, user);
+            return dto;
+        } else {
+            if (!StringUtils.isBlank(tbSj.getYwId()) && !StringUtils.isBlank(tbSj.getSjFl())) {
+                switch (tbSj.getSjFl()) {
+                    case "01":
+                        break;
+                    case "02":
+                        // 警情转事件
+                        this.jqTurnSj(tbSj, user);
+                        break;
+                    case "03":
+                        break;
+                    case "04":
+                        break;
+                }
+            } else {
+                // 手动添加事件
+                this.insertSj(tbSj, user);
+            }
+        }
+        BeanUtils.copyProperties(tbSj, dto);
+        return dto;
+    }
+
+    // 手动添加事件
+    private void insertSj(TbSj tbSj, UserInfo user) {
+        tbSj.setQcHx(tbSj.getQcHx() != null && tbSj.getQcHx() != 0 ? tbSj.getQcHx() : 50);
+        tbSj.setQcJj(tbSj.getQcJj() != null && tbSj.getQcJj() != 0 ? tbSj.getQcJj() : 150);
+        tbSj.setQcGz(tbSj.getQcGz() != null && tbSj.getQcGz() != 0 ? tbSj.getQcGz() : 300);
+        tbSj.setId(UUIDGenerator.getUUID());
+        tbSj.setCzkssj(new Date());
+        tbSj.setQcGxcs(0);
+        tbSj.setSjFssj(new Date());
+        tbSj.setQcGxsj(new Date());
+        if (tbSj.getCsjd() != null && tbSj.getCswd() != null) {
+            tbSj.setCszb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setCszbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setDqjd(tbSj.getCsjd());
+            tbSj.setDqwd(tbSj.getCswd());
+            tbSj.setDqzb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setDqzbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+        }
+        tbSj.setDqdz(tbSj.getCsdz());
+        if (user != null) {
+            tbSj.setSsbm(user.getDeptName());
+            tbSj.setSsbmid(String.valueOf(user.getDeptId()));
+            tbSj.setSsbmdm(user.getDeptCode());
+            tbSj.setSsxgaj(user.getFxjDeptName());
+            tbSj.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            tbSj.setSsxgajdm(user.getFxjDeptCode());
+            tbSj.setSssgaj(user.getDszDeptName());
+            tbSj.setSssgajid(String.valueOf(user.getDszDeptId()));
+            tbSj.setSssgajdm(user.getDszDeptCode());
+        }
+        tbSj.setXtSjly("1");
+        tbSj.setSjFl("99");
+        tbSj.setDqdzxzqh(tbSj.getCsdzxzqh());
+        this.tbSjMapper.insertEntity(tbSj);
+        // 添加地址信息
+        this.insertSjdz(tbSj, user);
+        // 保存事件日志
+        this.insertSjRz(tbSj, user);
+    }
+
+    // 警情转事件
+    private void jqTurnSj(TbSj tbSj, UserInfo user) {
+        TbJq tbjq = this.tbJqMapper.selectById(tbSj.getYwId());
+        if (null != tbjq) {
+            tbSj.setSjJb(tbjq.getJqjb());
+            tbSj.setSjFssj(tbjq.getBjsj());
+            tbSj.setSjNr(tbjq.getBjnr());
+            tbSj.setCsjd(tbjq.getJd());
+            tbSj.setSjBt("重大警情事件");
+            tbSj.setBjrxm(tbjq.getBjrXm());
+            tbSj.setBjrlxdh(tbjq.getBjdh());
+            tbSj.setCswd(tbjq.getWd());
+            tbSj.setDqjd(tbjq.getJd());
+            tbSj.setDqwd(tbjq.getWd());
+            tbSj.setCsdz(tbjq.getSfdz());
+            if (tbjq.getJd() != null && tbjq.getWd() != null) {
+                tbSj.setCszb(JtsUtils.getPoint(tbjq.getJd(), tbjq.getWd()));
+                tbSj.setDqzb(JtsUtils.getPoint(tbjq.getJd(), tbjq.getWd()));
+                tbSj.setCszbhash(GeoHashKit.encode(tbjq.getJd(), tbjq.getWd()));
+                tbSj.setDqzbhash(GeoHashKit.encode(tbjq.getJd(), tbjq.getWd()));
+            }
+            tbSj.setCzkssj(new Date());
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(tbjq.getSsbmdm());
+            tbSj.setSsbm(dept.getDeptname());
+            tbSj.setSsbmid(dept.getDeptid());
+            tbSj.setSsbmdm(dept.getDeptcode());
+            tbSj.setSsxgajdm(dept.getFxjcode());
+            tbSj.setSsxgajid(dept.getFxjid());
+            tbSj.setSsxgaj(dept.getFxjname());
+            tbSj.setSssgaj(dept.getDszname());
+            tbSj.setSssgajdm(dept.getDszcode());
+            tbSj.setSssgajid(dept.getDszid());
+        }
+        tbSj.setQcHx(tbSj.getQcHx() != null && tbSj.getQcHx() != 0 ? tbSj.getQcHx() : 50);
+        tbSj.setQcJj(tbSj.getQcJj() != null && tbSj.getQcJj() != 0 ? tbSj.getQcJj() : 150);
+        tbSj.setQcGz(tbSj.getQcGz() != null && tbSj.getQcGz() != 0 ? tbSj.getQcGz() : 300);
+        tbSj.setId(UUIDGenerator.getUUID());
+        tbSj.setCzkssj(new Date());
+        tbSj.setQcGxcs(0);
+        tbSj.setQcGxsj(new Date());
+        if (tbSj.getCsjd() != null && tbSj.getCswd() != null) {
+            tbSj.setCszb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setCszbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setDqjd(tbSj.getCsjd());
+            tbSj.setDqwd(tbSj.getCswd());
+            tbSj.setDqzb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setDqzbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+        }
+        tbSj.setDqdz(tbSj.getCsdz());
+        tbSj.setXtSjly("1");
+        tbSj.setDqdzxzqh(tbSj.getCsdzxzqh());
+        this.tbSjMapper.insertEntity(tbSj);
+        // 添加地址信息
+        this.insertSjdz(tbSj, user);
+        // 保存事件日志
+        this.insertSjRz(tbSj, user);
+    }
+
+    // 添加日志信息
+    private void insertSjRz(TbSj tbSj, UserInfo user) {
+        int count = this.tbSjRzMapper.selectCount(
+                new LambdaQueryWrapper<TbSjRz>()
+                        .eq(TbSjRz::getSjId, tbSj.getId())
+                        .like(TbSjRz::getRzms, "进入事件处置")
+        ) + 1;
+        TbSjRz rz = new TbSjRz();
+        rz.setId(UUIDGenerator.getUUID());
+        rz.setSjId(tbSj.getId());
+        if (user != null) {
+            rz.setRzms(DateUtils.getTime() + "," + user.getDeptName() +
+                    "（" + user.getUserName() + "）进入事件处置，准备开始处置事件，该事件第" + count + "次进入处置页面");
+            rz.setCzryId(String.valueOf(user.getUserId()));
+            rz.setCzryXm(user.getUserName());
+            rz.setCzrySfzh(user.getIdEntityCard());
+            rz.setSsbm(tbSj.getSsbm());
+            rz.setSsbmdm(tbSj.getSsbmdm());
+            rz.setSsxgaj(tbSj.getSsxgaj());
+            rz.setSsxgajdm(tbSj.getSsxgajdm());
+            rz.setSssgaj(tbSj.getSssgaj());
+            rz.setSssgajdm(tbSj.getSssgajdm());
+            rz.setSsbmid(tbSj.getSsbmid());
+            rz.setSsxgajid(tbSj.getSsxgajid());
+            rz.setSssgajid(tbSj.getSssgajid());
+        } else {
+            rz.setRzms(DateUtils.getTime() + "," + "进入事件处置，准备开始处置事件！！");
+        }
+        rz.setCzsj(new Date());
+        rz.setXtSjly("1");
+        this.tbSjRzMapper.insert(rz);
+    }
+
+    // 添加地址信息
+    private void insertSjdz(TbSj tbSj, UserInfo user) {
+        TbSjDz dz = new TbSjDz();
+        dz.setId(UUIDGenerator.getUUID());
+        dz.setSjId(tbSj.getId());
+        dz.setDztzSj(new Date());
+        if (user != null) {
+            dz.setDztzRyid(String.valueOf(user.getUserId()));
+            dz.setDztzRysfzh(user.getIdEntityCard());
+            dz.setDztzRyxm(user.getUserName());
+        }
+        if (tbSj.getCsjd() != null && tbSj.getCswd() != null) {
+            dz.setJd(tbSj.getCsjd());
+            dz.setWd(tbSj.getCswd());
+            dz.setZb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            dz.setZbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+            dz.setDzxzqh(tbSj.getCsdzxzqh());
+            dz.setDz(tbSj.getCsdz());
+        }
+        dz.setSsbm(tbSj.getSsbm());
+        dz.setSsbmdm(tbSj.getSsbmdm());
+        dz.setSsxgaj(tbSj.getSsxgaj());
+        dz.setSsxgajdm(tbSj.getSsxgajdm());
+        dz.setSssgaj(tbSj.getSssgaj());
+        dz.setSssgajdm(tbSj.getSssgajdm());
+        dz.setSsbmid(tbSj.getSsbmid());
+        dz.setSsxgajid(tbSj.getSsxgajid());
+        dz.setSssgajid(tbSj.getSssgajid());
+        dz.setXtSjly("1");
+        this.tbSjDzMapper.insertEntity(dz);
+    }
+
+    @Override
+    @Transactional
+    public void editQc(TbSjQcszDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbSj sj = new TbSj();
+        BeanUtils.copyProperties(dto, sj);
+        TbSj entity = this.tbSjMapper.queryById(dto.getId());
+        sj.setQcGxcs(entity.getQcGxcs() + 1);
+        sj.setQcGxsj(new Date());
+        this.tbSjMapper.updateEntity(sj);
+        // 记录日志
+        TbSjRz rz = new TbSjRz();
+        rz.setId(UUIDGenerator.getUUID());
+        rz.setSjId(entity.getId());
+        if (user != null) {
+            rz.setRzms(DateUtils.getTime() + "," + user.getDeptName() +
+                    "（" + user.getUserName() + "）设置了圈层距离，分别为核心圈：" + dto.getQcHx() +
+                    "米，警戒圈：" + dto.getQcJj() + "米，关注圈：" + dto.getQcGz() + "米。");
+            rz.setCzryId(String.valueOf(user.getUserId()));
+            rz.setCzryXm(user.getUserName());
+            rz.setCzrySfzh(user.getIdEntityCard());
+            rz.setSsbm(user.getDeptName());
+            rz.setSsbmid(String.valueOf(user.getDeptId()));
+            rz.setSsbmdm(user.getDeptCode());
+            rz.setSsxgaj(user.getFxjDeptName());
+            rz.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            rz.setSsxgajdm(user.getFxjDeptCode());
+            rz.setSssgaj(user.getDszDeptName());
+            rz.setSssgajid(String.valueOf(user.getDszDeptId()));
+            rz.setSssgajdm(user.getDszDeptCode());
+        } else {
+            rz.setRzms(DateUtils.getTime() +
+                    ",设置了圈层距离，分别为核心圈：" + dto.getQcHx() +
+                    "米，警戒圈：" + dto.getQcJj() + "米，关注圈：" + dto.getQcGz() + "。");
+        }
+        rz.setCzsj(new Date());
+        rz.setXtSjly("1");
+        this.tbSjRzMapper.insert(rz);
+    }
+
+    @Override
+    @Transactional
+    public void updateJwd(TbSjUpdateJwdDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbSj entity = this.tbSjMapper.queryById(dto.getId());
+        if (entity != null) {
+            entity.setDqjd(dto.getDqjd());
+            entity.setDqwd(dto.getDqwd());
+            entity.setDqdz(dto.getDqdz());
+            entity.setDqdzxzqh(dto.getDqdzxzqh());
+            if (dto.getDqjd() != null && dto.getDqwd() != null) {
+                entity.setDqzb(JtsUtils.getPoint(dto.getDqjd(), dto.getDqwd()));
+                entity.setDqzbhash(GeoHashKit.encode(dto.getDqjd(), dto.getDqwd()));
+            }
+            // 如果没有初始经纬度，这里将第一次设置的改为初始经纬度
+            if (entity.getCsjd() == null || entity.getCswd() == null) {
+                entity.setCsjd(dto.getDqjd());
+                entity.setCswd(dto.getDqwd());
+                entity.setCsdz(dto.getDqdz());
+                entity.setCsdzxzqh(dto.getDqdzxzqh());
+                entity.setCszb(JtsUtils.getPoint(dto.getDqjd(), dto.getDqwd()));
+                entity.setCszbhash(GeoHashKit.encode(dto.getDqjd(), dto.getDqwd()));
+            }
+            this.tbSjMapper.updateEntity(entity);
+            // 记录坐标变更
+            TbSjDz dz = new TbSjDz();
+            dz.setId(UUIDGenerator.getUUID());
+            dz.setSjId(dto.getId());
+            dz.setDztzSj(new Date());
+            if (user != null) {
+                dz.setDztzRyid(String.valueOf(user.getUserId()));
+                dz.setDztzRysfzh(user.getIdEntityCard());
+                dz.setDztzRyxm(user.getUserName());
+            }
+            dz.setJd(dto.getDqjd());
+            dz.setWd(dto.getDqwd());
+            if (dz.getJd() != null && dz.getWd() != null) {
+                dz.setZb(JtsUtils.getPoint(dz.getJd(), dz.getWd()));
+                dz.setZbhash(GeoHashKit.encode(dz.getJd(), dz.getWd()));
+                if (user != null) {
+                    dz.setSsbm(user.getDeptName());
+                    dz.setSsbmid(String.valueOf(user.getDeptId()));
+                    dz.setSsbmdm(user.getDeptCode());
+                    dz.setSsxgaj(user.getFxjDeptName());
+                    dz.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+                    dz.setSsxgajdm(user.getFxjDeptCode());
+                    dz.setSssgaj(user.getDszDeptName());
+                    dz.setSssgajid(String.valueOf(user.getDszDeptId()));
+                    dz.setSssgajdm(user.getDszDeptCode());
+                }
+            }
+            dz.setXtSjly("1");
+            this.tbSjDzMapper.insertEntity(dz);
+        } else {
+            throw new BusinessException("未查询到事件信息");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void addSjRz(TbSjRzDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbSjRz rz = new TbSjRz();
+        rz.setId(UUIDGenerator.getUUID());
+        if (user != null) {
+            rz.setCzryId(String.valueOf(user.getUserId()));
+            rz.setCzryXm(user.getUserName());
+            rz.setCzrySfzh(user.getIdEntityCard());
+            rz.setSsbm(user.getDeptName());
+            rz.setSsbmid(String.valueOf(user.getDeptId()));
+            rz.setSsbmdm(user.getDeptCode());
+            rz.setSsxgaj(user.getFxjDeptName());
+            rz.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            rz.setSsxgajdm(user.getFxjDeptCode());
+            rz.setSssgaj(user.getDszDeptName());
+            rz.setSssgajid(String.valueOf(user.getDszDeptId()));
+            rz.setSssgajdm(user.getDszDeptCode());
+        }
+        rz.setCzsj(new Date());
+        rz.setXtSjly("1");
+        this.tbSjRzMapper.insert(rz);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return this.tbSjMapper.deleteById(id) > 0;
+    }
+
+    @Override
+    public Boolean finishDispose(TbSj dto) {
+        TbSj tbSj = this.tbSjMapper.selectById(dto.getId());
+        if (tbSj == null) throw new BusinessException("事件未找到！！");
+        tbSj.setCzjssj(new Date());
+        tbSj.setCzzt(dto.getCzzt());
+        tbSj.setCzsm(dto.getCzsm());
+        if (tbSj.getDqjd() != null && tbSj.getDqwd() != null) {
+            tbSj.setDqzb(JtsUtils.getPoint(tbSj.getDqjd(), tbSj.getDqwd()));
+            tbSj.setDqzbhash(GeoHashKit.encode(tbSj.getDqjd(), tbSj.getDqwd()));
+        }
+
+        if (tbSj.getCsjd() != null && tbSj.getCswd() != null) {
+            tbSj.setCszb(JtsUtils.getPoint(tbSj.getCsjd(), tbSj.getCswd()));
+            tbSj.setCszbhash(GeoHashKit.encode(tbSj.getCsjd(), tbSj.getCswd()));
+        }
+        tbSjMapper.updateEntity(tbSj);
+        //更新视频表的结束时间
+        List<TbSjSpbf> sjsp = tbSjSpbfMapper.selectList(
+                new QueryWrapper<TbSjSpbf>()
+                        .eq(StringUtils.isNotBlank(tbSj.getId()), "sj_id", tbSj.getId())
+                        .isNull("bfjssj")
+        );
+        if (!(sjsp != null && sjsp.size() > 0)) {
+            TbSjSpbf tbSjSpbf = new TbSjSpbf();
+            tbSjSpbf.setBfjssj(DateUtils.getNowDate());
+            tbSjSpbfMapper.update(tbSjSpbf, new QueryWrapper<TbSjSpbf>()
+                    .eq(StringUtils.isNotBlank(tbSj.getId()), "sj_id", tbSj.getId()));
+        }
+        //修改日志
+        tbRzSpbfAdaptRemoteService.updateLyId(tbSj.getId());
+        return true;
+    }
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjSpbfServiceImpl.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjSpbfServiceImpl.java
new file mode 100644
index 0000000..72d7365
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/TbSjSpbfServiceImpl.java
@@ -0,0 +1,63 @@
+package com.mosty.sjzx.service.impl;
+
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.base.model.entity.sjzx.TbSjSpbf;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.sjzx.mapper.TbSjSpbfMapper;
+import com.mosty.sjzx.service.TbSjSpbfService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+
+@Service("tbSjSpbfService")
+public class TbSjSpbfServiceImpl implements TbSjSpbfService {
+    @Resource
+    private TbSjSpbfMapper tbSjSpbfMapper;
+
+
+    @Override
+    public List<TbSjSpbf> queryAll() {
+        return this.tbSjSpbfMapper.queryAll(PermissionsUtil.createSql("", UserInfoManager.get()));
+    }
+
+    @Override
+    public TbSjSpbf queryById(String id) {
+        return this.tbSjSpbfMapper.queryById(id);
+    }
+
+    @Override
+    public TbSjSpbfDTO insert(TbSjSpbfDTO dto) {
+        UserInfo user = UserInfoManager.get();
+        TbSjSpbf tb = new TbSjSpbf();
+        BeanUtils.copyProperties(dto, tb);
+        tb.setSsbm(user.getDeptName());
+        tb.setSsbmid(String.valueOf(user.getDeptId()));
+        tb.setSsbmdm(user.getDeptCode());
+        tb.setSsxgaj(user.getFxjDeptName());
+        tb.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        tb.setSsxgajdm(user.getFxjDeptCode());
+        tb.setSssgaj(user.getDszDeptName());
+        tb.setSssgajid(String.valueOf(user.getDszDeptId()));
+        tb.setSssgajdm(user.getDszDeptCode());
+        tb.setXtSjly("1");
+        this.tbSjSpbfMapper.insert(tb);
+        return dto;
+    }
+
+    @Override
+    public TbSjSpbf update(TbSjSpbf tbSjSpbf) {
+        this.tbSjSpbfMapper.updateById(tbSjSpbf);
+        return this.queryById(tbSjSpbf.getId());
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return this.tbSjSpbfMapper.deleteById(id) > 0;
+    }
+}
+
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/Test.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/Test.java
new file mode 100644
index 0000000..41fe3a8
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/service/impl/Test.java
@@ -0,0 +1,198 @@
+package com.mosty.sjzx.service.impl;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class Test {
+
+
+    @JsonProperty("DispositionNotificationListObject")
+    private DispositionNotificationListObjectDTO dispositionNotificationListObject;
+
+    @NoArgsConstructor
+    @Data
+    public static class DispositionNotificationListObjectDTO {
+        @JsonProperty("DispositionNotificationObject")
+        private List<DispositionNotificationObjectDTO> dispositionNotificationObject;
+
+        @NoArgsConstructor
+        @Data
+        public static class DispositionNotificationObjectDTO {
+            @JsonProperty("PriorityLevel")
+            private Integer priorityLevel;
+            @JsonProperty("NotificationID")
+            private String notificationID;
+            @JsonProperty("DispositionID")
+            private String dispositionID;
+            @JsonProperty("ApplicantOrg")
+            private String applicantOrg;
+            @JsonProperty("DispositionFaceObject")
+            private DispositionFaceObjectDTO dispositionFaceObject;
+            @JsonProperty("TriggerTime")
+            private String triggerTime;
+            @JsonProperty("Title")
+            private String title;
+            @JsonProperty("Reason")
+            private String reason;
+            @JsonProperty("FaceObject")
+            private FaceObjectDTO faceObject;
+
+            @NoArgsConstructor
+            @Data
+            public static class DispositionFaceObjectDTO {
+                @JsonProperty("FaceID")
+                private String faceID;
+                @JsonProperty("DepotId")
+                private String depotId;
+                @JsonProperty("DepotName")
+                private String depotName;
+                @JsonProperty("GenderCode")
+                private Integer genderCode;
+                @JsonProperty("InfoKind")
+                private Integer infoKind;
+                @JsonProperty("SourceID")
+                private String sourceID;
+                @JsonProperty("SubImageList")
+                private SubImageListDTO subImageList;
+                @JsonProperty("DepotType")
+                private String depotType;
+                @JsonProperty("Sid")
+                private String sid;
+
+                @NoArgsConstructor
+                @Data
+                public static class SubImageListDTO {
+                    @JsonProperty("SubImageInfoObject")
+                    private List<SubImageInfoObjectDTO> subImageInfoObject;
+
+                    @NoArgsConstructor
+                    @Data
+                    public static class SubImageInfoObjectDTO {
+                        @JsonProperty("Type")
+                        private Integer type;
+                        @JsonProperty("StoragePath")
+                        private String storagePath;
+                        @JsonProperty("EventSort")
+                        private Integer eventSort;
+                        @JsonProperty("Data")
+                        private String data;
+                        @JsonProperty("FileFormat")
+                        private String fileFormat;
+                    }
+                }
+            }
+
+            @NoArgsConstructor
+            @Data
+            public static class FaceObjectDTO {
+                @JsonProperty("FaceAppearTime")
+                private String faceAppearTime;
+                @JsonProperty("Latitude")
+                private Double latitude;
+                @JsonProperty("SubImageList")
+                private SubImageListDTO subImageList;
+                @JsonProperty("CapStyle")
+                private String capStyle;
+                @JsonProperty("IsSuspectedTerrorist")
+                private Integer isSuspectedTerrorist;
+                @JsonProperty("RightBtmY")
+                private Integer rightBtmY;
+                @JsonProperty("IsCriminalInvolved")
+                private Integer isCriminalInvolved;
+                @JsonProperty("RightBtmX")
+                private Integer rightBtmX;
+                @JsonProperty("IsSuspiciousPerson")
+                private Integer isSuspiciousPerson;
+                @JsonProperty("Similaritydegree")
+                private Double similaritydegree;
+                @JsonProperty("LocationMarkTime")
+                private String locationMarkTime;
+                @JsonProperty("Age")
+                private Integer age;
+                @JsonProperty("FaceID")
+                private String faceID;
+                @JsonProperty("GenderCode")
+                private String genderCode;
+                @JsonProperty("EthicCode")
+                private String ethicCode;
+                @JsonProperty("AgeLowerLimit")
+                private Integer ageLowerLimit;
+                @JsonProperty("Attitude")
+                private Integer attitude;
+                @JsonProperty("QualityScore")
+                private Double qualityScore;
+                @JsonProperty("DeviceID")
+                private String deviceID;
+                @JsonProperty("SourceID")
+                private String sourceID;
+                @JsonProperty("IsVictim")
+                private Integer isVictim;
+                @JsonProperty("LeftTopY")
+                private Integer leftTopY;
+                @JsonProperty("LeftTopX")
+                private Integer leftTopX;
+                @JsonProperty("Longitude")
+                private Double longitude;
+                @JsonProperty("FaceDisAppearTime")
+                private String faceDisAppearTime;
+                @JsonProperty("IsDriver")
+                private Integer isDriver;
+                @JsonProperty("IsForeigner")
+                private Integer isForeigner;
+                @JsonProperty("InfoKind")
+                private Integer infoKind;
+                @JsonProperty("AgeUpLimit")
+                private Integer ageUpLimit;
+                @JsonProperty("GlassStyle")
+                private String glassStyle;
+                @JsonProperty("MaskStyle")
+                private Integer maskStyle;
+                @JsonProperty("CoatColor")
+                private String coatColor;
+                @JsonProperty("ShotTime")
+                private String shotTime;
+                @JsonProperty("IsDetainees")
+                private Integer isDetainees;
+                @JsonProperty("DeviceName")
+                private String deviceName;
+
+                @NoArgsConstructor
+                @Data
+                public static class SubImageListDTO {
+                    @JsonProperty("SubImageInfoObject")
+                    private List<SubImageInfoObjectDTO> subImageInfoObject;
+
+                    @NoArgsConstructor
+                    @Data
+                    public static class SubImageInfoObjectDTO {
+                        @JsonProperty("Type")
+                        private String type;
+                        @JsonProperty("StoragePath")
+                        private String storagePath;
+                        @JsonProperty("DeviceID")
+                        private String deviceID;
+                        @JsonProperty("ImageID")
+                        private String imageID;
+                        @JsonProperty("EventSort")
+                        private Integer eventSort;
+                        @JsonProperty("Data")
+                        private String data;
+                        @JsonProperty("Height")
+                        private Integer height;
+                        @JsonProperty("ShotTime")
+                        private String shotTime;
+                        @JsonProperty("FileFormat")
+                        private String fileFormat;
+                        @JsonProperty("Width")
+                        private Integer width;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/task/BxdCreateTask.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/task/BxdCreateTask.java
new file mode 100644
index 0000000..5da42f8
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/task/BxdCreateTask.java
@@ -0,0 +1,33 @@
+package com.mosty.sjzx.task;
+
+import com.mosty.common.base.util.DateUtils;
+import com.mosty.sjzx.mapper.TbSjMapper;
+import com.mosty.sjzx.service.TbSjService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+/**
+ * 每天凌晨0点计算所有的警情、预警、
+ * 盘查数据，获取经纬度信息
+ *
+ * @author dw
+ * @since 2022/8/6
+ **/
+@Slf4j
+@Component
+@AllArgsConstructor
+public class BxdCreateTask {
+
+    private final TbSjService tbSjService;
+
+    @Scheduled(cron = "0 0 0 * * ?")
+    @Transactional
+    public void run() {
+        this.tbSjService.bxdCreate();
+    }
+}
diff --git a/mosty-sjzx/src/main/java/com/mosty/sjzx/task/TbJqTask.java b/mosty-sjzx/src/main/java/com/mosty/sjzx/task/TbJqTask.java
new file mode 100644
index 0000000..39e6ea2
--- /dev/null
+++ b/mosty-sjzx/src/main/java/com/mosty/sjzx/task/TbJqTask.java
@@ -0,0 +1,16 @@
+package com.mosty.sjzx.task;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class TbJqTask {
+
+
+
+
+
+}
diff --git a/mosty-sjzx/src/main/resources/application.yml b/mosty-sjzx/src/main/resources/application.yml
new file mode 100644
index 0000000..a53dfa3
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/application.yml
@@ -0,0 +1,77 @@
+ribbon:
+  ReadTimeout: 6000000
+  ConnectTimeout: 6000000
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_sjzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 80
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+      -
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-sjzx/src/main/resources/bootstrap.yml b/mosty-sjzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..be9f65a
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8016
+  servlet:
+    context-path: /mosty-sjzx/
+spring:
+  application:
+    name: mosty-sjzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-sjzx/src/main/resources/logback-spring.xml b/mosty-sjzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-sjzx/src/main/resources/mapper/SgfxMapper.xml b/mosty-sjzx/src/main/resources/mapper/SgfxMapper.xml
new file mode 100644
index 0000000..e2ad7e2
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/SgfxMapper.xml
@@ -0,0 +1,740 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.sjzx.mapper.SgfxMapper">
+    <select id="jmjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq>=#{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or ay like '0203%'
+        or ay='02040100' or ay like '0205%')
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="wffzjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="zjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq>=#{dto.ksrq} and jqfsksrq &lt;=#{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="yjmjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny>=#{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or
+        ay like '0203%' or ay='02040100' or ay like '0205%')
+        ${useSql}
+    </select>
+
+    <select id="yzwffzjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="yzjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny>=#{dto.ksny} and jqfsksny &lt;=#{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="zjmjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq>=#{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or ay like '0203%' or
+        ay='02040100' or ay like '0205%')
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="zwffzjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="zzjq" resultType="java.util.Map">
+        select ay,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by ay order by sl desc
+    </select>
+
+    <select id="gfsdfxJmjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100'
+        or ay like '0203%' or ay='02040100' or ay like '0205%')
+        ${useSql}
+    </select>
+
+    <select id="gfsdfxWffzjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxZjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxYjmjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or
+        ay like '0203%' or ay='02040100' or ay like '0205%')
+        ${useSql}
+    </select>
+
+    <select id="ywffzjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxYzjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxZjmjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or ay
+        like '0203%' or ay='02040100' or ay like '0205%')
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxZwffzjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        and (ay like '01%' or ay like '02%')
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="gfsdfxZzjq" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs asc
+    </select>
+
+    <select id="aylx" resultType="java.util.Map">
+        select * from tb_case_type
+        <if test="code != null and code != ''">
+            where code like concat('%',#{code},'%')
+        </if>
+    </select>
+
+    <select id="zzjg" resultType="java.util.Map">
+        select id, org_code, org_name, root_path, org_type, org_type_name, org_short_name
+        from mosty_base.sys_dept
+        order by org_code
+    </select>
+
+    <select id="zdgzJqtj" resultType="java.util.Map">
+        select
+        COALESCE(sum(xt_sjzt='1'),0) as zjq,
+        COALESCE(sum(xt_sjzt='1' and sfzdjq='1'), 0) as zdjq,
+        COALESCE(sum(xt_sjzt='1' and ay like '01%' or ay like '02%'),0) as wffz,
+        COALESCE(sum(xt_sjzt='1' and ay like '0111%' or ay like '0112%' or ay like '0114%' or ay='01130100' or
+        ay like '0203%' or ay='02040100' or ay like '0205%'), 0) as jmjq
+        from mosty_sjzx.tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="rtj" resultType="java.util.Map">
+        select jqfsksrq,bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+    </select>
+
+    <select id="ytj" resultType="java.util.Map">
+        select jqfsksny,bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        group by jqfsksny,bjlb order by jqfsksny
+    </select>
+
+    <select id="ztj" resultType="java.util.Map">
+        select jqfskszs, bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by jqfskszs, bjlb order by jqfskszs
+    </select>
+
+    <select id="scryyj" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by jqfsksxs order by jqfsksxs asc
+    </select>
+
+    <select id="yscryyj" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by jqfsksxs order by jqfsksxs asc
+    </select>
+
+    <select id="zscryyj" resultType="java.util.Map">
+        select jqfsksxs,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by jqfsksxs order by jqfsksxs asc
+    </select>
+
+    <select id="pcsfafxRtj" resultType="java.util.Map">
+        select ssbmdm,jqfsksrq,bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by ssbmdm,jqfsksrq,bjlb
+    </select>
+
+    <select id="pcsfafxytj" resultType="java.util.Map">
+        select ssbmdm,jqfsksny,bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by ssbmdm,jqfsksny,bjlb
+    </select>
+
+    <select id="pcsfafxztj" resultType="java.util.Map">
+        select ssbmdm,jqfskszs,bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by ssbmdm,jqfskszs,bjlb
+    </select>
+
+    <select id="ztsjtj" resultType="java.util.Map">
+        select bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksrq >= #{dto.ksrq} and jqfsksrq &lt;= #{dto.jsrq}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+        group by bjlb order by sl desc
+    </select>
+
+    <select id="yztsjtj" resultType="java.util.Map">
+        select bjlb,count(1) as sl from tb_jq
+        where xt_sjzt='1' and jqfsksny >= #{dto.ksny} and jqfsksny &lt;= #{dto.jsny}
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.ssxgajdm != null and dto.ssxgajdm != ''">
+            and ssxgajdm = #{dto.ssxgajdm}
+        </if>
+        ${useSql}
+        and (ay='01120400' or ay='01120800' or ay='0203200' or ay='02030300')
+    </select>
+
+    <select id="jrjqczfx" resultType="java.util.Map">
+        select czzt, count(1) as sl from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0' and czzt is not null
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by czzt order by sl desc
+    </select>
+
+    <select id="jrjqslzs" resultType="java.util.Map">
+        select jqfsksxs, count(1) as sl from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0' and jqfsksxs is not null
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by jqfsksxs order by jqfsksxs asc
+    </select>
+
+    <select id="jrjqyj" resultType="java.util.Map">
+        select count(1) as sl from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="jqlxtj" resultType="java.util.Map">
+        select bjlxmc, count(1) as sl from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0' and bjlxmc is not null
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by bjlxmc order by sl desc
+    </select>
+
+    <select id="jqlbCount" resultType="int">
+        select count(1) from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.bjrXm != nul and dto.bjrXm != ''">
+            and bjr_xm like concat('%',#{dto.bjrXm},'%')
+        </if>
+        <if test="dto.bjnr != nul and dto.bjnr != ''">
+            and bjnr like concat('%',#{dto.bjnr},'%')
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="jqlb" resultType="java.util.Map">
+        select * from mosty_sjzx.tb_jq where
+        xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and jqfsksrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != nul and dto.jssj != ''">
+            and jqfsksrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        <if test="dto.bjrXm != nul and dto.bjrXm != ''">
+            and bjr_xm like concat('%',#{dto.bjrXm},'%')
+        </if>
+        <if test="dto.bjnr != nul and dto.bjnr != ''">
+            and bjnr like concat('%',#{dto.bjnr},'%')
+        </if>
+        ${useSql}
+        order by jqfskssj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+
+    <select id="sblxtj" resultType="java.util.Map">
+        select sblx, count(1) as sl from mosty_yszx.tb_ys_sxt where
+        xt_sjzt = '1' and xt_scbz = '0' and sblx is not null
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by sblx order by sl desc
+    </select>
+
+    <select id="sblbCount" resultType="int">
+        select count(1) from mosty_yszx.tb_ys_sxt where
+        xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="sblb" resultType="java.util.Map">
+        select count(1) from mosty_yszx.tb_ys_sxt where
+        xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        limit #{pageIndex},#{pageSize}
+        order by xt_cjsj desc
+    </select>
+
+    <select id="jwzbmlbtj" resultType="java.util.Map">
+        select ssbmdm, ssbm,
+        COALESCE(SUM(jwz_lx = '1'),0) as jmjwz,
+        COALESCE(SUM(jwz_lx = '2'),0) as ydjwc,
+        COALESCE(SUM(jwz_lx = '3'),0) as zhzagt
+        from mosty_jcgl.tb_jcgl_jwz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.jwzlx != null and dto.jwzlx != ''">
+            and jwz_lx = #{dto.jwzlx}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by ssbmdm, ssbm
+    </select>
+
+    <select id="bmtjjwz" resultType="java.util.Map">
+        select ssbmdm, ssbm,
+        COALESCE(SUM(jwz_lx = '1'),0) as jmjwz,
+        COALESCE(SUM(jwz_lx = '2'),0) as ydjwc,
+        COALESCE(SUM(jwz_lx = '3'),0) as zhzagt
+        from mosty_jcgl.tb_jcgl_jwz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.jwzlx != null and dto.jwzlx != ''">
+            and jwz_lx = #{dto.jwzlx}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by ssbmdm, ssbm order by ssbmdm asc
+    </select>
+
+    <select id="clbmtj" resultType="java.util.Map">
+        select ssbmdm, ssbm, count(1) as sl from mosty_qwgl.tb_qw_cl where xt_sjzt='1' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        group by ssbmdm,ssbm order by sl desc
+    </select>
+
+    <select id="fjbmtj" resultType="java.util.Map">
+        select ssbmdm, ssbm, count(1) as sl from mosty_qwgl.tb_qw_jl where xt_sjzt='1' and jllx='02' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        group by ssbmdm,ssbm order by sl desc
+    </select>
+
+    <select id="mjbmtj" resultType="java.util.Map">
+        select ssbmdm, ssbm, count(1) as sl from mosty_qwgl.tb_qw_jl where xt_sjzt='1' and jllx='01' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        group by ssbmdm, ssbm order by sl desc
+    </select>
+
+    <select id="zttjz" resultType="java.util.Map">
+        select a.sl as mjsl,b.sl as fjsl,c.sl as clsl from
+        (
+        select count(1) as sl from mosty_qwgl.tb_qw_jl where xt_sjzt='1' and jllx='01' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        ) a,
+        (
+        select count(1) as sl from mosty_qwgl.tb_qw_jl where xt_sjzt='1' and jllx='02' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        ) b,
+        (
+        select count(1) as sl from mosty_qwgl.tb_qw_cl where xt_sjzt='1' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        ${useSql}
+        ) c
+    </select>
+
+    <select id="lbtj" resultType="java.util.Map">
+        select ssbmdm, ssbm, COALESCE(SUM(txzblx = '01'),0) as jwzd,COALESCE(SUM(txzblx = '02'),0) as
+        zfjly,COALESCE(SUM(txzblx = '03'),0) as djj from mosty_qwgl.tb_qw_znzb where xt_sjzt='1' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        <if test="dto.txzblx != null and dto.txzblx != ''">
+            and txzblx = #{dto.txzblx}
+        </if>
+        ${useSql}
+        group by ssbmdm, ssbm
+    </select>
+
+    <select id="bmtj" resultType="java.util.Map">
+        select ssbmdm, ssbm,count(1) as sl from mosty_qwgl.tb_qw_znzb where xt_sjzt='1' and xt_scbz='0' and
+        ywid in(
+        select id from mosty_qwgl.tb_qw_xfbb where  xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and bbkssj >= #{dto.kssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        )
+        <if test="dto.txzblx != null and dto.txzblx != ''">
+            and txzblx = #{dto.txzblx}
+        </if>
+        ${useSql}
+        group by ssbmdm,ssbm order by sl desc
+    </select>
+
+    <select id="gzybmlbtj" resultType="java.util.Map">
+        select ssbmdm, ssbm, COALESCE(SUM(sblx = '01'),0) as spjk,COALESCE(SUM(sblx = '02'),0) as
+        jtkk from mosty_yszx.tb_ys_sxt where
+        xt_sjzt = '1' and xt_scbz = '0' and sblx is not null
+        <if test="dto.ssbmdm != nul and dto.ssbmdm != ''">
+            and ssbmdm = #{dto.ssbmdm}
+        </if>
+        ${useSql}
+        group by ssbmdm, ssbm
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-sjzx/src/main/resources/mapper/TbCaseTypeMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbCaseTypeMapper.xml
new file mode 100644
index 0000000..5cee4d8
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbCaseTypeMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbCaseTypeMapper">
+
+</mapper>
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbJqAllMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbJqAllMapper.xml
new file mode 100644
index 0000000..21a0b16
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbJqAllMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbJqAllMapper">
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.sjzx.TbJqAll">
+        insert into tb_jq_all(id, jq110_id, jjdbh, jjdwbh, jjdwmc, gljjdbh, jjybh, jjyxm, jjtbh, jjtip, hrsj, lhlxbh,
+                              bjfsbh, bjrq, bjsj, jjsj, jqfsksnf, jqfsksyf, jqfsksny, jqfskszs, jqfsksrq, jqfskssj,
+                              jqfsksxs, jqfsjssj, hrsc, jjsc, jjlyh, bjdh, bjdh_yhxm, bjdh_yhdz, bjr_sfzh, bjr_xm,
+                              bjr_xb,
+                              bjr_lxdh, bjr_zzdw, sfdzxzqh, sfdz, bjnr, jqjb, bjlb, bjlx, bjxl, ldgbh, bjxlmc, bjlxmc,
+                              bjlbmc, bkrs, ssrs, swrs, ywwxwz, ywbzxl, ywbkry, sfsw, sfswybj, sfzdjq, jd, wd, zb,
+                              zbhash, czzt, zdjqtjlx, ssbm, ssbmdm, ssxgaj, sfjmjq,
+                              ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id,
+                              xt_cjr,
+                              xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,
+                              bz)
+        values (#{id}, #{jq110Id}, #{jjdbh}, #{jjdwbh}, #{jjdwmc}, #{gljjdbh}, #{jjybh}, #{jjyxm}, #{jjtbh}, #{jjtip},
+                #{hrsj}, #{lhlxbh}, #{bjfsbh}, #{bjrq}, #{bjsj}, #{jjsj}, #{jqfsksnf}, #{jqfsksyf}, #{jqfsksny},
+                #{jqfskszs}, #{jqfsksrq}, #{jqfskssj}, #{jqfsksxs}, #{jqfsjssj}, #{hrsc}, #{jjsc}, #{jjlyh},
+                #{bjdh}, #{bjdhYhxm}, #{bjdhYhdz}, #{bjrSfzh}, #{bjrXm}, #{bjrXb}, #{bjrLxdh}, #{bjrZzdw},
+                #{sfdzxzqh}, #{sfdz}, #{bjnr}, #{jqjb}, #{bjlb}, #{bjlx}, #{bjxl}, #{ldgbh}, #{bjxlmc}, #{bjlxmc},
+                #{bjlbmc}, #{bkrs}, #{ssrs}, #{swrs},
+                #{ywwxwz}, #{ywbzxl}, #{ywbkry}, #{sfsw}, #{sfswybj}, #{sfzdjq}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{zbhash}, #{czzt}, #{zdjqtjlx}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{sfjmjq},
+                #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm},
+                #{xtZhgxbm}, #{bz})
+    </insert>
+</mapper>
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbJqDzMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbJqDzMapper.xml
new file mode 100644
index 0000000..9bf51c0
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbJqDzMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.sjzx.mapper.TbJqDzMapper">
+
+    <insert id="insertEntity">
+        insert into tb_jq_dz(
+                id,jq_id,dztz_sj,dztz_ryid,dztz_rysfzh,dztz_ryxm,jd,wd,zb,zbhash,dzxzqh,dz,tp_id,
+                ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+                )values (
+                #{id},#{jqId},#{dztzSj},#{dztzRyid},#{dztzRysfzh},#{dztzRyxm},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{zbhash},#{dzxzqh},#{dz},#{tpId},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}
+        )
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/mosty-sjzx/src/main/resources/mapper/TbJqMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbJqMapper.xml
new file mode 100644
index 0000000..6238750
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbJqMapper.xml
@@ -0,0 +1,969 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbJqMapper">
+    <resultMap type="com.mosty.base.model.entity.sjzx.TbJq" id="TbJqMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="jq110Id" column="jq110_id" jdbcType="VARCHAR"/>
+        <result property="jjdbh" column="jjdbh" jdbcType="VARCHAR"/>
+        <result property="jjdwbh" column="jjdwbh" jdbcType="VARCHAR"/>
+        <result property="jjdwmc" column="jjdwmc" jdbcType="VARCHAR"/>
+        <result property="gljjdbh" column="gljjdbh" jdbcType="VARCHAR"/>
+        <result property="jjybh" column="jjybh" jdbcType="VARCHAR"/>
+        <result property="jjyxm" column="jjyxm" jdbcType="VARCHAR"/>
+        <result property="jjtbh" column="jjtbh" jdbcType="VARCHAR"/>
+        <result property="jjtip" column="jjtip" jdbcType="VARCHAR"/>
+        <result property="hrsj" column="hrsj" jdbcType="TIMESTAMP"/>
+        <result property="lhlxbh" column="lhlxbh" jdbcType="VARCHAR"/>
+        <result property="bjfsbh" column="bjfsbh" jdbcType="VARCHAR"/>
+        <result property="bjrq" column="bjrq" jdbcType="TIMESTAMP"/>
+        <result property="bjsj" column="bjsj" jdbcType="TIMESTAMP"/>
+        <result property="jjsj" column="jjsj" jdbcType="TIMESTAMP"/>
+        <result property="jqfsksnf" column="jqfsksnf" jdbcType="INTEGER"/>
+        <result property="jqfsksyf" column="jqfsksyf" jdbcType="INTEGER"/>
+        <result property="jqfsksny" column="jqfsksny" jdbcType="INTEGER"/>
+        <result property="jqfskszs" column="jqfskszs" jdbcType="INTEGER"/>
+        <result property="jqfsksrq" column="jqfsksrq" jdbcType="TIMESTAMP"/>
+        <result property="jqfskssj" column="jqfskssj" jdbcType="TIMESTAMP"/>
+        <result property="jqfsksxs" column="jqfsksxs" jdbcType="INTEGER"/>
+        <result property="jqfsjssj" column="jqfsjssj" jdbcType="TIMESTAMP"/>
+        <result property="hrsc" column="hrsc" jdbcType="INTEGER"/>
+        <result property="jjsc" column="jjsc" jdbcType="INTEGER"/>
+        <result property="jjlyh" column="jjlyh" jdbcType="VARCHAR"/>
+        <result property="bjdh" column="bjdh" jdbcType="VARCHAR"/>
+        <result property="bjdhYhxm" column="bjdh_yhxm" jdbcType="VARCHAR"/>
+        <result property="bjdhYhdz" column="bjdh_yhdz" jdbcType="VARCHAR"/>
+        <result property="bjrSfzh" column="bjr_sfzh" jdbcType="VARCHAR"/>
+        <result property="bjrXm" column="bjr_xm" jdbcType="VARCHAR"/>
+        <result property="bjrXb" column="bjr_xb" jdbcType="VARCHAR"/>
+        <result property="bjrLxdh" column="bjr_lxdh" jdbcType="VARCHAR"/>
+        <result property="bjrZzdw" column="bjr_zzdw" jdbcType="VARCHAR"/>
+        <result property="sfdzxzqh" column="sfdzxzqh" jdbcType="VARCHAR"/>
+        <result property="sfdz" column="sfdz" jdbcType="VARCHAR"/>
+        <result property="ldgbh" column="ldgbh" jdbcType="VARCHAR"/>
+        <result property="bjnr" column="bjnr" jdbcType="VARCHAR"/>
+        <result property="jqjb" column="jqjb" jdbcType="VARCHAR"/>
+        <result property="bjlb" column="bjlb" jdbcType="VARCHAR"/>
+        <result property="bjlx" column="bjlx" jdbcType="VARCHAR"/>
+        <result property="bjxl" column="bjxl" jdbcType="VARCHAR"/>
+        <result property="bjxlmc" column="bjxlmc" jdbcType="VARCHAR"/>
+        <result property="bjlxmc" column="bjlxmc" jdbcType="VARCHAR"/>
+        <result property="bjlbmc" column="bjlbmc" jdbcType="VARCHAR"/>
+        <result property="bkrs" column="bkrs" jdbcType="INTEGER"/>
+        <result property="ssrs" column="ssrs" jdbcType="INTEGER"/>
+        <result property="swrs" column="swrs" jdbcType="INTEGER"/>
+        <result property="ywwxwz" column="ywwxwz" jdbcType="VARCHAR"/>
+        <result property="ywbzxl" column="ywbzxl" jdbcType="VARCHAR"/>
+        <result property="ywbkry" column="ywbkry" jdbcType="VARCHAR"/>
+        <result property="sfsw" column="sfsw" jdbcType="VARCHAR"/>
+        <result property="sfswybj" column="sfswybj" jdbcType="VARCHAR"/>
+        <result property="sfzdjq" column="sfzdjq" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="czzt" column="czzt" jdbcType="VARCHAR"/>
+        <result property="zdjqtjlx" column="zdjqtjlx" jdbcType="VARCHAR"/>
+        <result property="sfjmjq" column="sfjmjq" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="color" column="color" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        , jq110_id, jjdbh, jjdwbh, jjdwmc, gljjdbh, jjybh, jjyxm, jjtbh, jjtip,hrsj, lhlxbh, bjfsbh, bjrq,
+        bjsj, jjsj, jqfsksnf,jqfsksyf,jqfsksny,jqfskszs,jqfsksrq,jqfskssj,jqfsksxs,jqfsjssj,hrsc, jjsc, jjlyh,
+        bjdh, bjdh_yhxm, bjdh_yhdz,bjr_sfzh, bjr_xm, bjr_xb, bjr_lxdh, bjr_zzdw, sfdzxzqh, sfdz, bjnr, jqjb,
+        bjlb, bjlx,bjxl, bjxlmc,bjlxmc,bjlbmc,ldgbh,bkrs, ssrs, swrs, ywwxwz, ywbzxl, ywbkry, sfsw, sfswybj,sfzdjq,
+        jd, wd, czzt,zdjqtjlx,sfjmjq, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt,
+        xt_scbz,xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, color
+    </sql>
+
+    <select id="getZfgkCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        and (bjxlmc like '%赌%' or bjlbmc like '%赌%' or bjlxmc like '%赌%')
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="dto.jqjb != null and dto.jqjb != ''">
+            and jqjb = #{dto.jqjb}
+        </if>
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            and bjlb = #{dto.bjlb}
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+        <if test="dto.czzt != null and dto.czzt != ''">
+            and czzt = #{dto.czzt}
+        </if>
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+    </select>
+
+
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_jq where  xt_scbz = '0'
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="dto.bjrXm != null and dto.bjrXm != ''">
+            and bjr_xm like concat ('%',#{dto.bjrXm},'%')
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != '' and dto.type != '03' ">
+            and ssbmdm like concat (#{dto.ssbmdm},'%')
+        </if>
+
+
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (
+             bjnr  like concat ('%',#{dto.keyword},'%')
+             or bjr_lxdh  like concat ('%',#{dto.keyword},'%')
+             or ssbm  like concat ('%',#{dto.keyword},'%')
+            )
+        </if>
+
+        <if test="dto.type != null and dto.type != ''">
+            <if test="dto.type == '01' ">
+                and ssbm like concat ('%交%')
+            </if>
+            <if test="dto.type == '03' ">
+                and ssbm  not like concat ('%交%') and ssbmdm not like concat (#{dto.ssbmdm},'%')
+            </if>
+        </if>
+
+        <!--<if test="dto.jqjb != null and dto.jqjb != ''">
+            and jqjb = #{dto.jqjb}
+        </if>-->
+
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            <if test='dto.bjlb == "1"'>
+                and bjlb = '01000000'
+            </if>
+            <if test='dto.bjlb == "2"'>
+                and bjlb = '02000000'
+            </if>
+            <if test='dto.bjlb == "3"'>
+                and bjlb = '03000000'
+            </if>
+            <if test='dto.bjlb == "4"'>
+                and bjlb not in ('01000000','02000000','03000000')
+            </if>
+        </if>
+
+        <if test="list != null and list.size() != 0">
+            and jqjb in
+            <foreach collection="list" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+        <if test="dto.sfzdjq != null and dto.sfzdjq != ''">
+            and sfzdjq = #{dto.sfzdjq}
+        </if>
+
+        <if test="dto.sfjmjq != null and dto.sfjmjq != ''">
+            and sfjmjq = #{dto.sfjmjq}
+        </if>
+
+        <if test="dto.color != null and dto.color != ''">
+            and color = #{dto.color}
+        </if>
+
+        <if test="czztList != null and czztList.size() != 0">
+            and czzt in
+            <foreach collection="czztList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="bjlbList != null and bjlbList.size() != 0">
+            and bjlb in
+            <foreach collection="bjlbList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+    </select>
+
+    <select id="getZfgkList" parameterType="Map" resultMap="TbJqMap">
+        select
+        <include refid="Base_Column_List"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        and (bjxlmc like '%赌%' or bjlbmc like '%赌%' or bjlxmc like '%赌%')
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="list != null and list.size() != 0">
+            and jqjb in
+            <foreach collection="list" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            <if test='dto.bjlb == "1"'>
+                and bjlb = '01000000'
+            </if>
+            <if test='dto.bjlb == "2"'>
+                and bjlb = '02000000'
+            </if>
+            <if test='dto.bjlb == "3"'>
+                and bjlb = '03000000'
+            </if>
+            <if test='dto.bjlb == "4"'>
+                and bjlb not in ('01000000','02000000','03000000')
+            </if>
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+        <if test="dto.czzt != null and dto.czzt != ''">
+            and czzt = #{dto.czzt}
+        </if>
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+        order by bjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询分页-->
+    <select id="getListByPage" parameterType="Map" resultMap="TbJqMap">
+        select
+        <include refid="Base_Column_List"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_jq where   xt_scbz = '0'
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != '' and dto.type != '03' ">
+            and ssbmdm like concat (#{dto.ssbmdm},'%')
+        </if>
+
+        <if test="dto.keyword != null and dto.keyword != ''">
+            and (
+            bjnr  like concat ('%',#{dto.keyword},'%')
+            or bjr_lxdh  like concat ('%',#{dto.keyword},'%')
+            or ssbm  like concat ('%',#{dto.keyword},'%')
+            )
+        </if>
+
+        <if test="dto.type != null and dto.type != ''">
+            <if test="dto.type == '01' ">
+                and ssbm like concat ('%交%')
+            </if>
+            <if test="dto.type == '03' ">
+                and ssbm not like concat ('%交%') and ssbmdm not like concat (#{dto.ssbmdm},'%')
+            </if>
+        </if>
+
+        <if test="dto.bjrXm != null and dto.bjrXm != ''">
+            and bjr_xm like concat ('%',#{dto.bjrXm},'%')
+        </if>
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            <if test='dto.bjlb == "1"'>
+                and bjlb = '01000000'
+            </if>
+            <if test='dto.bjlb == "2"'>
+                and bjlb = '02000000'
+            </if>
+            <if test='dto.bjlb == "3"'>
+                and bjlb = '03000000'
+            </if>
+            <if test='dto.bjlb == "4"'>
+                and bjlb not in ('01000000','02000000','03000000')
+            </if>
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+
+        <if test="dto.sfzdjq != null and dto.sfzdjq != ''   ">
+            and sfzdjq = #{dto.sfzdjq}
+        </if>
+        <if test="dto.sfjmjq != null and dto.sfjmjq != ''">
+            and sfjmjq = #{dto.sfjmjq}
+        </if>
+        <if test="dto.color != null and dto.color != ''">
+            and color = #{dto.color}
+        </if>
+        <if test="czztList != null and czztList.size() != 0">
+            and czzt in
+            <foreach collection="czztList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="list != null and list.size() != 0">
+            and jqjb in
+            <foreach collection="list" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+
+        <if test="bjlbList != null and bjlbList.size() != 0">
+            and bjlb in
+            <foreach collection="bjlbList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+        order by bjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+
+    <select id="getList" parameterType="Map" resultMap="TbJqMap">
+        select
+        <include refid="Base_Column_List"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat (#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.jqjb != null and dto.jqjb != ''">
+            and jqjb = #{dto.jqjb}
+        </if>
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            and bjlb = #{dto.bjlb}
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+        <if test="dto.czzt != null and dto.czzt != ''">
+            and czzt = #{dto.czzt}
+        </if>
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+
+        <choose>
+            <when test=" bjlbList != null and bjlbList.size() != 0">
+                and ( bjlb in
+                <foreach collection="bjlbList" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+
+                <if test="mylbList != null and  mylbList.size() != 0">
+                    <foreach collection="mylbList" item="item" separator=" ">
+                        or bjnr like concat ('%',#{item},'%')
+                    </foreach>
+                </if>
+                    )
+            </when>
+            <otherwise>
+                <if test="mylbList != null and  mylbList.size() != 0">
+                    and (
+                    <foreach collection="mylbList" item="item" separator=" or ">
+                          bjnr like concat ('%',#{item},'%')
+                    </foreach>
+                    )
+                </if>
+            </otherwise>
+        </choose>
+
+
+
+
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+        order by bjsj desc
+    </select>
+
+
+    <select id="getJqHotMap" parameterType="Map" resultType="java.util.Map">
+        select jd as lng,wd as lat,count(1) as count
+        from tb_jq where xt_sjzt = '1' and xt_scbz = '0' and LENGTH(jd) and LENGTH(wd) >0
+        <if test="dto.bjnr != null and dto.bjnr != ''">
+            and bjnr like concat ('%',#{dto.bjnr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat (#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.jqjb != null and dto.jqjb != ''">
+            and jqjb = #{dto.jqjb}
+        </if>
+        <if test="dto.bjlb != null and dto.bjlb != ''">
+            and bjlb = #{dto.bjlb}
+        </if>
+        <if test="dto.bjlx != null and dto.bjlx != ''">
+            and bjlx = #{dto.bjlx}
+        </if>
+        <if test="dto.bjxl != null and dto.bjxl != ''">
+            and bjxl = #{dto.bjxl}
+        </if>
+        <if test="dto.czzt != null and dto.czzt != ''">
+            and czzt = #{dto.czzt}
+        </if>
+        <if test="dto.zdjqtjlx != null and dto.zdjqtjlx != ''">
+            and zdjqtjlx = #{dto.zdjqtjlx}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and bjsj between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="bjlbList != null and bjlbList.size() != 0">
+            and bjlb in
+            <foreach collection="bjlbList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        GROUP BY jd,wd
+    </select>
+
+
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.sjzx.TbJq">
+        update tb_jq
+        <set>
+            <if test="jq110Id != null and jq110Id != ''">
+                jq110_id = #{jq110Id},
+            </if>
+            <if test="jjdbh != null and jjdbh != ''">
+                jjdbh = #{jjdbh},
+            </if>
+            <if test="jjdwbh != null and jjdwbh != ''">
+                jjdwbh = #{jjdwbh},
+            </if>
+            <if test="jjdwmc != null and jjdwmc != ''">
+                jjdwmc = #{jjdwmc},
+            </if>
+            <if test="gljjdbh != null and gljjdbh != ''">
+                gljjdbh = #{gljjdbh},
+            </if>
+            <if test="jjybh != null and jjybh != ''">
+                jjybh = #{jjybh},
+            </if>
+            <if test="jjyxm != null and jjyxm != ''">
+                jjyxm = #{jjyxm},
+            </if>
+            <if test="jjtbh != null and jjtbh != ''">
+                jjtbh = #{jjtbh},
+            </if>
+            <if test="jjtip != null and jjtip != ''">
+                jjtip = #{jjtip},
+            </if>
+            <if test="hrsj != null">
+                hrsj = #{hrsj},
+            </if>
+            <if test="lhlxbh != null and lhlxbh != ''">
+                lhlxbh = #{lhlxbh},
+            </if>
+            <if test="bjfsbh != null and bjfsbh != ''">
+                bjfsbh = #{bjfsbh},
+            </if>
+            <if test="bjrq != null">
+                bjrq = #{bjrq},
+            </if>
+            <if test="bjsj != null">
+                bjsj = #{bjsj},
+            </if>
+            <if test="jjsj != null">
+                jjsj = #{jjsj},
+            </if>
+            <if test="jqfsksnf != null">
+                jqfsksnf = #{jqfsksnf},
+            </if>
+            <if test="jqfsksyf != null">
+                jqfsksyf = #{jqfsksyf},
+            </if>
+            <if test="jqfsksny != null">
+                jqfsksny = #{jqfsksny},
+            </if>
+            <if test="jqfskszs != null">
+                jqfskszs = #{jqfskszs},
+            </if>
+            <if test="jqfsksrq != null">
+                jqfsksrq = #{jqfsksrq},
+            </if>
+            <if test="jqfskssj != null">
+                jqfskssj = #{jqfskssj},
+            </if>
+            <if test="jqfsksxs != null">
+                jqfsksxs = #{jqfsksxs},
+            </if>
+            <if test="jqfsjssj != null">
+                jqfsjssj = #{jqfsjssj},
+            </if>
+            <if test="hrsc != null">
+                hrsc = #{hrsc},
+            </if>
+            <if test="jjsc != null">
+                jjsc = #{jjsc},
+            </if>
+            <if test="jjlyh != null and jjlyh != ''">
+                jjlyh = #{jjlyh},
+            </if>
+            <if test="bjdh != null and bjdh != ''">
+                bjdh = #{bjdh},
+            </if>
+            <if test="bjdhYhxm != null and bjdhYhxm != ''">
+                bjdh_yhxm = #{bjdhYhxm},
+            </if>
+            <if test="bjdhYhdz != null and bjdhYhdz != ''">
+                bjdh_yhdz = #{bjdhYhdz},
+            </if>
+            <if test="bjrSfzh != null and bjrSfzh != ''">
+                bjr_sfzh = #{bjrSfzh},
+            </if>
+            <if test="bjrXm != null and bjrXm != ''">
+                bjr_xm = #{bjrXm},
+            </if>
+            <if test="bjrXb != null and bjrXb != ''">
+                bjr_xb = #{bjrXb},
+            </if>
+            <if test="bjrLxdh != null and bjrLxdh != ''">
+                bjr_lxdh = #{bjrLxdh},
+            </if>
+            <if test="bjrZzdw != null and bjrZzdw != ''">
+                bjr_zzdw = #{bjrZzdw},
+            </if>
+            <if test="sfdzxzqh != null and sfdzxzqh != ''">
+                sfdzxzqh = #{sfdzxzqh},
+            </if>
+            <if test="sfdz != null and sfdz != ''">
+                sfdz = #{sfdz},
+            </if>
+            <if test="bjnr != null and bjnr != ''">
+                bjnr = #{bjnr},
+            </if>
+            <if test="jqjb != null and jqjb != ''">
+                jqjb = #{jqjb},
+            </if>
+            <if test="bjlb != null and bjlb != ''">
+                bjlb = #{bjlb},
+            </if>
+            <if test="bjlx != null and bjlx != ''">
+                bjlx = #{bjlx},
+            </if>
+            <if test="bjxl != null and bjxl != ''">
+                bjxl = #{bjxl},
+            </if>
+            <if test="bjxlmc != null and bjxlmc != ''">
+                bjxlmc = #{bjxlmc},
+            </if>
+            <if test="bjlxmc != null and bjlxmc != ''">
+                bjlxmc = #{bjlxmc},
+            </if>
+            <if test="bjlbmc != null and bjlbmc != ''">
+                bjlbmc = #{bjlbmc},
+            </if>
+            <if test="ldgbh != null and ldgbh != ''">
+                ldgbh = #{ldgbh},
+            </if>
+            <if test="bkrs != null">
+                bkrs = #{bkrs},
+            </if>
+            <if test="ssrs != null">
+                ssrs = #{ssrs},
+            </if>
+            <if test="swrs != null">
+                swrs = #{swrs},
+            </if>
+            <if test="ywwxwz != null">
+                ywwxwz = #{ywwxwz},
+            </if>
+            <if test="ywbzxl != null">
+                ywbzxl = #{ywbzxl},
+            </if>
+            <if test="ywbkry != null">
+                ywbkry = #{ywbkry},
+            </if>
+            <if test="sfsw != null">
+                sfsw = #{sfsw},
+            </if>
+            <if test="sfswybj != null">
+                sfswybj = #{sfswybj},
+            </if>
+            <if test="sfzdjq != null and sfzdjq != ''">
+                sfzdjq = #{sfzdjq},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="czzt != null and czzt != ''">
+                czzt = #{czzt},
+            </if>
+            <if test="zdjqtjlx != null and zdjqtjlx != ''">
+                zdjqtjlx = #{zdjqtjlx},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="color != null and color != ''">
+                color = #{color},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbJqMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tb_jq
+        where id = #{id}
+    </select>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.sjzx.TbJq">
+        insert into tb_jq(id, jq110_id, jjdbh, jjdwbh, jjdwmc, gljjdbh, jjybh, jjyxm, jjtbh, jjtip, hrsj, lhlxbh,
+                          bjfsbh, bjrq, bjsj, jjsj, jqfsksnf, jqfsksyf, jqfsksny, jqfskszs, jqfsksrq, jqfskssj,
+                          jqfsksxs, jqfsjssj, hrsc, jjsc, jjlyh, bjdh, bjdh_yhxm, bjdh_yhdz, bjr_sfzh, bjr_xm, bjr_xb,
+                          bjr_lxdh, bjr_zzdw, sfdzxzqh, sfdz, bjnr, jqjb, bjlb, bjlx, bjxl, ldgbh, bjxlmc, bjlxmc,
+                          bjlbmc, bkrs, ssrs, swrs, ywwxwz, ywbzxl, ywbkry, sfsw, sfswybj, sfzdjq, jd, wd,
+                          czzt, zdjqtjlx, ssbm, ssbmdm, ssxgaj, sfjmjq,
+                          ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                          xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, color,
+                          zb, zbhash)
+        values (#{id}, #{jq110Id}, #{jjdbh}, #{jjdwbh}, #{jjdwmc}, #{gljjdbh}, #{jjybh}, #{jjyxm}, #{jjtbh}, #{jjtip},
+                #{hrsj}, #{lhlxbh}, #{bjfsbh}, #{bjrq}, #{bjsj}, #{jjsj}, #{jqfsksnf}, #{jqfsksyf}, #{jqfsksny},
+                #{jqfskszs}, #{jqfsksrq}, #{jqfskssj}, #{jqfsksxs}, #{jqfsjssj}, #{hrsc}, #{jjsc}, #{jjlyh},
+                #{bjdh}, #{bjdhYhxm}, #{bjdhYhdz}, #{bjrSfzh}, #{bjrXm}, #{bjrXb}, #{bjrLxdh}, #{bjrZzdw},
+                #{sfdzxzqh}, #{sfdz}, #{bjnr}, #{jqjb}, #{bjlb}, #{bjlx}, #{bjxl}, #{ldgbh}, #{bjxlmc}, #{bjlxmc},
+                #{bjlbmc}, #{bkrs}, #{ssrs}, #{swrs},
+                #{ywwxwz}, #{ywbzxl}, #{ywbkry}, #{sfsw}, #{sfswybj}, #{sfzdjq}, #{jd}, #{wd},
+                #{czzt}, #{zdjqtjlx}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{sfjmjq},
+                #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm},
+                #{xtZhgxbm}, #{bz}, #{color},
+                ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{zbhash} )
+    </insert>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        update tb_jq
+        set xt_scbz = '1'
+        where id = #{id}
+    </delete>
+
+    <select id="getStatistics" resultType="java.util.Map">
+        select bjlb, count(bjlb) count
+        from tb_jq
+        where xt_scbz = '0'
+        and xt_sjzt = '1'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and bjrq &gt;= #{startTime}
+            and bjrq &lt;= #{endTime}
+        </if>
+        <if test="bjnr != null and bjnr != ''">
+            <!--and match(bjnr) against (#{bjnr})-->
+            and bjnr like concat ('%',#{bjnr},'%')
+        </if>
+        group by bjlb
+    </select>
+
+    <select id="getYjxx30Day" resultType="java.util.Map">
+        select yj_lx,jd,wd,yjbqmc,ssbmdm from mosty_yjzl.tb_yjxx a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and jd is not null and wd is not null and yjbqmc is not null and yj_lx is not null
+        <if test="kssj != null and kssj != ''">
+            and a.yj_fsrq >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and a.yj_fsrq &lt;= #{jssj}
+        </if>
+    </select>
+
+    <select id="getPcryList" resultType="java.util.Map">
+        select jd,wd,ssbmdm from mosty_hczx.tb_hc_bpcry a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and jd is not null and wd is not null and bqxxsj is not null
+        <if test="kssj != null and kssj != ''">
+            and a.pcrq >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and a.pcrq &lt;= #{jssj}
+        </if>
+    </select>
+
+    <select id="getPcclList" resultType="java.util.Map">
+        select jd,wd,ssbmdm from mosty_hczx.tb_hc_bpccl a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and jd is not null and wd is not null and bqxxsj is not null
+        <if test="kssj != null and kssj != ''">
+            and a.pcrq >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and a.pcrq &lt;= #{jssj}
+        </if>
+    </select>
+
+    <select id="getJqTj" resultType="java.util.Map">
+        select count(1) count,jqfsksxs time from tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') = #{kssj}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+    <select id="getJqTjByTime" resultType="java.util.Map">
+        select count(1) count,bjrq time from tb_jq  where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') >= #{kssj} and date_format(bjrq,'%Y-%m-%d') &lt;= #{jssj}
+        group by bjrq order by bjrq
+    </select>
+
+    <select id="getWzList" resultType="java.util.Map">
+        select sum(xfsc) xfsc,sum(xflc) xflc,date_format(dwsj,'%H') time from mosty_wzzx.tb_wz_sswz a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.dwrq = #{kssj} and ywid is not null group by date_format(dwsj,'%H')
+        order by time
+    </select>
+
+    <select id="getBbList" resultType="java.util.Map">
+        select sum(xfsc) xfsc,sum(xflc) xflc,date_format(xfrq,'%Y-%m-%d') time from mosty_qwgl.tb_qw_xfbb a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1' and a.xfrq >= #{kssj} and a.xfrq &lt;= #{jssj}
+        group by xfrq
+    </select>
+
+    <select id="getPcryTj" resultType="java.util.Map">
+        select count(1) count,date_format(pcsj,'%H') time from mosty_hczx.tb_hc_bpcry a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq = #{kssj}
+        group by date_format(pcsj,'%H') order by date_format(pcsj,'%H')
+    </select>
+
+    <select id="getPcclTj" resultType="java.util.Map">
+        select count(1) count,date_format(pcsj,'%H') time from mosty_hczx.tb_hc_bpccl a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq = #{kssj}
+        group by date_format(pcsj,'%H') order by date_format(pcsj,'%H')
+    </select>
+
+    <select id="getPcZdryTj" resultType="java.util.Map">
+        select count(1) count,date_format(pcsj,'%H') time from mosty_hczx.tb_hc_bpcry a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq = #{kssj} and bqmc is not null
+        group by date_format(pcsj,'%H') order by date_format(pcsj,'%H')
+    </select>
+
+    <select id="getPcryByTime" resultType="java.util.Map">
+        select count(1) count,pcrq time from mosty_hczx.tb_hc_bpcry a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq >= #{kssj} and a.pcrq &lt;=#{jssj}
+        group by pcrq order by pcrq
+    </select>
+
+    <select id="getPcclByTime" resultType="java.util.Map">
+        select count(1) count,pcrq time from mosty_hczx.tb_hc_bpccl a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq >= #{kssj} and a.pcrq &lt;=#{jssj}
+        group by pcrq order by pcrq
+    </select>
+
+    <select id="getZdryByTime" resultType="java.util.Map">
+        select count(1) count,pcrq time from mosty_hczx.tb_hc_bpcry a
+        where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.pcrq >= #{kssj} and a.pcrq &lt;=#{jssj}
+        and bqmc is not null
+        group by pcrq order by pcrq
+    </select>
+
+    <update id="updateJqCzzt">
+        update tb_jq set czzt = #{czzt} where id = #{id}
+    </update>
+
+
+    <select id="selectDict" resultType="com.mosty.common.config.entity.SysDictItem">
+        select *
+        from mosty_base.sys_dict_item
+        where zdbh = #{dictName}  and dm = #{dm}
+          and xt_zxbz = '0'
+    </select>
+
+    <select id="selectJjdbh" resultType="java.lang.String">
+        SELECT DISTINCT jjdbh FROM  tb_jq  WHERE xt_scbz = '0'
+        <if test="jwd != null and jwd != ''">
+            AND jd is null AND wd is null
+        </if>
+       AND DATEDIFF(bjrq, NOW()) = 0
+    </select>
+
+    <update id="updateJqJwd" parameterType="com.mosty.base.model.entity.sjzx.TbJq">
+        update tb_jq
+        <set>
+            <if test="fxdwjd != null">
+                jd = #{jd},
+            </if>
+            <if test="fxdwwd != null">
+                wd = #{wd}
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+        </set>
+        where jjdbh = #{jjdbh}
+    </update>
+
+
+</mapper>
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbSjCyjlMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbSjCyjlMapper.xml
new file mode 100644
index 0000000..5a37dcb
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbSjCyjlMapper.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbSjCyjlMapper">
+    <resultMap type="com.mosty.base.model.entity.sjzx.TbSjCyjl" id="TbSjCyjlMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjId" column="sj_id" jdbcType="VARCHAR"/>
+        <result property="jlId" column="jl_id" jdbcType="VARCHAR"/>
+        <result property="jlSfzh" column="jl_sfzh" jdbcType="VARCHAR"/>
+        <result property="jlXm" column="jl_xm" jdbcType="VARCHAR"/>
+        <result property="jlLxdh" column="jl_lxdh" jdbcType="VARCHAR"/>
+        <result property="sdzlsj" column="sdzlsj" jdbcType="TIMESTAMP"/>
+        <result property="qszlsj" column="qszlsj" jdbcType="TIMESTAMP"/>
+        <result property="ddxcsj" column="ddxcsj" jdbcType="TIMESTAMP"/>
+        <result property="jssj" column="jssj" jdbcType="TIMESTAMP"/>
+        <result property="mjfj" column="mjfj" jdbcType="VARCHAR"/>
+        <result property="sfzyjz" column="sfzyjz" jdbcType="VARCHAR"/>
+        <result property="zybqdm" column="zybqdm" jdbcType="VARCHAR"/>
+        <result property="zybq" column="zybq" jdbcType="VARCHAR"/>
+        <result property="dqwz" column="dqwz" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="zbsj" column="zbsj" jdbcType="TIMESTAMP"/>
+        <result property="jlzt" column="jlzt" jdbcType="VARCHAR"/>
+        <result property="tpId" column="tp_id" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询所有-->
+    <select id="queryAll" resultMap="TbSjCyjlMap">
+        select * from tb_sj_cyjl where xt_sjzt = '1' and xt_scbz = '0'
+        ${useSql}
+    </select>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbSjCyjlMap">
+        select * from tb_sj_cyjl where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <select id="joinCopCount" resultType="java.util.Map">
+        SELECT COUNT(*)allsl,
+        (SELECT COUNT(*) from tb_sj_cyjl where xt_sjzt='1' and mjfj='01'
+        <if test="t.sjId !=null and t.sjId!=''">
+            and sj_id=#{t.sjId}
+        </if>
+        ) mjsl,
+        (SELECT COUNT(*) from tb_sj_cyjl where xt_sjzt='1' and mjfj='02'
+        <if test="t.sjId !=null and t.sjId!=''">
+            and sj_id=#{t.sjId}
+        </if>
+        )fjsl,
+        (SELECT COUNT(*) from tb_sj_cyjl where xt_sjzt='1' and sfzyjz='1'
+        <if test="t.sjId !=null and t.sjId!=''">
+            and sj_id=#{t.sjId}
+        </if>
+        )tsjz
+        from tb_sj_cyjl where xt_sjzt='1'
+        <if test="t.sjId !=null and t.sjId!=''">
+            and sj_id=#{t.sjId}
+        </if>
+    </select>
+
+</mapper>
+
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbSjDzMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbSjDzMapper.xml
new file mode 100644
index 0000000..830fe8d
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbSjDzMapper.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbSjDzMapper">
+
+    <resultMap type="com.mosty.base.model.entity.sjzx.TbSjDz" id="tbSjdzMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjId" column="sj_id" jdbcType="VARCHAR"/>
+        <result property="dztzSj" column="dztz_sj" jdbcType="TIMESTAMP"/>
+        <result property="dztzRyid" column="dztz_ryid" jdbcType="VARCHAR"/>
+        <result property="dztzRysfzh" column="dztz_rysfzh" jdbcType="VARCHAR"/>
+        <result property="dztzRyxm" column="dztz_ryxm" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="dzxzqh" column="dzxzqh" jdbcType="VARCHAR"/>
+        <result property="dz" column="dz" jdbcType="VARCHAR"/>
+        <result property="tpId" column="tp_id" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        ,sj_id,dztz_sj,dztz_ryid,dztz_rysfzh,dztz_ryxm,jd,wd,ssbmid,ssxgajid,sssgajid,
+        zbhash,dzxzqh,dz,tp_id,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.sjzx.TbSjDz">
+        insert into tb_sj_dz
+        (id,sj_id,dztz_sj,dztz_ryid,dztz_rysfzh,dztz_ryxm,jd,wd,zb,ssbmid,ssxgajid,sssgajid,
+         zbhash,dzxzqh,dz,tp_id, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,
+         xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id,
+         xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (
+                #{id}, #{sjId}, #{dztzSj}, #{dztzRyid}, #{dztzRysfzh}, #{dztzRyxm}, #{jd},
+                #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{zbhash},
+                #{dzxzqh}, #{dz},#{tpId}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm},
+                #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},#{xtCjr}, #{xtCjbmdm},
+                #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid},#{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+</mapper>
+
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbSjMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbSjMapper.xml
new file mode 100644
index 0000000..4dab377
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbSjMapper.xml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbSjMapper">
+
+    <resultMap type="com.mosty.base.model.entity.sjzx.TbSj" id="TbSjMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ywId" column="yw_id" jdbcType="VARCHAR"/>
+        <result property="sjFl" column="sj_fl" jdbcType="VARCHAR"/>
+        <result property="sjJb" column="sj_jb" jdbcType="VARCHAR"/>
+        <result property="sjFssj" column="sj_fssj" jdbcType="TIMESTAMP"/>
+        <result property="sjBt" column="sj_bt" jdbcType="VARCHAR"/>
+        <result property="sjNr" column="sj_nr" jdbcType="VARCHAR"/>
+        <result property="bjrxm" column="bjrxm" jdbcType="VARCHAR"/>
+        <result property="bjrlxdh" column="bjrlxdh" jdbcType="VARCHAR"/>
+        <result property="csjd" column="csjd" jdbcType="NUMERIC"/>
+        <result property="cswd" column="cswd" jdbcType="NUMERIC"/>
+        <result property="cszb" column="cszb" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="cszbhash" column="cszbhash" jdbcType="VARCHAR"/>
+        <result property="csdzxzqh" column="csdzxzqh" jdbcType="VARCHAR"/>
+        <result property="csdz" column="csdz" jdbcType="VARCHAR"/>
+        <result property="dqjd" column="dqjd" jdbcType="NUMERIC"/>
+        <result property="dqwd" column="dqwd" jdbcType="NUMERIC"/>
+        <result property="dqzb" column="dqzb" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dqzbhash" column="dqzbhash" jdbcType="VARCHAR"/>
+        <result property="dqdzxzqh" column="dqdzxzqh" jdbcType="VARCHAR"/>
+        <result property="dqdz" column="dqdz" jdbcType="VARCHAR"/>
+        <result property="czkssj" column="czkssj" jdbcType="TIMESTAMP"/>
+        <result property="czjssj" column="czjssj" jdbcType="TIMESTAMP"/>
+        <result property="qcHx" column="qc_hx" jdbcType="INTEGER"/>
+        <result property="qcJj" column="qc_jj" jdbcType="INTEGER"/>
+        <result property="qcGz" column="qc_gz" jdbcType="INTEGER"/>
+        <result property="qcGxcs" column="qc_gxcs" jdbcType="INTEGER"/>
+        <result property="qcGxsj" column="qc_gxsj" jdbcType="TIMESTAMP"/>
+        <result property="tpId" column="tp_id" jdbcType="VARCHAR"/>
+        <result property="czzt" column="czzt" jdbcType="VARCHAR"/>
+        <result property="czsm" column="czsm" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        ,yw_id,sj_fl,sj_jb,bjrxm,bjrlxdh,sj_fssj,sj_bt,sj_nr,csjd,cswd,ST_ASWKT (cszb) as cszb,cszbhash,csdzxzqh,csdz,dqjd,dqwd,
+        ST_ASWKT (dqzb) as dqzb,dqzbhash,dqdzxzqh,dqdz,czkssj,czjssj,qc_hx,qc_jj,qc_gz,qc_gxcs,qc_gxsj,tp_id,ssbm,
+        ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+        xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz,ssbmid,ssxgajid,sssgajid,czzt,czsm
+    </sql>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbSjMap">
+        select
+        <include refid="base_column_list"/>
+        from tb_sj
+        where id = #{id}
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insertEntity">
+        insert into tb_sj(id, yw_id, sj_fl, sj_jb, bjrxm, bjrlxdh, sj_fssj, sj_bt, sj_nr, csjd, cswd, cszb, cszbhash,
+                          csdzxzqh, csdz,ssbmid,ssxgajid,sssgajid,czzt,czsm,
+                          dqjd, dqwd, dqzb, dqzbhash, dqdzxzqh, dqdz, czkssj, czjssj, qc_hx, qc_jj, qc_gz, qc_gxcs,
+                          qc_gxsj,
+                          tp_id, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                          xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm,
+                          xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{ywId}, #{sjFl}, #{sjJb}, #{bjrxm}, #{bjrlxdh}, #{sjFssj}, #{sjBt}, #{sjNr}, #{csjd}, #{cswd},
+                ST_GEOMFROMTEXT(#{cszb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{cszbhash}, #{csdzxzqh}, #{csdz},#{ssbmid},#{ssxgajid},#{sssgajid},#{czzt},#{czsm}, #{dqjd}, #{dqwd},
+                ST_GEOMFROMTEXT(#{dqzb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}), #{dqzbhash},
+                #{dqdzxzqh}, #{dqdz}, #{czkssj}, #{czjssj}, #{qcHx}, #{qcJj}, #{qcGz}, #{qcGxcs}, #{qcGxsj},
+                #{tpId}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly},
+                #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc},
+                #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="updateEntity">
+        update tb_sj
+        <set>
+            <if test="ywId != null and ywId != ''">
+                yw_id = #{ywId},
+            </if>
+            <if test="sjFl != null and sjFl != ''">
+                sj_fl = #{sjFl},
+            </if>
+            <if test="sjJb != null and sjJb != ''">
+                sj_jb = #{sjJb},
+            </if>
+            <if test="bjrxm != null and bjrxm != ''">
+                bjrxm = #{bjrxm},
+            </if>
+            <if test="bjrlxdh != null and bjrlxdh != ''">
+                bjrlxdh = #{bjrlxdh},
+            </if>
+            <if test="sjFssj != null">
+                sj_fssj = #{sjFssj},
+            </if>
+            <if test="sjBt != null and sjBt != ''">
+                sj_bt = #{sjBt},
+            </if>
+            <if test="sjNr != null and sjNr != ''">
+                sj_nr = #{sjNr},
+            </if>
+            <if test="csjd != null">
+                csjd = #{csjd},
+            </if>
+            <if test="cswd != null">
+                cswd = #{cswd},
+            </if>
+            <if test="cszb != null">
+                cszb = ST_GEOMFROMTEXT(#{cszb, typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="cszbhash != null and cszbhash != ''">
+                cszbhash = #{cszbhash},
+            </if>
+            <if test="csdzxzqh != null and csdzxzqh != ''">
+                csdzxzqh = #{csdzxzqh},
+            </if>
+            <if test="csdz != null and csdz != ''">
+                csdz = #{csdz},
+            </if>
+            <if test="dqjd != null">
+                dqjd = #{dqjd},
+            </if>
+            <if test="dqwd != null">
+                dqwd = #{dqwd},
+            </if>
+            <if test="dqzb != null">
+                dqzb = ST_GEOMFROMTEXT(#{dqzb, typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="dqzbhash != null and dqzbhash != ''">
+                dqzbhash = #{dqzbhash},
+            </if>
+            <if test="dqdzxzqh != null and dqdzxzqh != ''">
+                dqdzxzqh = #{dqdzxzqh},
+            </if>
+            <if test="dqdz != null and dqdz != ''">
+                dqdz = #{dqdz},
+            </if>
+            <if test="czkssj != null">
+                czkssj = #{czkssj},
+            </if>
+            <if test="czjssj != null">
+                czjssj = #{czjssj},
+            </if>
+            <if test="qcHx != null">
+                qc_hx = #{qcHx},
+            </if>
+            <if test="qcJj != null">
+                qc_jj = #{qcJj},
+            </if>
+            <if test="qcGz != null">
+                qc_gz = #{qcGz},
+            </if>
+            <if test="qcGxcs != null">
+                qc_gxcs = #{qcGxcs},
+            </if>
+            <if test="qcGxsj != null">
+                qc_gxsj = #{qcGxsj},
+            </if>
+            <if test="tpId != null and tpId != ''">
+                tp_id = #{tpId},
+            </if>
+            <if test="czzt != null and czzt != ''">
+                czzt = #{czzt},
+            </if>
+            <if test="czsm != null and czsm != ''">
+                czsm = #{czsm},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from tb_sj
+        where id = #{id}
+    </delete>
+
+</mapper>
+
+
diff --git a/mosty-sjzx/src/main/resources/mapper/TbSjSpbfMapper.xml b/mosty-sjzx/src/main/resources/mapper/TbSjSpbfMapper.xml
new file mode 100644
index 0000000..ba635f5
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/mapper/TbSjSpbfMapper.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.sjzx.mapper.TbSjSpbfMapper">
+    <resultMap type="com.mosty.base.model.entity.sjzx.TbSjSpbf" id="TbSjSpbfMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjId" column="sj_id" jdbcType="VARCHAR"/>
+        <result property="sxtId" column="sxt_id" jdbcType="VARCHAR"/>
+        <result property="bfkssj" column="bfkssj" jdbcType="TIMESTAMP"/>
+        <result property="bfjssj" column="bfjssj" jdbcType="TIMESTAMP"/>
+        <result property="wz" column="wz" jdbcType="VARCHAR"/>
+        <result property="tpId" column="tp_id" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--查询所有-->
+    <select id="queryAll" resultMap="TbSjSpbfMap">
+        select * from tb_sj_spbf where xt_sjzt = '1' and xt_scbz = '0'
+        ${useSql}
+    </select>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbSjSpbfMap">
+        select * from tb_sj_spbf where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from tb_sj_spbf
+        where id = #{id}
+    </delete>
+</mapper>
+
+
diff --git a/mosty-sjzx/src/main/resources/rebel.xml b/mosty-sjzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..a37b405
--- /dev/null
+++ b/mosty-sjzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-sjzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-sjzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-spxl/mosty-spxl.iml b/mosty-spxl/mosty-spxl.iml
new file mode 100644
index 0000000..758b9e8
--- /dev/null
+++ b/mosty-spxl/mosty-spxl.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353926" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-spxl/pom.xml b/mosty-spxl/pom.xml
new file mode 100644
index 0000000..7bba4cc
--- /dev/null
+++ b/mosty-spxl/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-spxl</artifactId>
+    <description>视频巡逻</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/MostySpxlApplication.java b/mosty-spxl/src/main/java/com/mosty/spxl/MostySpxlApplication.java
new file mode 100644
index 0000000..4a09f2d
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/MostySpxlApplication.java
@@ -0,0 +1,29 @@
+package com.mosty.spxl;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ *	视频巡逻 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.spxl.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+public class MostySpxlApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostySpxlApplication.class, args);
+	}
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/config/FeignConfig.java b/mosty-spxl/src/main/java/com/mosty/spxl/config/FeignConfig.java
new file mode 100644
index 0000000..4a72acb
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.spxl.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/config/GlobalYmlConfig.java b/mosty-spxl/src/main/java/com/mosty/spxl/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..d97948d
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.spxl.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/config/WebMvcConfig.java b/mosty-spxl/src/main/java/com/mosty/spxl/config/WebMvcConfig.java
new file mode 100644
index 0000000..73bab98
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.spxl.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaController.java b/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaController.java
new file mode 100644
index 0000000..aa033a9
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaController.java
@@ -0,0 +1,69 @@
+package com.mosty.spxl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaUpdateDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.base.model.query.spxl.TbSpxlSpxlfaQuery;
+import com.mosty.spxl.service.TbSpxlSpxlfaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Api(tags = "视频巡逻方案接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbSpxlSpxlfa")
+public class TbSpxlSpxlfaController {
+
+    private final TbSpxlSpxlfaService tbSpxlSpxlfaService;
+
+    @ApiOperation("新增视频巡逻方案")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "新增视频巡逻方案", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> addEntity(@RequestBody TbSpxlSpxlfa fa) {
+        return ResponseResult.success(this.tbSpxlSpxlfaService.addEntity(fa));
+    }
+
+    @ApiOperation("删除视频巡逻方案")
+    @JwtSysUser
+    @DeleteMapping
+    @Log(title = "删除视频巡逻方案", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> delEntity(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbSpxlSpxlfaService.delEntity(ids));
+    }
+
+    @ApiOperation("修改视频巡逻方案")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "修改视频巡逻方案", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> updateEntity(@RequestBody TbSpxlSpxlfaUpdateDto dto) {
+        return ResponseResult.success(this.tbSpxlSpxlfaService.updateEntity(dto));
+    }
+
+    @ApiOperation("查询视频方案分页列表")
+    @JwtSysUser
+    @GetMapping("queryPage")
+    public ResponseResult<IPage<TbSpxlSpxlfa>> queryPage(TbSpxlSpxlfaQuery dto) {
+        return ResponseResult.success(this.tbSpxlSpxlfaService.queryPage(dto));
+    }
+
+    @ApiOperation("查询视频方案详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbSpxlSpxlfa> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbSpxlSpxlfaService.getInfo(id));
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaSxtController.java b/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaSxtController.java
new file mode 100644
index 0000000..423a859
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/controller/TbSpxlSpxlfaSxtController.java
@@ -0,0 +1,51 @@
+package com.mosty.spxl.controller;
+
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaInsertDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.spxl.service.TbSpxlSpxlfaSxtService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Api(tags = "视频巡逻方案-摄像头接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbSpxlSpxlfaSxt")
+public class TbSpxlSpxlfaSxtController {
+
+    private final TbSpxlSpxlfaSxtService tbSpxlSpxlfaSxtService;
+
+    @ApiOperation("添加摄像头配置信息")
+    @JwtSysUser
+    @Log(title = "添加摄像头配置信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResponseResult<Integer> insertEntity(@RequestBody TbSpxlSpxlfaInsertDto dto) {
+        return ResponseResult.success(this.tbSpxlSpxlfaSxtService.insertEntity(dto));
+    }
+
+    @ApiOperation("修改摄像头配置信息")
+    @JwtSysUser
+    @Log(title = "修改摄像头配置信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResponseResult<Integer> updateSxtPz(@RequestBody TbSpxlSpxlfaInsertDto dto) {
+        return ResponseResult.success(this.tbSpxlSpxlfaSxtService.updateSxtPz(dto));
+    }
+
+    @ApiOperation("查询摄像头配置信息")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<TbSpxlSpxlfa> pzInfo(String faid) {
+        return ResponseResult.success(this.tbSpxlSpxlfaSxtService.pzInfo(faid));
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaMapper.java b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaMapper.java
new file mode 100644
index 0000000..22f704f
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaMapper.java
@@ -0,0 +1,15 @@
+package com.mosty.spxl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案mapper
+ **/
+@Mapper
+public interface TbSpxlSpxlfaMapper extends BaseMapper<TbSpxlSpxlfa> {
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtMapper.java b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtMapper.java
new file mode 100644
index 0000000..abe3e80
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.spxl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxt;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Mapper
+public interface TbSpxlSpxlfaSxtMapper extends BaseMapper<TbSpxlSpxlfaSxt> {
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtPzMapper.java b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtPzMapper.java
new file mode 100644
index 0000000..d231b02
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtPzMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.spxl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtPz;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Mapper
+public interface TbSpxlSpxlfaSxtPzMapper extends BaseMapper<TbSpxlSpxlfaSxtPz> {
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtzMapper.java b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtzMapper.java
new file mode 100644
index 0000000..0f81344
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mapper/TbSpxlSpxlfaSxtzMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.spxl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ **/
+@Mapper
+public interface TbSpxlSpxlfaSxtzMapper extends BaseMapper<TbSpxlSpxlfaSxtz> {
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..1cdfed9
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.spxl.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/MybatisPlusConfig.java b/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..b83f7be
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.spxl.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wqzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/remote/TbBaseAdaptRemoteService.java b/mosty-spxl/src/main/java/com/mosty/spxl/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..6d0fc7d
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,57 @@
+package com.mosty.spxl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ *  调用部门信息远程适配层
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    /**
+     * 根据部门编码查询部门信息
+     * @param orgCode 部门编码
+     * @return 部门信息
+     */
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            return null;
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaService.java b/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaService.java
new file mode 100644
index 0000000..8f170ae
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaService.java
@@ -0,0 +1,32 @@
+package com.mosty.spxl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaUpdateDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.base.model.query.spxl.TbSpxlSpxlfaQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案服务类
+ **/
+public interface TbSpxlSpxlfaService {
+
+    @ApiOperation("添加视频巡逻方案")
+    int addEntity(TbSpxlSpxlfa fa);
+
+    @ApiOperation("删除视频巡逻方案")
+    int delEntity(List<String> ids);
+
+    @ApiOperation("修改视频巡逻方案")
+    int updateEntity(TbSpxlSpxlfaUpdateDto dto);
+
+    @ApiOperation("分页查询视频巡逻方案")
+    IPage<TbSpxlSpxlfa> queryPage(TbSpxlSpxlfaQuery dto);
+
+    @ApiOperation("获取方案详细信息")
+    TbSpxlSpxlfa getInfo(String id);
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaSxtService.java b/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaSxtService.java
new file mode 100644
index 0000000..43d7b2f
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/service/TbSpxlSpxlfaSxtService.java
@@ -0,0 +1,25 @@
+package com.mosty.spxl.service;
+
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaInsertDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案-摄像头服务
+ **/
+public interface TbSpxlSpxlfaSxtService {
+
+    @ApiOperation("添加摄像头配置信息")
+    int insertEntity(TbSpxlSpxlfaInsertDto dto);
+
+    @ApiOperation("修改摄像头配置信息")
+    int updateSxtPz(TbSpxlSpxlfaInsertDto dto);
+
+    @ApiOperation("删除方案的所有的配置信息")
+    void deleteFaPz(String faid);
+
+    @ApiOperation("查询摄像头配置信息")
+    TbSpxlSpxlfa pzInfo(String faid);
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaServiceImpl.java b/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaServiceImpl.java
new file mode 100644
index 0000000..2b7e065
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaServiceImpl.java
@@ -0,0 +1,107 @@
+package com.mosty.spxl.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaUpdateDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.base.model.query.spxl.TbSpxlSpxlfaQuery;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.spxl.mapper.TbSpxlSpxlfaMapper;
+import com.mosty.spxl.remote.TbBaseAdaptRemoteService;
+import com.mosty.spxl.service.TbSpxlSpxlfaService;
+import com.mosty.spxl.service.TbSpxlSpxlfaSxtService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案服务实现类
+ **/
+@AllArgsConstructor
+@Service
+public class TbSpxlSpxlfaServiceImpl extends ServiceImpl<TbSpxlSpxlfaMapper, TbSpxlSpxlfa>
+        implements TbSpxlSpxlfaService {
+
+    private final  TbSpxlSpxlfaSxtService tbSpxlSpxlfaSxtService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    @Override
+    public int addEntity(TbSpxlSpxlfa fa) {
+        UserInfo user = UserInfoManager.get();
+        if (user != null) {
+            fa.setCjrid(String.valueOf(user.getUserId()));
+            fa.setCjrsfzh(user.getIdEntityCard());
+            fa.setCjrxm(user.getUserName());
+            fa.setSsbm(user.getDeptName());
+            fa.setSsbmid(String.valueOf(user.getDeptId()));
+            fa.setSsbmdm(user.getDeptCode());
+            fa.setSsxgaj(user.getFxjDeptName());
+            fa.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            fa.setSsxgajdm(user.getFxjDeptCode());
+            fa.setSssgaj(user.getDszDeptName());
+            fa.setSssgajid(String.valueOf(user.getDszDeptId()));
+            fa.setSssgajdm(user.getDszDeptCode());
+        }
+        fa.setXtSjly("1");
+        return this.baseMapper.insert(fa);
+    }
+
+    @Override
+    @Transactional
+    public int delEntity(List<String> ids) {
+        return this.baseMapper.deleteBatchIds(ids);
+    }
+
+    @Override
+    public int updateEntity(TbSpxlSpxlfaUpdateDto dto) {
+        TbSpxlSpxlfa fa = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbSpxlSpxlfa>()
+                        .eq(TbSpxlSpxlfa::getXtSjzt, "1")
+                        .eq(TbSpxlSpxlfa::getXtScbz, "0")
+                        .eq(TbSpxlSpxlfa::getId, dto.getId())
+        );
+        if (fa == null) {
+            throw new BusinessException("方案不存在或已被删除");
+        }
+        TbSpxlSpxlfa entity = new TbSpxlSpxlfa();
+        BeanUtils.copyProperties(dto, entity);
+        return this.baseMapper.updateById(entity);
+    }
+
+    @Override
+    public IPage<TbSpxlSpxlfa> queryPage(TbSpxlSpxlfaQuery dto) {
+        QueryWrapper<TbSpxlSpxlfa> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        return this.baseMapper.selectPage(
+                new Page<>(dto.getPageNum(), dto.getPageSize()),
+                queryWrapper.lambda()
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbSpxlSpxlfa::getSsbmdm, dto.getSsbmdm())
+                        .like(StringUtils.isNotBlank(dto.getFamc()), TbSpxlSpxlfa::getFamc, dto.getFamc())
+                        .eq(StringUtils.isNotBlank(dto.getFalx()), TbSpxlSpxlfa::getFalx, dto.getFalx())
+                        .eq(StringUtils.isNotBlank(dto.getFps()), TbSpxlSpxlfa::getFps, dto.getFps())
+                        .le(StringUtils.isNotBlank(dto.getJssj()), TbSpxlSpxlfa::getJssj, dto.getJssj())
+                        .le(StringUtils.isNotBlank(dto.getSsbmid()), TbSpxlSpxlfa::getSsbmid, dto.getSsbmid())
+                        .ge(StringUtils.isNotBlank(dto.getKssj()), TbSpxlSpxlfa::getKssj, dto.getKssj())
+                        .orderByDesc(TbSpxlSpxlfa::getXtCjsj)
+        );
+    }
+
+    @Override
+    public TbSpxlSpxlfa getInfo(String id) {
+        return this.baseMapper.selectById(id);
+    }
+}
diff --git a/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaSxtServiceImpl.java b/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaSxtServiceImpl.java
new file mode 100644
index 0000000..673cb89
--- /dev/null
+++ b/mosty-spxl/src/main/java/com/mosty/spxl/service/impl/TbSpxlSpxlfaSxtServiceImpl.java
@@ -0,0 +1,188 @@
+package com.mosty.spxl.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaInsertDto;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaSxtDto;
+import com.mosty.base.model.dto.spxl.TbSpxlSpxlfaSxtzDto;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfa;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxt;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtPz;
+import com.mosty.base.model.entity.spxl.TbSpxlSpxlfaSxtz;
+import com.mosty.spxl.mapper.TbSpxlSpxlfaMapper;
+import com.mosty.spxl.mapper.TbSpxlSpxlfaSxtMapper;
+import com.mosty.spxl.mapper.TbSpxlSpxlfaSxtPzMapper;
+import com.mosty.spxl.mapper.TbSpxlSpxlfaSxtzMapper;
+import com.mosty.spxl.service.TbSpxlSpxlfaSxtService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author dw
+ * @since 2022/7/11
+ * 视频巡逻方案-摄像头-服务-实现
+ **/
+@Service
+public class TbSpxlSpxlfaSxtServiceImpl extends ServiceImpl<TbSpxlSpxlfaSxtMapper, TbSpxlSpxlfaSxt>
+        implements TbSpxlSpxlfaSxtService {
+
+    @Resource
+    private TbSpxlSpxlfaMapper tbSpxlSpxlfaMapper;
+
+    @Resource
+    private TbSpxlSpxlfaSxtzMapper tbSpxlSpxlfaSxtzMapper;
+
+    @Resource
+    private TbSpxlSpxlfaSxtPzMapper tbSpxlSpxlfaSxtPzMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertEntity(TbSpxlSpxlfaInsertDto dto) {
+        TbSpxlSpxlfa fa = this.tbSpxlSpxlfaMapper.selectById(dto.getFaid());
+        if (fa == null) {
+            throw new BusinessException("方案不存在，或已经删除");
+        }
+        List<TbSpxlSpxlfaSxtzDto> sxtzList = dto.getSxtzList();
+        if (CollectionUtils.isEmpty(sxtzList)) {
+            throw new BusinessException("请至少添加一个摄像头组");
+        }
+        AtomicInteger a = new AtomicInteger(1);
+        sxtzList.forEach(newSxtz -> {
+            // 添加摄像头组
+            TbSpxlSpxlfaSxtz sxtz = new TbSpxlSpxlfaSxtz();
+            BeanUtils.copyProperties(newSxtz, sxtz);
+            if (StringUtils.isBlank(sxtz.getSxtzmc())) {
+                sxtz.setSxtzmc("摄像头组" + a.getAndIncrement());
+            }
+            sxtz.setFaid(fa.getId());
+            sxtz.setFamc(fa.getFamc());
+            sxtz.setXtSjly("1");
+            this.tbSpxlSpxlfaSxtzMapper.insert(sxtz);
+            // 添加摄像头
+            List<TbSpxlSpxlfaSxtDto> sxtList = newSxtz.getSxtList();
+            if (CollectionUtils.isEmpty(sxtList)) {
+                throw new BusinessException("每个组至少添加一个摄像头");
+            }
+            sxtList.forEach(newSxt -> {
+                // 查询是否存在该摄像头已经被其他单位配置，并且在同一时段内
+                TbSpxlSpxlfaSxt temp = this.baseMapper.selectOne(
+                        new LambdaQueryWrapper<TbSpxlSpxlfaSxt>()
+                                .eq(TbSpxlSpxlfaSxt::getSxtid, newSxt.getSxtid())
+                                .eq(TbSpxlSpxlfaSxt::getXtScbz, "0")
+                                .eq(TbSpxlSpxlfaSxt::getXtSjzt, "1")
+                                .last(" limit 1")
+                );
+                if (temp != null) {
+                    TbSpxlSpxlfa faTemp = this.tbSpxlSpxlfaMapper.selectOne(
+                            new LambdaQueryWrapper<TbSpxlSpxlfa>()
+                                    .eq(TbSpxlSpxlfa::getId, temp.getFaid())
+                                    .eq(TbSpxlSpxlfa::getXtScbz, "0")
+                                    .eq(TbSpxlSpxlfa::getXtSjzt, "1")
+                    );
+                    if (faTemp != null) {
+                        Date faStartTime = DateUtils.strToDate(fa.getKssj(), "09");
+                        Date faEndTime = DateUtils.strToDate(fa.getJssj(), "09");
+                        Date faTempStartTime = DateUtils.strToDate(faTemp.getJssj(), "09");
+                        Date faTempEndTime = DateUtils.strToDate(faTemp.getJssj(), "09");
+                        if (faTempStartTime.getTime() > faStartTime.getTime() || faTempEndTime.getTime() < faEndTime.getTime()) {
+                            throw new BusinessException("该摄像头在该时段有其他方案正在运行中，请选择其他摄像头，或修改之前配置。");
+                        }
+                    }
+                }
+                TbSpxlSpxlfaSxt sxt = new TbSpxlSpxlfaSxt();
+                BeanUtils.copyProperties(newSxt, sxt);
+                sxt.setFaid(fa.getId());
+                sxt.setFamc(fa.getFamc());
+                sxt.setSxtzid(sxtz.getId());
+                sxt.setXtSjly("1");
+                this.baseMapper.insert(sxt);
+                // 获取摄像头配置信息
+                TbSpxlSpxlfaSxtPz pz = newSxt.getSxtPz();
+                if (pz == null && "2".equals(fa.getFalx())) {
+                    throw new BusinessException("请配置每一个摄像头");
+                }
+                if (pz != null) {
+                    pz.setFaid(fa.getId());
+                    pz.setFamc(fa.getFamc());
+                    pz.setSxtzid(sxtz.getId());
+                    pz.setSxtid(sxt.getId());
+                    pz.setXtSjly("1");
+                    this.tbSpxlSpxlfaSxtPzMapper.insert(pz);
+                }
+            });
+        });
+        return 1;
+    }
+
+    @Override
+    @Transactional
+    public int updateSxtPz(TbSpxlSpxlfaInsertDto dto) {
+        // 删除该方案配置的所有的信息
+        this.deleteFaPz(dto.getFaid());
+        // 重新添加方案配置信息
+        return this.insertEntity(dto);
+    }
+
+    @Override
+    @Transactional
+    public void deleteFaPz(String faid) {
+        // 删除摄像头组
+        this.tbSpxlSpxlfaSxtzMapper.delete(
+                new LambdaQueryWrapper<TbSpxlSpxlfaSxtz>()
+                        .eq(TbSpxlSpxlfaSxtz::getFaid, faid)
+        );
+        // 删除摄像头
+        this.baseMapper.delete(
+                new LambdaQueryWrapper<TbSpxlSpxlfaSxt>()
+                        .eq(TbSpxlSpxlfaSxt::getFaid, faid)
+        );
+        // 删除摄像头配置
+        this.tbSpxlSpxlfaSxtPzMapper.delete(
+                new LambdaQueryWrapper<TbSpxlSpxlfaSxtPz>()
+                        .eq(TbSpxlSpxlfaSxtPz::getFaid, faid)
+        );
+    }
+
+    @Override
+    public TbSpxlSpxlfa pzInfo(String faid) {
+        TbSpxlSpxlfa fa = this.tbSpxlSpxlfaMapper.selectById(faid);
+        if (fa == null) {
+            throw new BusinessException("方案不存在，或已经被删除");
+        }
+        // 查询摄像头组
+        List<TbSpxlSpxlfaSxtz> sxtzList = this.tbSpxlSpxlfaSxtzMapper.selectList(
+                new LambdaQueryWrapper<TbSpxlSpxlfaSxtz>()
+                        .eq(TbSpxlSpxlfaSxtz::getFaid, faid)
+        );
+        sxtzList.forEach(sxtz -> {
+            // 查询摄像头
+            List<TbSpxlSpxlfaSxt> sxtList = this.baseMapper.selectList(
+                    new LambdaQueryWrapper<TbSpxlSpxlfaSxt>()
+                            .eq(TbSpxlSpxlfaSxt::getFaid, faid)
+                            .eq(TbSpxlSpxlfaSxt::getSxtzid, sxtz.getId())
+            );
+            sxtList.forEach(sxt -> {
+                // 查询摄像头配置
+                TbSpxlSpxlfaSxtPz pz = this.tbSpxlSpxlfaSxtPzMapper.selectOne(
+                        new LambdaQueryWrapper<TbSpxlSpxlfaSxtPz>()
+                                .eq(TbSpxlSpxlfaSxtPz::getFaid, faid)
+                                .eq(TbSpxlSpxlfaSxtPz::getSxtid, sxt.getId())
+                );
+                sxt.setPz(pz);
+            });
+            sxtz.setSxtList(sxtList);
+        });
+        fa.setSxtzList(sxtzList);
+        return fa;
+    }
+}
diff --git a/mosty-spxl/src/main/resources/application.yml b/mosty-spxl/src/main/resources/application.yml
new file mode 100644
index 0000000..f3fcf0a
--- /dev/null
+++ b/mosty-spxl/src/main/resources/application.yml
@@ -0,0 +1,74 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_spxl?autoReconnect=true&failOverReadOnly=false&useUnicode=tr&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-spxl/src/main/resources/bootstrap.yml b/mosty-spxl/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..e7e1c82
--- /dev/null
+++ b/mosty-spxl/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8012
+  servlet:
+    context-path: /mosty-spxl/
+spring:
+  application:
+    name: mosty-spxl
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-spxl/src/main/resources/logback-spring.xml b/mosty-spxl/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-spxl/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-spxl/src/main/resources/rebel.xml b/mosty-spxl/src/main/resources/rebel.xml
new file mode 100644
index 0000000..aeab375
--- /dev/null
+++ b/mosty-spxl/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-spxl</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-spxl/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-websocket/mosty-websocket.iml b/mosty-websocket/mosty-websocket.iml
new file mode 100644
index 0000000..548f20d
--- /dev/null
+++ b/mosty-websocket/mosty-websocket.iml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-websocket/pom.xml b/mosty-websocket/pom.xml
new file mode 100644
index 0000000..ea927b8
--- /dev/null
+++ b/mosty-websocket/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-websocket</artifactId>
+    <description>websocket</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/MostyWebSocketApplication.java b/mosty-websocket/src/main/java/com/mosty/websocket/MostyWebSocketApplication.java
new file mode 100644
index 0000000..1b13b53
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/MostyWebSocketApplication.java
@@ -0,0 +1,24 @@
+package com.mosty.websocket;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableTimeConsume
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@EnableDiscoveryClient
+@EnableScheduling
+@SpringBootApplication
+public class MostyWebSocketApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MostyWebSocketApplication.class, args);
+    }
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/config/FeignConfig.java b/mosty-websocket/src/main/java/com/mosty/websocket/config/FeignConfig.java
new file mode 100644
index 0000000..04d3974
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.websocket.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/config/GlobalYmlConfig.java b/mosty-websocket/src/main/java/com/mosty/websocket/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..707f40a
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.websocket.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/config/WebMvcConfig.java b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebMvcConfig.java
new file mode 100644
index 0000000..dccbdcb
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.websocket.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketConfig.java b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketConfig.java
new file mode 100644
index 0000000..f72b9b1
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketConfig.java
@@ -0,0 +1,18 @@
+package com.mosty.websocket.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+public class WebSocketConfig implements WebMvcConfigurer {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketServer.java b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketServer.java
new file mode 100644
index 0000000..df2b1c1
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/config/WebSocketServer.java
@@ -0,0 +1,163 @@
+package com.mosty.websocket.config;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.websocket.remote.TbBaseAdaptRemoteService;
+import lombok.SneakyThrows;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * sfz为身份证
+ */
+@ServerEndpoint("/socket/{sfz}/{uuid}")
+@Component
+public class WebSocketServer {
+
+    // 记录当前在线连接数
+    private static int onlineCount = 0;
+    // 存放每个客户端对应WebSocket对象
+    public static Map<String, WebSocketServer> webSocketMap = new ConcurrentHashMap<>();
+    // 与某个客户端的连接会话，需要通过它来给客户端发送数据
+    private Session session;
+    // 身份证号
+    private String sfz = "";
+    // 多浏览器登录的区分UUID，保证session唯一
+    private String uuid = "";
+    @Resource
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    /**
+     * 连接建立成功调用的方法
+     */
+    @OnOpen
+    public void onOpen(Session session, @PathParam("sfz") String sfz, @PathParam("uuid") String uuid) {
+        this.session = session;
+        if (!webSocketMap.containsKey(sfz)) {
+            addOnlineCount();
+        }
+        webSocketMap.put(sfz + ":" + uuid, this);
+        System.out.println("有新窗口开始监听：身份证：" + sfz + ",uuid:" + uuid + ",当前人数为" + getOnlineCount());
+        this.sfz = sfz;
+        this.uuid = uuid;
+    }
+
+    /**
+     * 连接关闭调用的方法
+     */
+    @OnClose
+    public void onClose() {
+        webSocketMap.remove(sfz + ":" + uuid);
+        subOnlineCount();
+        System.out.println("连接关闭！,当前人数为" + getOnlineCount());
+    }
+
+    /**
+     * 收到客户端消息后调用的方法
+     */
+    @OnMessage
+    public void onMessage(String message, Session session) {
+        System.out.println("收到来自窗口" + ":" + sfz + ":" + uuid + "的消息：" + message);
+    }
+
+    @OnError
+    public void onError(Session session, Throwable error) {
+        error.printStackTrace();
+    }
+
+    /**
+     * 服务器推动消息
+     */
+    @SneakyThrows
+    public void sendMessage(Map<String, Object> map) throws IOException {
+        this.session.getBasicRemote().sendText(JSON.toJSONString(map));
+    }
+
+
+    /**
+     * 根据身份证号关闭websocket
+     */
+    public static void closeConn(@PathParam("sfz") String sfz, @PathParam("uuid") String uuid) throws IOException {
+        for (Map.Entry<String, WebSocketServer> entry : webSocketMap.entrySet()) {
+            String key = entry.getKey();
+            WebSocketServer item = entry.getValue();
+            if (key.equals(sfz + ":" + uuid)) {
+                webSocketMap.remove(sfz + ":" + uuid);
+                item.onClose();
+                subOnlineCount();
+            }
+        }
+    }
+
+    public void sendBbMessage(WebSocketObject obj) throws IOException {
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", obj.getType());
+        map.put("data", obj.getObj());
+        for (Map.Entry<String, WebSocketServer> entry : webSocketMap.entrySet()) {
+            WebSocketServer webSocketServer = entry.getValue();
+            String sfz = webSocketServer.sfz;
+            LinkedHashMap bb = (LinkedHashMap) obj.getObj();
+            String ssbmdm = bb.get("ssbmdm").toString();
+            // 查询是否拥有数据权限，拥有该数据权限才推送消息
+            boolean flag = this.tbBaseAdaptRemoteService.getDataPermission(sfz, ssbmdm);
+            if (flag) {
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                System.err.println("---------发送给用户：" + sfz + "-------");
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                System.err.println("--------------------------------------");
+                webSocketServer.sendMessage(map);
+            }
+        }
+    }
+
+    // 发送消息
+    public static void sendInfo(WebSocketObject obj) throws IOException {
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", obj.getType());
+        map.put("data", obj.getObj());
+        // 如果是null,推送给所有人
+        if (CollectionUtils.isEmpty(obj.getSfzList())) {
+            for (Map.Entry<String, WebSocketServer> entry : webSocketMap.entrySet()) {
+                WebSocketServer webSocketServer = entry.getValue();
+                webSocketServer.sendMessage(map);
+            }
+        } else if (!CollectionUtils.isEmpty(obj.getSfzList())) {
+            // 身份证不为null，推送给个人
+            for (Map.Entry<String, WebSocketServer> entry : webSocketMap.entrySet()) {
+                WebSocketServer webSocketServer = entry.getValue();
+                String key = entry.getKey();
+                key = key.split(":")[1];
+                if (obj.getSfzList().contains(key)) {
+                    webSocketServer.sendMessage(map);
+                }
+            }
+        }
+    }
+
+    public static synchronized int getOnlineCount() {
+        return onlineCount;
+    }
+
+    public static synchronized void addOnlineCount() {
+        WebSocketServer.onlineCount++;
+    }
+
+    public static synchronized void subOnlineCount() {
+        WebSocketServer.onlineCount--;
+    }
+}
\ No newline at end of file
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/controller/WebSocketController.java b/mosty-websocket/src/main/java/com/mosty/websocket/controller/WebSocketController.java
new file mode 100644
index 0000000..54b1658
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/controller/WebSocketController.java
@@ -0,0 +1,35 @@
+package com.mosty.websocket.controller;
+
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.websocket.service.WebSocketService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "websocket推送线管")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/socket")
+public class WebSocketController {
+
+    private final WebSocketService webSocketService;
+
+    @ApiOperation("向用户发送消息")
+    @PostMapping(value = "sendMessage")
+    public ResponseResult<Void> sendMessage(@RequestBody WebSocketObject obj) {
+        this.webSocketService.sendInfo(obj);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("向用户发送报备数据")
+    @PostMapping(value = "sendBbMessage")
+    public ResponseResult<Void> sendBbMessage(@RequestBody WebSocketObject obj) {
+        this.webSocketService.sendBbMessage(obj);
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/remote/TbBaseAdaptRemoteService.java b/mosty-websocket/src/main/java/com/mosty/websocket/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..57464e6
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,38 @@
+package com.mosty.websocket.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 查询用户是否有该部门的数据权限
+    public boolean getDataPermission(String sfz, String deptId) {
+        ResponseResult<Boolean> responseResult = mostyBaseFeignService.getDataPermission(sfz, deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询用户是否有该部门的数据权限异常 responseResult = {},{},{}", JSON.toJSONString(responseResult),sfz,deptId);
+            throw new BusinessException("查询用户是否有该部门的数据权限");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/service/WebSocketService.java b/mosty-websocket/src/main/java/com/mosty/websocket/service/WebSocketService.java
new file mode 100644
index 0000000..b390358
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/service/WebSocketService.java
@@ -0,0 +1,12 @@
+package com.mosty.websocket.service;
+
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+
+public interface WebSocketService {
+
+    // 发送websocket消息
+    void sendInfo(WebSocketObject obj);
+
+    // 向用户发送报备数据
+    void sendBbMessage(WebSocketObject obj);
+}
diff --git a/mosty-websocket/src/main/java/com/mosty/websocket/service/impl/WebSocketServiceImpl.java b/mosty-websocket/src/main/java/com/mosty/websocket/service/impl/WebSocketServiceImpl.java
new file mode 100644
index 0000000..36cc8cc
--- /dev/null
+++ b/mosty-websocket/src/main/java/com/mosty/websocket/service/impl/WebSocketServiceImpl.java
@@ -0,0 +1,37 @@
+package com.mosty.websocket.service.impl;
+
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.websocket.config.WebSocketServer;
+import com.mosty.websocket.service.WebSocketService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+
+@Service
+public class WebSocketServiceImpl implements WebSocketService {
+
+    @Resource
+    private WebSocketServer webSocketServer;
+
+    @Override
+    public void sendInfo(WebSocketObject obj) {
+        try {
+            WebSocketServer.sendInfo(obj);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new BusinessException("消息推送失败！！");
+        }
+    }
+
+    @Override
+    public void sendBbMessage(WebSocketObject obj) {
+        try {
+            webSocketServer.sendBbMessage(obj);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new BusinessException("向用户发送报备数据！！");
+        }
+    }
+}
diff --git a/mosty-websocket/src/main/resources/application.yml b/mosty-websocket/src/main/resources/application.yml
new file mode 100644
index 0000000..5e7a8c4
--- /dev/null
+++ b/mosty-websocket/src/main/resources/application.yml
@@ -0,0 +1,63 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10
+      maximum-pool-size: 20
+      idle-timeout: 500000
+      max-lifetime: 540000
+      connection-timeout: 60000
+      connection-test-query: SELECT 1
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8009
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
diff --git a/mosty-websocket/src/main/resources/bootstrap.yml b/mosty-websocket/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..240cd04
--- /dev/null
+++ b/mosty-websocket/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+server:
+  port: 8026
+  servlet:
+    context-path: /mosty-websocket/
+spring:
+  application:
+    name: mosty-websocket
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
diff --git a/mosty-websocket/src/main/resources/logback-spring.xml b/mosty-websocket/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7d6da2f
--- /dev/null
+++ b/mosty-websocket/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOG_FILE_INFO" />
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-wzzx/mosty-wzzx.iml b/mosty-wzzx/mosty-wzzx.iml
new file mode 100644
index 0000000..abe84ad
--- /dev/null
+++ b/mosty-wzzx/mosty-wzzx.iml
@@ -0,0 +1,281 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353926" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-ip:5.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-core:5.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-mongodb:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver:3.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:bson:3.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:3.0.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-wzzx/pom.xml b/mosty-wzzx/pom.xml
new file mode 100644
index 0000000..43285b1
--- /dev/null
+++ b/mosty-wzzx/pom.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-wzzx</artifactId>
+    <description>位置中心</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-ip</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+            <version>2.2.5.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.2.5.RELEASE</version>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/MostyWzzxApplication.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/MostyWzzxApplication.java
new file mode 100644
index 0000000..e4f1e4d
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/MostyWzzxApplication.java
@@ -0,0 +1,31 @@
+package com.mosty.wzzx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	位置中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.wzzx.mapper")
+@EnableDiscoveryClient
+@EnableScheduling
+@SpringBootApplication(exclude = MongoAutoConfiguration.class)
+public class MostyWzzxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyWzzxApplication.class, args);
+	}
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/FeignConfig.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/FeignConfig.java
new file mode 100644
index 0000000..2129a59
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/FeignConfig.java
@@ -0,0 +1,24 @@
+package com.mosty.wzzx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/GlobalYmlConfig.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..04d7712
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.wzzx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/Listener/ApplicationEventListener.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/Listener/ApplicationEventListener.java
new file mode 100644
index 0000000..9962861
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/Listener/ApplicationEventListener.java
@@ -0,0 +1,60 @@
+package com.mosty.wzzx.config.Listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.index.IndexOperations;
+import org.springframework.data.mongodb.core.index.IndexResolver;
+import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Component
+public class ApplicationEventListener implements ApplicationListener {
+
+    @Resource(name = "mostyMongoTemplate")
+    protected MongoTemplate adminMongoTemplate;
+
+    @Override
+    public void onApplicationEvent(ApplicationEvent event) {
+        if(event instanceof ContextClosedEvent) {
+            //监听应用关闭
+        }
+    }
+
+    @EventListener(ContextRefreshedEvent.class)
+    public void initIndicesAfterStartup() {
+        createIndex(adminMongoTemplate);
+    }
+
+    private void createIndex(MongoTemplate template) {
+        MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext = template
+                .getConverter().getMappingContext();
+
+        IndexResolver resolver = new MongoPersistentEntityIndexResolver(mappingContext);
+        // consider only entities that are annotated with @Document
+        mappingContext.getPersistentEntities()
+                .stream()
+                .filter(it -> it.isAnnotationPresent(Document.class))
+                .forEach(it -> {
+                    try {
+                        IndexOperations indexOps = template.indexOps(it.getType());
+                        resolver.resolveIndexFor(it.getType()).forEach(indexOps::ensureIndex);
+                    }catch (Exception e){
+                        log.error("创建索引Ex:{}", e.getMessage());
+                    }
+                });
+    }
+
+
+}
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/WebMvcConfig.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/WebMvcConfig.java
new file mode 100644
index 0000000..af842cc
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.wzzx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AbstractMongoConfigure.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AbstractMongoConfigure.java
new file mode 100644
index 0000000..de81d7f
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AbstractMongoConfigure.java
@@ -0,0 +1,17 @@
+package com.mosty.wzzx.config.mongo;
+
+import lombok.Data;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+
+@Data
+public abstract class AbstractMongoConfigure {
+    private String uri;
+
+    public MongoDatabaseFactory mongoDbFactory() {
+        return new SimpleMongoClientDatabaseFactory(uri);
+    }
+
+    abstract public MongoTemplate getMongoTemplate() throws Exception;
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AdminMongoConfigure.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AdminMongoConfigure.java
new file mode 100644
index 0000000..98d40c5
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/config/mongo/AdminMongoConfigure.java
@@ -0,0 +1,19 @@
+package com.mosty.wzzx.config.mongo;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+
+@Configuration
+@EnableMongoRepositories(basePackages = {"com.mosty.wzzx.mongodb"}, mongoTemplateRef = "mostyMongoTemplate")
+@ConfigurationProperties(prefix = "spring.data.mongodb")
+public class AdminMongoConfigure extends AbstractMongoConfigure {
+
+    @Bean(name = "mostyMongoTemplate")
+    @Override
+    public MongoTemplate getMongoTemplate() throws Exception {
+        return new MongoTemplate(mongoDbFactory());
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/LocationInfoController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/LocationInfoController.java
new file mode 100644
index 0000000..4e1746c
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/LocationInfoController.java
@@ -0,0 +1,133 @@
+package com.mosty.wzzx.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Maps;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.utils.CoordinateTransform;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.wzzx.service.LocationInfoService;
+import com.mosty.wzzx.service.impl.TbWzSswzServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author ydb
+ * 位置信息实体Controller
+ * @since 2022年4月21日
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/gxga/locationInfo")
+@Api(tags = "位置信息实体", value = "位置信息实体")
+public class LocationInfoController extends BaseController {
+
+    private static final Logger logger = LoggerFactory.getLogger(LocationInfoController.class);
+
+    private final TbWzSswzServiceImpl tbWzSswzService;
+    private final LocationInfoService locationInfoService;
+
+    @PostMapping("/now")
+    @ApiOperation(value = "根据条件获取当前最新一条位置信息", notes = "位置信息实体")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "String"),
+            @ApiImplicitParam(name = "accessNumber", value = "接入编号", dataType = "String")
+    })
+    public ResponseResult<TbWzSswz> getNowLoaction(String userId, String accessNumber) {
+        Map<String, Object> requestMap = Maps.newHashMap();
+        if (!StrUtil.isBlank(userId)) {
+            requestMap.put("USER_ID", userId);
+        }
+        if (!StrUtil.isBlank(accessNumber)) {
+            requestMap.put("ACCESS_NUMBER", accessNumber);
+        }
+        if (requestMap.isEmpty()) {
+            return ResponseResult.fail("请确保至少传入一个查询参数");
+        }
+        return ResponseResult.success(tbWzSswzService.querySswzNow(userId, accessNumber));
+    }
+
+    /**
+     * 获取位置信息实体详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiImplicitParam(name = "id", value = "参数键名", dataTypeClass = String.class, required = true, paramType = "path")
+    @ApiOperation(value = "位置信息实体-详细信息", notes = "位置信息实体")
+    public ResponseResult<TbWzSswz> queryById(@PathVariable("id") String id) {
+        TbWzSswz sswz = this.tbWzSswzService.queryById(id);
+        return ResponseResult.success(sswz);
+    }
+
+    /**
+     * 新增位置信息实体
+     */
+    @PostMapping(value = "add")
+    @ApiOperation(value = "新增位置信息实体", notes = "位置信息实体")
+    public ResponseResult<LocationInfo> add(@Validated @RequestBody LocationInfo locationInfo, BindingResult result) {
+        System.out.println(DateUtils.getQueryDateString(new Date(), "02") + "收到位置服务上报 ：{" + JSONObject.toJSONString(locationInfo) + "}");
+        if (result.hasErrors() && result.getFieldError() != null) {
+            return ResponseResult.fail(result.getFieldError().getDefaultMessage());
+        }
+        if (locationInfo.getLat() == 0 || locationInfo.getLng() == 0) {// 后台验证
+            return ResponseResult.fail("报送错误! 定位坐标信息不能为空!");
+        }
+        if (StringUtils.isBlank(locationInfo.getUserId())) {
+            return ResponseResult.fail("用户ID不存在，该位置不上报！");
+        }
+        locationInfo.setSourceName("移动设备");
+        locationInfo.setSourceCode("02");
+//        Long startTime = System.currentTimeMillis();
+        //  入库之前将坐标进行转换
+        locationInfo.setSourceLat(locationInfo.getLat());
+        locationInfo.setSourceLng(locationInfo.getLng());
+        double[] transfromPonint = CoordinateTransform.transformGCJ02ToWGS84(locationInfo.getLng(),
+                locationInfo.getLat());
+        // 只保留8位小数
+        BigDecimal reLngBd = BigDecimal.valueOf(transfromPonint[0]);
+        double reLngDouble = reLngBd.setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
+        locationInfo.setLng(reLngDouble);
+        // 只保留8位小数
+        BigDecimal reLatBd = BigDecimal.valueOf(transfromPonint[1]);
+        double reLatDouble = reLatBd.setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
+        locationInfo.setLat(reLatDouble);
+        //上传坐标转行
+        if (locationInfo.getLastLng() != null && locationInfo.getLastLat() != null) {
+            double[] lastTransfromPonint = CoordinateTransform.transformGCJ02ToWGS84(locationInfo.getLastLng(),
+                    locationInfo.getLastLat());
+            // 只保留8位小数
+            BigDecimal lastReLngBd = BigDecimal.valueOf(lastTransfromPonint[0]);
+            double lastReLngDouble = lastReLngBd.setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
+            locationInfo.setLastLng(lastReLngDouble);
+            // 只保留8位小数
+            BigDecimal lastReLatBd = BigDecimal.valueOf(lastTransfromPonint[1]);
+            double lastReLatDouble = lastReLatBd.setScale(8, BigDecimal.ROUND_HALF_UP).doubleValue();
+            locationInfo.setLastLat(lastReLatDouble);
+        }
+        if (locationInfo.getTime() == null) {
+            locationInfo.setTime(new Date());
+        }
+        //实时存储位置
+        locationInfoService.locationReceive(locationInfo);
+        Long endTime = System.currentTimeMillis();
+//        System.out.println("位置服务上报保存时长 ：{" + (endTime - startTime) + "}---用户{"+locationInfo.getUserId()+"}");
+        locationInfo.setLastLat(locationInfo.getLat());
+        locationInfo.setLastLng(locationInfo.getLng());
+        return ResponseResult.success("添加成功", locationInfo);
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzRywzController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzRywzController.java
new file mode 100644
index 0000000..11e5281
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzRywzController.java
@@ -0,0 +1,120 @@
+package com.mosty.wzzx.controller;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.wzzx.SswzQuery;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.query.wzzx.TbWzRywzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSswzSearchDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.TbWzSswzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 位置-人员位置
+ *
+ * @author
+ * @since 2022-07-14 15:37:38
+ */
+@AllArgsConstructor
+@RestController
+@Api(tags = "人员位置相关接口")
+@RequestMapping("/gxga/rywz")
+public class TbWzRywzController {
+
+    private final RedisTemplate redisTemplate;
+    private final RedisService redisService;
+    private final TbWzSswzService tbWzSswzService;
+
+    @GetMapping("/list")
+    @ApiOperation(value = "人员位置redis数据列表")
+    @Log(title = "人员位置redis数据列表", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<TbWzRywz>> getList(SswzQuery dto) {
+        List<TbWzRywz> list = new ArrayList<>();
+        String key = Constant.WZ_RYWZ + "*";
+        Set<String> sets = redisTemplate.keys(key);
+        if (!CollectionUtils.isEmpty(sets)) {
+            list = redisTemplate.opsForValue().multiGet(sets);
+            // 权限
+            UserInfo user = UserInfoManager.get();
+            String ids = "";
+            if (user != null && user.getUserPermissionsInfo() != null) {
+                ids = user.getUserPermissionsInfo().getIds();
+            }
+            if (!CollectionUtils.isEmpty(list)) {
+                if (!StringUtils.isEmpty(ids)) {
+                    String finalIds = ids;
+                    list = list.stream().filter(item -> finalIds.contains(item.getSsbmid())).collect(Collectors.toList());
+                }
+                // 关键字筛选
+                if (!StringUtils.isEmpty(dto.getKeyword())) {
+                    list = list.stream().filter(item ->
+                            (!StringUtils.isEmpty(item.getYhXm()) && item.getYhXm().contains(dto.getKeyword())) ||
+                            (!StringUtils.isEmpty(item.getYhSfzh()) && item.getYhSfzh().contains(dto.getKeyword())) ||
+                            (!StringUtils.isEmpty(item.getSsbm()) && item.getSsbm().contains(dto.getKeyword())) ||
+                            (!StringUtils.isEmpty(item.getYhId()) && item.getYhId().contains(dto.getKeyword()))
+                    ).collect(Collectors.toList());
+                }
+                // 排序
+                list.sort((a, a1) -> (int) (a1.getXtCjsj().getTime() - a.getXtCjsj().getTime()));
+                list.forEach(item -> item.setZb(null));
+            }
+        }
+        return ResponseResult.success(list);
+    }
+
+    @GetMapping("/getRygj")
+    @ApiOperation(value = "获取redis中的人员的轨迹信息")
+    public ResponseResult<TbWzRywz> getXfgj(String sfzh) {
+        if (StringUtils.isEmpty(sfzh)) return null;
+        String redisKey = Constant.WZ_RYWZ + sfzh + "-"
+                + DateUtils.getQueryDateString(new Date(), "01");
+        TbWzRywz rywz = redisService.getCacheObject(redisKey);
+        return ResponseResult.success(rywz);
+    }
+
+    @GetMapping("/getRygjList")
+    @ApiOperation(value = "获取时间段类的人员轨迹信息俩表")
+    public ResponseResult<IPage<TbWzSswz>> getRygjList(TbWzSswzSearchDto dto) {
+        return ResponseResult.success(this.tbWzSswzService.getRygjList(dto));
+    }
+
+    @GetMapping("/getRywz")
+    @ApiOperation(value = "查询某一天的人员位置信息")
+    public ResponseResult<TbWzRywz> getRywz(TbWzRywzSearchDto dto) {
+        return ResponseResult.success(this.tbWzSswzService.getRywz(dto));
+    }
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzSbsswzController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzSbsswzController.java
new file mode 100644
index 0000000..03c012f
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzSbsswzController.java
@@ -0,0 +1,92 @@
+package com.mosty.wzzx.controller;
+
+import com.mosty.base.model.dto.wzzx.SswzQuery;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.utils.Constant;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.wzzx.service.TbWzSblswzService;
+import com.mosty.wzzx.service.TbWzSbsswzService;
+import com.mosty.wzzx.udp.UdpLzEntity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 位置-巡防报备控制层
+ *
+ * @author
+ * @since 2022-07-14 15:37:38
+ */
+@RestController
+@Api(tags = "设备实时位置相关接口")
+@RequestMapping("/gxga/sbsswz")
+public class TbWzSbsswzController {
+
+    @Resource
+    private RedisTemplate redisTemplate;
+    @Resource
+    private TbWzSbsswzService tbWzSbsswzService;
+    @Resource
+    private TbWzSblswzService tbWzSblswzService;
+
+    @PostMapping("/locationHandleLz")
+    @ApiOperation(value = "测试udp数据")
+    @JwtSysUser
+    public ResponseResult<Void> locationHandleLz(@RequestBody UdpLzEntity dto) {
+        TbWzSbsswz sswz = this.tbWzSbsswzService.saveSbsswz(dto);
+        this.tbWzSblswzService.saveSblswz(sswz);
+        return ResponseResult.success();
+    }
+
+
+    @GetMapping("/list")
+    @ApiOperation(value = "获取设备实时redis数据列表")
+    @Log(title = "获取设备实时redis数据列表", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult<List<TbWzSbsswz>> getList(SswzQuery dto) {
+        List<TbWzSbsswz> list = new ArrayList<>();
+        String key = Constant.WZ_SBWZ + "*";
+        Set<String> sets = redisTemplate.keys(key);
+        if (!CollectionUtils.isEmpty(sets)) {
+            list = redisTemplate.opsForValue().multiGet(sets);
+            if (!CollectionUtils.isEmpty(list)) {
+                // 关键字筛选
+                if (!StringUtils.isEmpty(dto.getKeyword())) {
+                    list = list.stream().filter(item ->
+                            (!StringUtils.isEmpty(item.getYhXm()) && item.getYhXm().contains(dto.getKeyword())) ||
+                                    (!StringUtils.isEmpty(item.getYhSfzh()) && item.getYhSfzh().contains(dto.getKeyword())) ||
+                                    (!StringUtils.isEmpty(item.getSsbm()) && item.getSsbm().contains(dto.getKeyword())) ||
+                                    (!StringUtils.isEmpty(item.getSbmc()) && item.getSbmc().contains(dto.getKeyword())) ||
+                                    (!StringUtils.isEmpty(item.getSbid()) && item.getSbid().contains(dto.getKeyword())) ||
+                                    (!StringUtils.isEmpty(item.getYhId()) && item.getYhId().contains(dto.getKeyword()))
+                    ).collect(Collectors.toList());
+                }
+                // 排序
+                list.sort((a, a1) -> (int) (a1.getXtCjsj().getTime() - a.getXtCjsj().getTime()));
+                list.forEach(item -> item.setZb(null));
+            }
+        }
+        return ResponseResult.success(list);
+    }
+
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfbbController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfbbController.java
new file mode 100644
index 0000000..09f6537
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfbbController.java
@@ -0,0 +1,76 @@
+package com.mosty.wzzx.controller;
+
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.utils.Constant;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.redis.service.RedisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 位置-巡防报备控制层
+ *
+ * @author
+ * @since 2022-07-14 15:37:38
+ */
+@AllArgsConstructor
+@RestController
+@Api(tags = "巡防位置相关接口")
+@RequestMapping("/gxga/xfbb")
+public class TbWzXfbbController {
+
+    private final RedisService redisService;
+    private final RedisTemplate redisTemplate;
+
+    @GetMapping("/remove")
+    @ApiImplicitParam(name = "bbid", value = "报备ID", dataTypeClass = String.class, required = true, paramType = "path")
+    @ApiOperation(value = "清除redis数据")
+    public ResponseResult<Boolean> locationReceive(String bbid) {
+        String redisKey = Constant.WZ_XFWZ + bbid;
+        redisService.deleteObject(redisKey);
+        return ResponseResult.success(true);
+    }
+
+    @GetMapping("/list")
+    @ApiOperation(value = "获取报备redis数据")
+    public ResponseResult<List<TbWzXfwz>> locationReceive() {
+        List<TbWzXfwz> array = new ArrayList<>();
+        String key = Constant.WZ_XFWZ + "*";
+        Set<String> sets = redisTemplate.keys(key);
+        if (!CollectionUtils.isEmpty(sets)) {
+            List<TbWzXfwz> list = redisTemplate.opsForValue().multiGet(sets);
+            if (!CollectionUtils.isEmpty(list)) {
+                list.forEach(item -> {
+                    item.setZb(null);
+                    array.add(item);
+                });
+            }
+        }
+        return ResponseResult.success(array);
+    }
+
+    @GetMapping("/getXfgj")
+    @ApiOperation(value = "获取redis中的巡组的巡防轨迹信息")
+    public ResponseResult<TbWzXfwz> getXfgj(String bbid) {
+        if (StringUtils.isEmpty(bbid)) return null;
+        String key = Constant.WZ_XFWZ + bbid;
+        TbWzXfwz xfwz = redisService.getCacheObject(key);
+        return ResponseResult.success(xfwz);
+    }
+
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfwzController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfwzController.java
new file mode 100644
index 0000000..aca0769
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/TbWzXfwzController.java
@@ -0,0 +1,106 @@
+package com.mosty.wzzx.controller;
+
+import com.mosty.base.model.query.wzzx.TbWzLswzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSbLswzSearchDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.dto.wzzx.AppLocationReceiveDto;
+import com.mosty.wzzx.service.TbWzXfwzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+import javax.annotation.Resource;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "巡防位置相关接口")
+@RequestMapping("/tbWzXfwz")
+public class TbWzXfwzController {
+
+    private final TbWzXfwzService tbWzXfwzService;
+
+    @GetMapping
+    @ApiOperation(value = "查询所有数据")
+    @JwtSysUser
+    public ResponseEntity<List> queryAll() {
+        return ResponseEntity.ok(this.tbWzXfwzService.queryAll());
+    }
+    
+    @GetMapping("{id}")
+    @ApiOperation(value = "通过主键查询单条数据")
+    @JwtSysUser
+    public ResponseEntity<TbWzXfwz> queryById(@PathVariable("id") String id) {
+        return ResponseEntity.ok(this.tbWzXfwzService.queryById(id));
+    }
+
+    @PostMapping
+    @ApiOperation(value = "新增数据")
+    @JwtSysUser
+    public ResponseEntity<TbWzXfwz> add(TbWzXfwz tbWzXfwz) {
+        return ResponseEntity.ok(this.tbWzXfwzService.insert(tbWzXfwz));
+    }
+
+    @PutMapping
+    @ApiOperation(value = "编辑数据")
+    @JwtSysUser
+    public ResponseEntity<TbWzXfwz> edit(TbWzXfwz tbWzXfwz) {
+        return ResponseEntity.ok(this.tbWzXfwzService.update(tbWzXfwz));
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除数据")
+    @JwtSysUser
+    public ResponseEntity<Boolean> deleteById(String id) {
+        return ResponseEntity.ok(this.tbWzXfwzService.deleteById(id));
+    }
+
+    @PostMapping("/selectTrack")
+    @ApiOperation(value = "大屏-地图-轨迹回放")
+    @Log(title = "大屏-地图-轨迹回放", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult selectTrack(@RequestBody TbWzXfwz tbWzXfwz) {
+        return ResponseResult.success(tbWzXfwzService.selectTrack(tbWzXfwz));
+    }
+
+    @PostMapping("/selectLswz")
+    @ApiOperation(value = "历史位置轨迹回放")
+    @Log(title = "历史位置轨迹回放", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult selectLswz(@RequestBody TbWzLswzSearchDto dto) {
+        return ResponseResult.success(tbWzXfwzService.selectLswz(dto));
+    }
+
+    @PostMapping("/locationReceive")
+    @ApiOperation(value = "接收app端位置数据")
+    @Log(title = "接收app端位置数据", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult locationReceive(@RequestBody AppLocationReceiveDto receiveDto) {
+        return ResponseResult.success(this.tbWzXfwzService.locationReceive(receiveDto));
+    }
+
+    @PostMapping("/selectSbLswz")
+    @ApiOperation(value = "设备历史位置轨迹回放")
+    @Log(title = "设备历史位置轨迹回放", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult selectSbLswz(@RequestBody TbWzSbLswzSearchDto dto) {
+        return ResponseResult.success(tbWzXfwzService.selectSbLswz(dto));
+    }
+
+    @PostMapping("/selectSbLswzMo")
+    @ApiOperation(value = "设备历史位置轨迹回放mo")
+    @Log(title = "设备历史位置轨迹回放", businessType = BusinessType.OTHER)
+    @JwtSysUser
+    public ResponseResult selectSbLswzMo(@RequestBody TbWzSbLswzSearchDto dto) {
+        return ResponseResult.success(tbWzXfwzService.selectSbLswzMo(dto));
+    }
+
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WzcxController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WzcxController.java
new file mode 100644
index 0000000..72dd31d
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WzcxController.java
@@ -0,0 +1,57 @@
+package com.mosty.wzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.wzzx.WzcxQuery;
+import com.mosty.base.model.dto.wzzx.WztjQuery;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.wzzx.service.WztjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "位置查询--原magic接口")
+@RequestMapping("/wzcx")
+public class WzcxController extends BaseController {
+
+    private final WztjService wztjService;
+
+    @GetMapping("/bbgjcx")
+    @ApiOperation(value = "报备轨迹查询")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> bbgjcx(WzcxQuery dto) {
+        return ResponseResult.success(this.wztjService.bbgjcx(dto));
+    }
+
+    @GetMapping("/bbwzcx")
+    @ApiOperation(value = "报备位置查询")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> bbwzcx(WzcxQuery dto) {
+        return ResponseResult.success(this.wztjService.bbwzcx(dto));
+    }
+
+    @GetMapping("/mjgjcx")
+    @ApiOperation(value = "民警轨迹查询")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> mjgjcx(WzcxQuery dto) {
+        return ResponseResult.success(this.wztjService.mjgjcx(dto));
+    }
+
+    @GetMapping("/wbbwz")
+    @ApiOperation(value = "未报备位置查询")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> wbbwz(WzcxQuery dto) {
+        return ResponseResult.success(this.wztjService.wbbwz(dto));
+    }
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WztjController.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WztjController.java
new file mode 100644
index 0000000..19a3301
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/controller/WztjController.java
@@ -0,0 +1,114 @@
+package com.mosty.wzzx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.wzzx.WztjQuery;
+import com.mosty.base.model.entity.wzzx.TbWzSblswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.wzzx.service.WztjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@AllArgsConstructor
+@RestController
+@Api(tags = "位置统计--原magic接口")
+@RequestMapping("/wztj")
+public class WztjController extends BaseController {
+
+    private final WztjService wztjService;
+
+    @GetMapping("/dt/rywz")
+    @ApiOperation(value = "人员位置")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> rywz(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.rywz(dto));
+    }
+
+    @GetMapping("/dt/xz")
+    @ApiOperation(value = "巡组位置")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> xz(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.xz(dto));
+    }
+
+    @GetMapping("/tj/jrlcs")
+    @ApiOperation(value = "里程数")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrlcs(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.jrlcs(dto));
+    }
+
+    @GetMapping("/tj/rslcxz")
+    @ApiOperation(value = "人数里程巡组整合")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> rslcxz(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.rslcxz(dto));
+    }
+
+    @GetMapping("/tj/jrwzrs")
+    @ApiOperation(value = "位置人数")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrwzrs(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.jrwzrs(dto));
+    }
+
+    @GetMapping("/tj/jrxzwzs")
+    @ApiOperation(value = "巡组位置数")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> jrxzwzs(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.jrxzwzs(dto));
+    }
+
+    @GetMapping("/wz/rywzlb")
+    @ApiOperation(value = "人员位置列表")
+    @JwtSysUser
+    public ResponseResult<IPage<Map<String, Object>>> rywzlb(WztjQuery dto) {
+        return ResponseResult.success(this.wztjService.rywzlb(dto));
+    }
+
+    @GetMapping("/tj/xfsltj")
+    @ApiOperation(value = "巡组数量统计")
+    @JwtSysUser
+    @ApiImplicitParams({
+       @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天", required = true, dataType = "String"),
+    })
+    public ResponseResult<Map<String, Object>> xfsltj(String type) {
+        return ResponseResult.success(this.wztjService.xfsltj(type));
+    }
+
+    @GetMapping("/tj/rysltj")
+    @ApiOperation(value = "人员数量统计")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天", required = true, dataType = "String"),
+    })
+    public ResponseResult<Map<String, Object>> rysltj(String type) {
+        return ResponseResult.success(this.wztjService.rysltj(type));
+    }
+
+    @GetMapping("/tj/sblswz")
+    @ApiOperation(value = "设备数量统计")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天", required = true, dataType = "String"),
+    })
+    public ResponseResult<Map<String, Object>> sblswz(String type) {
+        return ResponseResult.success(this.wztjService.sblswz(type));
+    }
+
+
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwXfbbMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwXfbbMapper.java
new file mode 100644
index 0000000..f235a2a
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwXfbbMapper.java
@@ -0,0 +1,28 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.wzzx.XfbbUpdateDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+/**
+ * <p>
+ * 巡防报备表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwXfbbMapper extends BaseMapper<TbQwXfbb> {
+
+    @ApiOperation("id查询")
+    TbQwXfbb queryById(@Param("id") String id);
+
+    @ApiOperation("修改巡防报备")
+    Integer updateXfbb(XfbbUpdateDto xfbbUpdateDto);
+
+    @ApiOperation("查询是否报备")
+    int getsfbb(String id);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwZnzbMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwZnzbMapper.java
new file mode 100644
index 0000000..44d18c6
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbQwZnzbMapper.java
@@ -0,0 +1,29 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 巡防排班或报备或值班-通讯装备表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbQwZnzbMapper extends BaseMapper<TbQwZnzb> {
+
+    /**
+     * 根据 业务ID查询
+     *
+     * @param ywidList
+     * @return
+     */
+    List<TbQwZnzb> queryListByYwid(@Param("list") List<String> ywidList);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbSjCyjlMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbSjCyjlMapper.java
new file mode 100644
index 0000000..8d059d9
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbSjCyjlMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.wzzx.SjCyjlUpdateDto;
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 事件参与警力 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-06-27
+ */
+@Mapper
+public interface TbSjCyjlMapper extends BaseMapper<TbSjCyjl> {
+
+    @ApiOperation("id查询")
+    TbSjCyjl queryBySfzh(@Param("sfzh") String sfzh);
+
+    @ApiOperation("修改参与警力坐标")
+    Integer updateZb(SjCyjlUpdateDto sjCyjlUpdateDto);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzLswzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzLswzMapper.java
new file mode 100644
index 0000000..276b5d1
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzLswzMapper.java
@@ -0,0 +1,22 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 位置-历史位置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Mapper
+public interface TbWzLswzMapper extends BaseMapper<TbWzLswz> {
+
+    @ApiOperation("历史位置")
+    int insertEntity(TbWzLswz tbWzLswz);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzRywzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzRywzMapper.java
new file mode 100644
index 0000000..a4bb6f8
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzRywzMapper.java
@@ -0,0 +1,38 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.query.wzzx.TbWzRywzSearchDto;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 位置-人员位置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Mapper
+public interface TbWzRywzMapper extends BaseMapper<TbWzRywz> {
+
+    @ApiOperation("添加人员位置信息")
+    int insertEntity(TbWzRywz tbWzRywz);
+
+    @ApiOperation("修改盘查车辆对象")
+    void updateEntity(TbWzRywz tbWzRywz);
+
+    TbWzRywz queryBySfzh(@Param("yhSfzh") String yhSfzh);
+
+    @ApiOperation("查询人员位置信息")
+    TbWzRywz selectBySfz(TbWzRywzSearchDto dto);
+
+    @ApiOperation("去重人员数量统计")
+    int getRysltjCount(@Param("kssj") String kssj,
+                       @Param("jssj") String jssj,
+                       @Param("useSql") String useSql);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSblswzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSblswzMapper.java
new file mode 100644
index 0000000..2b4f022
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSblswzMapper.java
@@ -0,0 +1,36 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzSblswz;
+import com.mosty.base.model.query.wzzx.TbWzSbLswzSearchDto;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 位置-设备历史位置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Mapper
+public interface TbWzSblswzMapper extends BaseMapper<TbWzSblswz> {
+
+    @ApiOperation("设备历史位置")
+    int insertEntity(TbWzSblswz tbWzSblswz);
+
+    @ApiOperation("去重设备数量统计")
+   int getSblswzCount(@Param("kssj") String kssj,
+                                       @Param("jssj") String jssj,
+                                       @Param("useSql") String useSql);
+
+    @ApiOperation("设备历史位置")
+    List<TbWzSblswz> selectSbLswz(TbWzSbLswzSearchDto dto);
+
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSbsswzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSbsswzMapper.java
new file mode 100644
index 0000000..d0ec722
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSbsswzMapper.java
@@ -0,0 +1,25 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 位置-设备实时位置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Mapper
+public interface TbWzSbsswzMapper extends BaseMapper<TbWzSbsswz> {
+
+    @ApiOperation("设备实时位置")
+    Integer insertEntity(TbWzSbsswz tbWzSbsswz);
+
+    @ApiOperation("删除7日前的设备实时位置")
+    Integer delHistory();
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSswzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSswzMapper.java
new file mode 100644
index 0000000..e8fa10a
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzSswzMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 位置-实时位置表（只存7天数据） Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Mapper
+public interface TbWzSswzMapper extends BaseMapper<TbWzSswz> {
+
+    @ApiOperation("添加实时位置表")
+    int insertEntity(TbWzSswz tbWzSswz);
+
+    @ApiOperation("根据ID查询实时位置")
+    TbWzSswz queryById(@Param("id") String id);
+
+    @ApiOperation("查询用户最新的位置")
+    TbWzSswz querySswzNow(@Param("yhId") String yhId, @Param("jrbh") String jrbh);
+
+    @ApiOperation("查询当日的实时位置")
+    List<TbWzSswz> querySswzToday(@Param("yhId") String yhId, @Param("jrbh") String jrbh);
+
+    @ApiOperation("查询当日的用户ID")
+    List<String> querySswzYhid();
+
+    @ApiOperation("删除7日前的实时位置")
+    Integer delHistory();
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzXfwzMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzXfwzMapper.java
new file mode 100644
index 0000000..6ef222c
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/TbWzXfwzMapper.java
@@ -0,0 +1,48 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 位置-巡防位置表(TbWzXfwz)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-14 15:37:38
+ */
+@Mapper
+public interface TbWzXfwzMapper extends BaseMapper<TbWzXfwz> {
+
+    @ApiOperation("查询所有数据")
+    List<TbWzXfwz> queryAll();
+
+    @ApiOperation("通过ID查询单条数据")
+    TbWzXfwz queryById(String id);
+
+    @ApiOperation("统计总行数")
+    long count(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("新增数据")
+    int insert(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("批量新增数据（MyBatis原生foreach方法）")
+    int insertBatch(@Param("entities") List<TbWzXfwz> entities);
+
+    @ApiOperation("批量新增或按主键更新数据（MyBatis原生foreach方法）")
+    int insertOrUpdateBatch(@Param("entities") List<TbWzXfwz> entities);
+
+    @ApiOperation("修改数据")
+    int update(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("通过主键删除数据")
+    int deleteById(String id);
+
+    @ApiOperation("查询所有数据")
+    TbWzXfwz queryByBbid(@Param("bbid") String bbid);
+}
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WztjMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WztjMapper.java
new file mode 100644
index 0000000..e3b9d78
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WztjMapper.java
@@ -0,0 +1,49 @@
+package com.mosty.wzzx.mapper;
+
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface WztjMapper {
+
+    @ApiOperation("人员位置")
+    List<Map<String, Object>> jwzbmlbtj(Map<String, Object> map);
+
+    @ApiOperation("巡组位置")
+    List<Map<String, Object>> xz(Map<String, Object> map);
+
+    @ApiOperation("里程数")
+    List<Map<String, Object>> jrlcs(Map<String, Object> map);
+
+    @ApiOperation("人数里程巡组整合")
+    List<Map<String, Object>> rslcxz(Map<String, Object> map);
+
+    @ApiOperation("位置人数")
+    List<Map<String, Object>> jrwzrs(Map<String, Object> map);
+
+    @ApiOperation("巡组位置数")
+    List<Map<String, Object>> jrxzwzs(Map<String, Object> map);
+
+    @ApiOperation("人员位置数量")
+    int rywzlbCount(Map<String, Object> map);
+
+    @ApiOperation("人员位置列表")
+    List<Map<String, Object>> rywzlb(Map<String, Object> map);
+
+    @ApiOperation("报备轨迹查询")
+    List<Map<String, Object>> bbgjcx(Map<String, Object> map);
+
+    @ApiOperation("报备位置查询")
+    List<Map<String, Object>> bbwzcx(Map<String, Object> map);
+
+    @ApiOperation("民警轨迹查询")
+    List<Map<String, Object>> mjgjcx(Map<String, Object> map);
+
+    @ApiOperation("未报备位置查询")
+    List<Map<String, Object>> wbbwz(Map<String, Object> map);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WzzxUserMapper.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WzzxUserMapper.java
new file mode 100644
index 0000000..e8143bc
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mapper/WzzxUserMapper.java
@@ -0,0 +1,26 @@
+package com.mosty.wzzx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.common.core.business.entity.SysUser;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ *  用户服务dao层
+ * @author kevin
+ * @date 2022/2/12 10:10 PM
+ * @since 1.0.0
+ */
+@Mapper
+public interface WzzxUserMapper extends BaseMapper<SysUser> {
+
+    @ApiOperation("分页查询用户信息")
+    List<SysUser> selectByPage();
+
+}
+
+
+
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/TbWzSblswzMongoService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/TbWzSblswzMongoService.java
new file mode 100644
index 0000000..6a8816b
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/TbWzSblswzMongoService.java
@@ -0,0 +1,10 @@
+package com.mosty.wzzx.mongodb;
+
+import com.mosty.base.utils.mongo.core.sdk.EasyMongoService;
+import com.mosty.wzzx.mongodb.entity.TbWzSblswzMo;
+
+
+public interface TbWzSblswzMongoService extends EasyMongoService<String, TbWzSblswzMo> {
+
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/entity/TbWzSblswzMo.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/entity/TbWzSblswzMo.java
new file mode 100644
index 0000000..b295b6a
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/entity/TbWzSblswzMo.java
@@ -0,0 +1,261 @@
+package com.mosty.wzzx.mongodb.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mosty.base.model.BaseEntity;
+import com.vividsolutions.jts.geom.Point;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * <p>
+ * 位置-历史位置表
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@Document(collection = "tb_wz_sblswz")
+@ApiModel(value = "TbWzLswz对象", description = "位置-历史位置表")
+public class TbWzSblswzMo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一标识ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @Id
+    private String id;
+
+    @ApiModelProperty(value = "数据来源名称")
+    private String sjly;
+
+    @ApiModelProperty(value = "--D_BZ_WZSJLY(位置数据来源)数据来源（01 udp推送 02 移动设备）")
+    private String sjlydm;
+
+    @Indexed
+    @ApiModelProperty(value = "关联业务ID（预留）")
+    private String ywid;
+
+    @Indexed
+    @ApiModelProperty(value = "设备ID")
+    private String sbid;
+
+    @Indexed
+    @ApiModelProperty(value = "设备名称")
+    private String sbmc;
+
+    @Indexed
+    @Field("yh_id")
+    @ApiModelProperty(value = "用户ID")
+    private String yhId;
+
+    @Indexed
+    @Field("yh_xm")
+    @ApiModelProperty(value = "用户姓名")
+    private String yhXm;
+
+    @Indexed
+    @Field("yh_sfzh")
+    @ApiModelProperty(value = "用户身份证")
+    private String yhSfzh;
+
+    @Indexed
+    @Field("jz_id")
+    @ApiModelProperty(value = "警组ID")
+    private String jzId;
+
+    @Indexed
+    @Field("jz_mc")
+    @ApiModelProperty(value = "警组名称")
+    private String jzMc;
+
+    @ApiModelProperty(value = "定位日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date dwrq;
+
+    @ApiModelProperty(value = "定位时间")
+    private Date dwsj;
+
+    @ApiModelProperty(value = "地球经度")
+    private BigDecimal jd;
+
+    @ApiModelProperty(value = "地球维度")
+    private BigDecimal wd;
+
+    @ApiModelProperty(value = "坐标")
+    @TableField(exist = false)
+    @Transient
+    private Point zb;
+
+    @ApiModelProperty(value = "坐标hash值")
+    private String zbhash;
+
+    @ApiModelProperty(value = "--D_BZ_WZTGZ(位置提供者)位置提供者（pgs PGIS定位 lbs 综合定位）")
+    private String wztgz;
+
+    @ApiModelProperty(value = "国家")
+    private String guo;
+
+    @ApiModelProperty(value = "省")
+    private String sheng;
+
+    @ApiModelProperty(value = "市")
+    private String shi;
+
+    @ApiModelProperty(value = "城市编码")
+    private String csbm;
+
+    @ApiModelProperty(value = "所属区县")
+    private String ssqx;
+
+    @ApiModelProperty(value = "区县编码")
+    private String qxbm;
+
+    @ApiModelProperty(value = "地址详址")
+    private String dzxz;
+
+    @ApiModelProperty(value = "地址简称")
+    private String dzjc;
+
+    @ApiModelProperty(value = "定位标志")
+    private String dwbz;
+
+    @ApiModelProperty(value = "巡防时长（与上一个点的时长）")
+    private Integer xfsc;
+
+    @ApiModelProperty(value = "巡防里程（米）（与上一个点的距离）")
+    private Integer xflc;
+
+    @ApiModelProperty(value = "所属部门id")
+    private String ssbmid;
+
+    @ApiModelProperty(value = "所属部门")
+    private String ssbm;
+
+    @ApiModelProperty(value = "所属部门代码")
+    private String ssbmdm;
+
+    @ApiModelProperty(value = "所属县公安局id")
+    private String ssxgajid;
+
+    @ApiModelProperty(value = "所属县公安局")
+    private String ssxgaj;
+
+    @ApiModelProperty(value = "所属县公安局代码")
+    private String ssxgajdm;
+
+    @ApiModelProperty(value = "所属市公安局id")
+    private String sssgajid;
+
+    @ApiModelProperty(value = "所属市公安局")
+    private String sssgaj;
+
+    @ApiModelProperty(value = "所属市公安局代码")
+    private String sssgajdm;
+
+
+    @ApiModelProperty(value = "数据来源：1、PC，2、手机端", name = "xtSjly")
+    @Field("xt_sjly")
+    @Indexed
+    private String xtSjly;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "数据状态：0、注销，1、正常，-1、封存", name = "xtSjzt")
+    @Field("xt_sjzt")
+    @Indexed
+    private String xtSjzt;
+
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "删除标识：0、未删除，1、已删除", name = "xtScbz")
+    @Field("xt_scbz")
+    @Indexed
+    private String xtScbz;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建IP", name = "xtCjip")
+    @Field("xt_cjip")
+    @Indexed
+    private String xtCjip;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间", name = "xtCjsj")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Field("xt_cjsj")
+    @Indexed
+    private Date xtCjsj;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人ID", name = "xtCjrId")
+    @Field("xt_cjr_id")
+    private String xtCjrId;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建人名称", name = "xtCjr")
+    @Field("xt_cjr")
+    @Indexed
+    private String xtCjr;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门代码", name = "xtCjbmdm")
+    @Field("xt_cjbmdm")
+    private String xtCjbmdm;
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建部门名称", name = "xtCjbmmc")
+    @Field("xt_cjbmmc")
+    private String xtCjbmmc;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新IP", name = "xtZhgxip")
+    @Field("xt_zhgxip")
+    private String xtZhgxip;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新时间", name = "xtZhgxsj")
+    @Field("xt_zhgxsj")
+    private Date xtZhgxsj;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人ID", name = "xtZhgxrid")
+    @Field("xt_zhgxrid")
+    private String xtZhgxrid;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新人名称", name = "xtZhgxr")
+    @Field("xt_zhgxr")
+    private String xtZhgxr;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门代码", name = "xtZhgxbmdm")
+    @Field("xt_zhgxbmdm")
+    private String xtZhgxbmdm;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "最后更新部门名称", name = "xtZhgxbm")
+    @Field("xt_zhgxbm")
+    private String xtZhgxbm;
+
+    @ApiModelProperty(value = "备注", name = "bz")
+    @Field("bz")
+    public String bz;
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/EasyMongoServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/EasyMongoServiceImpl.java
new file mode 100644
index 0000000..e671dea
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/EasyMongoServiceImpl.java
@@ -0,0 +1,179 @@
+package com.mosty.wzzx.mongodb.impl;
+
+
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.mosty.base.utils.mongo.core.entity.Page;
+import com.mosty.base.utils.mongo.core.sdk.EasyMongoService;
+import com.mosty.base.utils.mongo.core.wrapper.LambdaQueryWrapper;
+import com.mosty.base.utils.mongo.utils.ClassUtil;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 默认的服务实现类
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+@SuppressWarnings("all")
+public class EasyMongoServiceImpl<I extends Serializable, T> implements EasyMongoService<I, T> {
+
+    /**
+     * 服务类对应的mongo实体类
+     */
+    private final Class<T> targetClass = (Class<T>) ClassUtil.getTClass(this);
+
+    @Resource
+    protected MongoTemplate mongoTemplate;
+
+    @Override
+    public T getOne(LambdaQueryWrapper<T> queryWrapper) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        return mongoTemplate.findOne(query, targetClass);
+
+    }
+
+    @Override
+    public boolean save(T entity) {
+        return Objects.nonNull(mongoTemplate.save(entity));
+    }
+
+    @Override
+    public boolean saveBatch(Collection<T> entityList) {
+
+        entityList.forEach(item -> mongoTemplate.save(item));
+        return true;
+
+    }
+
+    @Override
+    public boolean removeById(I id) {
+
+        Criteria criteria = Criteria.where("_id").is(id);
+        Query query = new Query(criteria);
+        DeleteResult deleteResult = mongoTemplate.remove(query, targetClass);
+        return deleteResult.getDeletedCount() > 0;
+
+    }
+
+    @Override
+    public boolean remove(LambdaQueryWrapper<T> queryWrapper) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        DeleteResult remove = mongoTemplate.remove(query, targetClass);
+        return remove.getDeletedCount() > 0;
+
+    }
+
+    @Override
+    public boolean updateById(T entity) {
+
+        Criteria criteria = Criteria.where("_id").is(ClassUtil.getId(entity));
+        Query query = new Query(criteria);
+        Update update = getUpdate(entity);
+        UpdateResult updateResult = mongoTemplate.updateFirst(query, update, targetClass);
+        return updateResult.getModifiedCount() > 0;
+
+    }
+
+    /**
+     * 通过反射获取需要更新的字段
+     */
+    private Update getUpdate(T entity) {
+
+        Update update = new Update();
+        for (Field field : entity.getClass().getDeclaredFields()) {
+            try {
+                field.setAccessible(true);
+                Object result = field.get(entity);
+                if (Objects.nonNull(result)) {
+                    update.set(field.getName(), result);
+                }
+            } catch (Exception ignore) {
+            }
+        }
+        return update;
+
+    }
+
+    @Override
+    public boolean update(T entity, LambdaQueryWrapper<T> queryWrapper) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        Update update = getUpdate(entity);
+        UpdateResult updateResult = mongoTemplate.updateFirst(query, update, targetClass);
+        return updateResult.getModifiedCount() > 0;
+
+    }
+
+    @Override
+    public T getById(I id) {
+
+        Criteria criteria = Criteria.where("_id").is(id);
+        Query query = new Query(criteria);
+        return mongoTemplate.findOne(query, targetClass);
+
+    }
+
+    @Override
+    public Collection<T> listByIds(Collection<I> idList) {
+
+        Criteria criteria = Criteria.where("_id").in(idList);
+        Query query = new Query(criteria);
+        return mongoTemplate.find(query, targetClass);
+
+    }
+
+    @Override
+    public long count(LambdaQueryWrapper<T> queryWrapper) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        return mongoTemplate.count(query, targetClass);
+
+    }
+
+    @Override
+    public List<T> list(LambdaQueryWrapper<T> queryWrapper) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        return mongoTemplate.find(query, targetClass);
+
+    }
+
+    @Override
+    public Page<T> page(LambdaQueryWrapper<T> queryWrapper, int pageNo, int pageSize) {
+
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        Page<T> page = new Page<>();
+        page.setPageSize(pageSize);
+        page.setPageNum(pageNo);
+        long total = mongoTemplate.count(query, targetClass);
+        page.setTotal(total);
+        if (total <= 0) {
+            return page;
+        }
+        query.skip((long) (pageNo - 1) * pageSize).limit(pageSize);
+        List<T> list = mongoTemplate.find(query, targetClass);
+        page.setRecords(list);
+        return page;
+
+    }
+
+    @Override
+    public boolean exist(LambdaQueryWrapper<T> queryWrapper) {
+        Query query = QueryBuildUtils.buildQuery(queryWrapper);
+        return mongoTemplate.exists(query, targetClass);
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/QueryBuildUtils.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/QueryBuildUtils.java
new file mode 100644
index 0000000..37f1835
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/QueryBuildUtils.java
@@ -0,0 +1,251 @@
+package com.mosty.wzzx.mongodb.impl;
+
+import com.mosty.base.utils.mongo.core.constant.ECompare;
+import com.mosty.base.utils.mongo.core.constant.EConditionType;
+import com.mosty.base.utils.mongo.core.constant.ESortType;
+import com.mosty.base.utils.mongo.core.entity.Condition;
+import com.mosty.base.utils.mongo.core.entity.SortCondition;
+import com.mosty.base.utils.mongo.core.wrapper.ConditionWrapper;
+import com.mosty.base.utils.mongo.core.wrapper.LambdaQueryWrapper;
+import com.mosty.base.utils.mongo.utils.ExceptionUtils;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Field;
+import org.springframework.data.mongodb.core.query.Query;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 查询工具构建工具
+ *
+ * @author esacpe
+ * @date 2024/4/15
+ */
+public class QueryBuildUtils {
+
+    private static final Map<ECompare, Function<Condition, Criteria>> HANDLERS = new ConcurrentHashMap<>();
+
+    static {
+        HANDLERS.put(ECompare.EQ, QueryBuildUtils::eqHandle);
+        HANDLERS.put(ECompare.NE, QueryBuildUtils::neHandle);
+        HANDLERS.put(ECompare.LE, QueryBuildUtils::leHandle);
+        HANDLERS.put(ECompare.LT, QueryBuildUtils::ltHandle);
+        HANDLERS.put(ECompare.GE, QueryBuildUtils::geHandle);
+        HANDLERS.put(ECompare.GT, QueryBuildUtils::gtHandle);
+        HANDLERS.put(ECompare.BW, QueryBuildUtils::bwHandle);
+        HANDLERS.put(ECompare.IN, QueryBuildUtils::inHandle);
+        HANDLERS.put(ECompare.NIN, QueryBuildUtils::ninHandle);
+    }
+
+    /**
+     * 使用条件构建器构建查询条件
+     *
+     * @param queryWrapper 条件构建器
+     * @return 查询条件
+     */
+    public static Query buildQuery(LambdaQueryWrapper<?> queryWrapper) {
+        return buildQuery(queryWrapper.getCondition());
+    }
+
+    /**
+     * 使用条件构建器构建查询条件
+     *
+     * @param arg 条件构建器封装的真实条件参数
+     * @return 查询条件
+     */
+    private static Query buildQuery(ConditionWrapper arg) {
+
+        Criteria criteria = new Criteria();
+        // 01 构建查询参数
+        criteria.andOperator(buildCondition(arg));
+        Query query = new Query(criteria);
+        List<SortCondition> sortConditions = arg.getSortConditions();
+
+        // 02 构建排序参数
+        if (Objects.nonNull(sortConditions)) {
+            query.with(Sort.by(buildSort(sortConditions)));
+        }
+
+        // 03 构建分页参数
+        if (Objects.nonNull(arg.getSkip())) {
+            query.skip(arg.getSkip());
+        }
+        if (Objects.nonNull(arg.getLimit())) {
+            query.limit(arg.getLimit());
+        }
+
+        // 04 构建查询列
+        if (Objects.nonNull(arg.getFields()) && arg.getFields().size() > 0) {
+            Field fields = query.fields();
+            arg.getFields().forEach(item -> fields.include(item.getCol()));
+        }
+
+        return query;
+
+    }
+
+    /**
+     * 构建排序信息
+     *
+     * @param sortConditions 排序条件
+     * @return 排序信息
+     */
+    private static List<Sort.Order> buildSort(List<SortCondition> sortConditions) {
+
+        return sortConditions.stream().map(item -> {
+            if (item.getSortType() == ESortType.ASC) {
+                return Sort.Order.asc(item.getCol());
+            } else {
+                return Sort.Order.desc(item.getCol());
+            }
+        }).collect(Collectors.toList());
+
+    }
+
+    /**
+     * 构建查询条件
+     *
+     * @param arg 条件构造器中的条件参数
+     * @return 查询条件
+     */
+    private static Criteria[] buildCondition(ConditionWrapper arg) {
+
+        Criteria criteria = new Criteria();
+        if (Objects.isNull(arg) || Objects.isNull(arg.getConditions()) || arg.getConditions().size() == 0) {
+            return new Criteria[]{criteria};
+        }
+        List<Condition> conditions = arg.getConditions();
+
+        boolean isOr = false;
+        Criteria[] critters = new Criteria[conditions.size()];
+        for (int index = 0; index < conditions.size(); index++) {
+            Condition condition = conditions.get(index);
+            if (Objects.nonNull(condition.getConditionWrapper()) && Objects.isNull(condition.getCol()) && condition.getConditionWrapper().getConditions().size() > 0) {
+                Criteria curCriteria = new Criteria();
+                Condition first = condition.getConditionWrapper().getConditions().get(0);
+                if (first.getConditionType() == EConditionType.OR) {
+                    curCriteria.orOperator(buildCondition(condition.getConditionWrapper()));
+                } else {
+                    curCriteria.andOperator(buildCondition(condition.getConditionWrapper()));
+                }
+                critters[index] = curCriteria;
+                continue;
+            }
+            ECompare type = condition.getType();
+            if (condition.getConditionType() == EConditionType.OR) {
+                isOr = true;
+            }
+            Function<Condition, Criteria> handler = HANDLERS.get(type);
+            if (Objects.isNull(handler)) {
+                throw ExceptionUtils.mpe(String.format("buildQuery error not have queryType %s", type));
+            }
+            Criteria curCriteria = handler.apply(condition);
+            critters[index] = curCriteria;
+        }
+        if (isOr) {
+            criteria.orOperator(critters);
+        } else {
+            criteria.andOperator(critters);
+        }
+        return critters;
+
+    }
+
+    /**
+     * eq 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria eqHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).is(condition.getArgs().get(0));
+    }
+
+    /**
+     * ne 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria neHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).ne(condition.getArgs().get(0));
+    }
+
+    /**
+     * le 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria leHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).lte(condition.getArgs().get(0));
+    }
+
+    /**
+     * lt 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria ltHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).lt(condition.getArgs().get(0));
+    }
+
+    /**
+     * ge 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria geHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).gte(condition.getArgs().get(0));
+    }
+
+    /**
+     * gt 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria gtHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).gt(condition.getArgs().get(0));
+    }
+
+    /**
+     * between 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria bwHandle(Condition condition) {
+        return Criteria.where(condition.getCol()).lte(condition.getArgs().get(0)).gt(condition.getArgs().get(1));
+    }
+
+    /**
+     * in 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria inHandle(Condition condition) {
+        List<Object> args = (List<Object>) condition.getArgs().get(0);
+        return Criteria.where(condition.getCol()).in(args.toArray());
+    }
+
+    /**
+     * notIn 处理器
+     *
+     * @param condition 条件参数
+     * @return 构建好的查询条件
+     */
+    private static Criteria ninHandle(Condition condition) {
+        List<Object> args = (List<Object>) condition.getArgs().get(0);
+        return Criteria.where(condition.getCol()).nin(args.toArray());
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/TbWzSblswzMongoServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/TbWzSblswzMongoServiceImpl.java
new file mode 100644
index 0000000..94e55a4
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mongodb/impl/TbWzSblswzMongoServiceImpl.java
@@ -0,0 +1,11 @@
+package com.mosty.wzzx.mongodb.impl;
+
+import com.mosty.wzzx.mongodb.TbWzSblswzMongoService;
+import com.mosty.wzzx.mongodb.entity.TbWzSblswzMo;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class TbWzSblswzMongoServiceImpl extends EasyMongoServiceImpl<String, TbWzSblswzMo> implements TbWzSblswzMongoService {
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..1ba904d
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.wzzx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/MybatisPlusConfig.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..38e9730
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.wzzx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.wzzx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbBaseAdaptRemoteService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..1407e73
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,105 @@
+package com.mosty.wzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByDeptId(String deptId) {
+        if (StringUtils.isBlank(deptId)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据经纬度获取地址信息
+    public JSONObject getAddress(String jd,String wd) {
+        if (StringUtils.isBlank(jd) || StringUtils.isBlank(wd)) {
+            return null;
+        }
+        ResponseResult<JSONObject> responseResult = mostyBaseFeignService.getAddress(jd,wd);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据经纬度获取地址信息
+    public JSONObject getLzAddress(String jd,String wd) {
+        if (StringUtils.isBlank(jd) || StringUtils.isBlank(wd)) {
+            return null;
+        }
+        ResponseResult<JSONObject> responseResult = mostyBaseFeignService.getLzAddress(jd,wd);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据经纬度获取地址信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据经纬度获取地址信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取用户部门信息
+    public DeptInfoVo getDeptInfoByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoByUserId(userId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        return responseResult.getData();
+    }
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+    // 获取用户信息
+    public SysUser getUserInfoBySfzh(String sfzh) {
+        ResponseResult<SysUser> responseResult = mostyBaseFeignService.getUserInfoBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息失败， responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbQwzxAdaptRemoteService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbQwzxAdaptRemoteService.java
new file mode 100644
index 0000000..080471b
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbQwzxAdaptRemoteService.java
@@ -0,0 +1,56 @@
+package com.mosty.wzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 勤务中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbQwzxAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    // 根据设备ID查询该设备所在的巡组
+    public List<TbQwXfbb> getBbList(String sbid) {
+        ResponseResult<List<TbQwXfbb>> responseResult = mostyQwzxFeignService.getBbList(sbid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取巡组信息 失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据设备ID查询该设备所在的巡组
+    public List<TbQwXfbb> getClBbList(String sbid) {
+        ResponseResult<List<TbQwXfbb>> responseResult = mostyQwzxFeignService.getClBbList(sbid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取巡组信息 失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询报备信息
+    public TbQwXfbb getBbxxInfo(String id) {
+        ResponseResult<TbQwXfbb> responseResult = mostyQwzxFeignService.getBbxxInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询报备信息 失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询报备信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbWebSocketAdaptRemoteService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbWebSocketAdaptRemoteService.java
new file mode 100644
index 0000000..68bd76f
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbWebSocketAdaptRemoteService.java
@@ -0,0 +1,33 @@
+package com.mosty.wzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyWebSocketFeignService;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * websocket外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbWebSocketAdaptRemoteService {
+
+    @Resource
+    private MostyWebSocketFeignService mostyWebSocketFeignService;
+
+    // 发送报备数据websocket信息
+    public void sendBbMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendBbMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送报备数据websocket信息 异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送报备数据websocket信息 异常");
+        }
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbXfbbAdaptRemoteService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbXfbbAdaptRemoteService.java
new file mode 100644
index 0000000..f6effd6
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbXfbbAdaptRemoteService.java
@@ -0,0 +1,39 @@
+package com.mosty.wzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by
+ *
+ * @ClassName TbXfbbAdaptRemoteService
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbXfbbAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    /**
+     * 查询预警信息
+     * @param id 内容
+     * @return 部门信息
+     */
+    public JSONObject getBbxx(String id) {
+        ResponseResult responseResult = mostyQwzxFeignService.getBbInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询报备信息异常Result = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return JSONObject.parseObject(JSONObject.toJSONString(responseResult.getData()));
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbYjzlAdaptRemoteService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbYjzlAdaptRemoteService.java
new file mode 100644
index 0000000..398ab6e
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/remote/TbYjzlAdaptRemoteService.java
@@ -0,0 +1,60 @@
+package com.mosty.wzzx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyYjzlFeignService;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.vo.wzzx.TbWzSblswzVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/12/9
+ * 外部调用预警指令要素接口
+ **/
+@Service
+@Slf4j
+public class TbYjzlAdaptRemoteService {
+
+    @Resource
+    private MostyYjzlFeignService mostyYjzlFeignService;
+
+    // 添加指令信息
+    public void addZl(TbZlxxInsertDto dto) {
+        ResponseResult<Void> responseResult = this.mostyYjzlFeignService.addZl(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加指令信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加指令信息失败");
+        }
+    }
+
+    // 修改预警信息是否发送指令
+    public void updateYjxxSffszl(String id) {
+        ResponseResult<Void> responseResult = this.mostyYjzlFeignService.updateYjxxSffszl(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改预警信息是否发送指令失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改预警信息是否发送指令失败");
+        }
+    }
+
+
+    // 通过设备位置新增犯罪预测巡逻记录
+    public void addBySbwz(TbFzJlVo vo) {
+        if (ObjectUtils.isNotEmpty(vo)) {
+            ResponseResult<Void> responseResult = this.mostyYjzlFeignService.addBySbwz(vo);
+            if (responseResult == null || !responseResult.isSuccess()) {
+                log.error("通过设备位置新增犯罪预测巡逻记录失败 responseResult = {}", JSON.toJSONString(responseResult));
+                throw new BusinessException("通过设备位置新增犯罪预测巡逻记录");
+            }
+        }
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/LocationInfoService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/LocationInfoService.java
new file mode 100644
index 0000000..1f34f8e
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/LocationInfoService.java
@@ -0,0 +1,19 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.dto.wzzx.AppLocationReceiveDto;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import io.swagger.annotations.ApiOperation;
+
+public interface LocationInfoService {
+
+    @ApiOperation("位置接收")
+    void locationReceive(LocationInfo locationInfo);
+
+    @ApiOperation("保存人员位置")
+    TbWzRywz saveRywz(LocationInfo locationInfo);
+
+    @ApiOperation("保存巡防位置")
+    Integer saveXfwz(TbQwXfbb bb, LocationInfo locationInfo, TbWzRywz rywz);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwXfbbService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwXfbbService.java
new file mode 100644
index 0000000..6fa6ab8
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwXfbbService.java
@@ -0,0 +1,22 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbQwXfbbService {
+
+    @ApiOperation("根据ID更新")
+    Integer updateXfbb(TbQwXfbb bb,LocationInfo locationInfo, TbWzRywz rywz,Integer lc);
+
+    @ApiOperation("根据ID更新")
+    Integer updateById(String id, LocationInfo locationInfo);
+
+    @ApiOperation("udp更新报备位置")
+    void updateXfbbUdp(TbQwXfbb bb, TbWzSbsswz sbsswz,Integer lc);
+
+    @ApiOperation("查询是否报备")
+    int getsfbb(String id);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwZnzbService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwZnzbService.java
new file mode 100644
index 0000000..2484dd5
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbQwZnzbService.java
@@ -0,0 +1,14 @@
+package com.mosty.wzzx.service;
+
+
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbQwZnzbService {
+
+    @ApiOperation("根据业务ID查询智能装备")
+    List<TbQwZnzb> queryListByYwid(List<String> ywidList);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbSjCyjlService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbSjCyjlService.java
new file mode 100644
index 0000000..49424ca
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbSjCyjlService.java
@@ -0,0 +1,24 @@
+package com.mosty.wzzx.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.dto.wzzx.SjCyjlUpdateDto;
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.wzzx.mapper.TbSjCyjlMapper;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public interface TbSjCyjlService {
+
+    @ApiOperation("更新事件参与警力坐标")
+    Integer updateJlZb(LocationInfo locationInfo);
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzLswzService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzLswzService.java
new file mode 100644
index 0000000..488f947
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzLswzService.java
@@ -0,0 +1,11 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbWzLswzService{
+
+    @ApiOperation("保存历史记录")
+    void saveLswz(LocationInfo locationInfo, TbWzRywz rywz);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSblswzService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSblswzService.java
new file mode 100644
index 0000000..c8c3b26
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSblswzService.java
@@ -0,0 +1,11 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbWzSblswzService {
+
+    @ApiOperation("保存设备历史位置记录")
+    void saveSblswz(TbWzSbsswz sbsswz);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSbsswzService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSbsswzService.java
new file mode 100644
index 0000000..bf0c411
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSbsswzService.java
@@ -0,0 +1,14 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.wzzx.udp.UdpLzEntity;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbWzSbsswzService{
+
+    @ApiOperation("删除历史数据")
+    void delHistory();
+
+    @ApiOperation("保存泸州设备实时位置")
+    TbWzSbsswz saveSbsswz(UdpLzEntity lzEntity);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSswzService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSswzService.java
new file mode 100644
index 0000000..bb75613
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzSswzService.java
@@ -0,0 +1,38 @@
+package com.mosty.wzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.query.wzzx.TbWzRywzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSswzSearchDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbWzSswzService {
+
+    @ApiOperation("保存实时记录")
+    void saveSswz(LocationInfo locationInfo, TbWzRywz rywz);
+
+    @ApiOperation("添加位置")
+    TbWzSswz insert(LocationInfo locationInfo);
+
+    @ApiOperation("添加位置")
+    TbWzSswz insertEntity(TbWzSswz sswz);
+
+    @ApiOperation("根据ID查询")
+    TbWzSswz queryById(String id);
+
+    @ApiOperation("")
+    TbWzSswz querySswzNow(String yhid, String jrbh);
+
+    @ApiOperation("删除历史数据")
+    void delHistory();
+
+    @ApiOperation("获取时间段类的人员轨迹信息俩表")
+    IPage<TbWzSswz> getRygjList(TbWzSswzSearchDto dto);
+
+    @ApiOperation("查询某一天的人员位置信息")
+    TbWzRywz getRywz(TbWzRywzSearchDto dto);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzXfwzService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzXfwzService.java
new file mode 100644
index 0000000..c8bcdc6
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/TbWzXfwzService.java
@@ -0,0 +1,47 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.dto.wzzx.AppLocationReceiveDto;
+import com.mosty.base.model.query.wzzx.TbWzLswzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSbLswzSearchDto;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 位置-巡防位置表(TbWzXfwz)表服务接口
+ */
+public interface TbWzXfwzService {
+
+    @ApiOperation("查询所有数据")
+    List<TbWzXfwz> queryAll();
+
+    @ApiOperation("通过ID查询单条数据")
+    TbWzXfwz queryById(String id);
+
+    @ApiOperation("新增数据")
+    TbWzXfwz insert(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("修改数据")
+    TbWzXfwz update(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("通过主键删除数据")
+    boolean deleteById(String id);
+
+    @ApiOperation("大屏-地图-轨迹回放")
+    Object selectTrack(TbWzXfwz tbWzXfwz);
+
+    @ApiOperation("历史位置轨迹回放")
+    Object selectLswz(TbWzLswzSearchDto dto);
+
+    @ApiOperation("位置接收")
+    Boolean locationReceive(AppLocationReceiveDto receiveDto);
+
+    @ApiOperation("设备历史位置轨迹回放")
+    Object selectSbLswz(TbWzSbLswzSearchDto dto);
+
+    @ApiOperation("设备历史位置轨迹回放")
+    Object selectSbLswzMo(TbWzSbLswzSearchDto dto);
+
+}
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WztjService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WztjService.java
new file mode 100644
index 0000000..6e4b4d4
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WztjService.java
@@ -0,0 +1,55 @@
+package com.mosty.wzzx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.wzzx.WzcxQuery;
+import com.mosty.base.model.dto.wzzx.WztjQuery;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WztjService {
+
+    @ApiOperation("人员位置")
+    List<Map<String,Object>> rywz(WztjQuery dto);
+
+    @ApiOperation("巡组位置")
+    List<Map<String,Object>> xz(WztjQuery dto);
+
+    @ApiOperation("里程数")
+    List<Map<String,Object>> jrlcs(WztjQuery dto);
+
+    @ApiOperation("人数里程巡组整合")
+    List<Map<String,Object>> rslcxz(WztjQuery dto);
+
+    @ApiOperation("位置人数")
+    List<Map<String,Object>> jrwzrs(WztjQuery dto);
+
+    @ApiOperation("巡组位置数")
+    List<Map<String,Object>> jrxzwzs(WztjQuery dto);
+
+    @ApiOperation("人员位置列表")
+    IPage<Map<String,Object>> rywzlb(WztjQuery dto);
+
+    @ApiOperation("报备轨迹查询")
+    List<Map<String,Object>> bbgjcx(WzcxQuery dto);
+
+    @ApiOperation("报备位置查询")
+    List<Map<String,Object>> bbwzcx(WzcxQuery dto);
+
+    @ApiOperation("民警轨迹查询")
+    List<Map<String,Object>> mjgjcx(WzcxQuery dto);
+
+    @ApiOperation("未报备位置查询")
+    List<Map<String,Object>> wbbwz(WzcxQuery dto);
+
+    @ApiOperation("巡组数量统计")
+    Map<String, Object> xfsltj(String type);
+
+    @ApiOperation("人员数量统计")
+    Map<String, Object> rysltj(String type);
+
+    @ApiOperation("设备数量统计")
+    Map<String, Object> sblswz(String type);
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WzzxSysUserService.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WzzxSysUserService.java
new file mode 100644
index 0000000..fd69321
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/WzzxSysUserService.java
@@ -0,0 +1,13 @@
+package com.mosty.wzzx.service;
+
+import com.mosty.common.core.business.entity.SysUser;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface WzzxSysUserService {
+
+    @ApiOperation("添加位置")
+    List<SysUser> queryList();
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/LocationInfoServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/LocationInfoServiceImpl.java
new file mode 100644
index 0000000..984419e
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/LocationInfoServiceImpl.java
@@ -0,0 +1,413 @@
+package com.mosty.wzzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.wzzx.AppLocationReceiveDto;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.wzzx.mapper.TbWzRywzMapper;
+import com.mosty.wzzx.mapper.TbWzXfwzMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.remote.TbQwzxAdaptRemoteService;
+import com.mosty.wzzx.remote.TbYjzlAdaptRemoteService;
+import com.mosty.wzzx.service.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class LocationInfoServiceImpl extends ServiceImpl<TbWzXfwzMapper, TbWzXfwz> implements LocationInfoService {
+
+
+    private final TbWzRywzMapper tbWzRywzMapper;
+    private final TbQwXfbbService tbQwXfbbService;
+    private final TbWzSswzService tbWzSswzService;
+    private final TbWzLswzService tbWzLswzService;
+    private final TbSjCyjlService tbSjCyjlService;
+    private final RedisService redisService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbYjzlAdaptRemoteService tbYjzlAdaptRemoteService;
+
+
+
+    public void locationReceive(LocationInfo locationInfo) {
+        long startTime = System.currentTimeMillis();
+        long rytime = 0;
+        long bbtime = 0;
+        long xftime = 0;
+        long sswzTime = 0;
+        long lswzTime = 0;
+        long xfbbTime = 0;
+
+
+        //经度、纬度为空不接收数据
+        try {
+            if (locationInfo.getLng() == null && locationInfo.getLat() == null) {
+                return;
+            }
+
+            // 绵阳存在问题 后台结束报备以后 app没有更新报备id 一直上传位置
+            if (StringUtils.isNotEmpty(locationInfo.getBbid()) || !"null".equals(locationInfo.getBbid())) {
+                int getsfbb = tbQwXfbbService.getsfbb(locationInfo.getBbid());
+                if (getsfbb < 1) {
+                    locationInfo.setBbid(null);
+                }
+            }
+
+            if (StringUtils.isBlank(locationInfo.getBbid()) || "null".equals(locationInfo.getBbid())) {
+                locationInfo.setBbid(null);
+                locationInfo.setJzid(null);
+                locationInfo.setJzmc(null);
+                //保存人员位置
+                TbWzRywz oldRywz = this.saveRywz(locationInfo);
+                // 保存实时位置
+                this.tbWzSswzService.saveSswz(locationInfo, oldRywz);
+                // 保存历史位置
+                this.tbWzLswzService.saveLswz(locationInfo, oldRywz);
+            } else {
+                String bbid, jzid, jzmc;
+                String[] bbidList = locationInfo.getBbid().split("\\(__\\)");
+                String[] jzidList = null;
+                String[] jzmcList = null;
+                if (StringUtils.isNoneBlank(locationInfo.getJzid())) {
+                    jzidList = locationInfo.getJzid().split("\\(__\\)");
+                }
+                if (StringUtils.isNoneBlank(locationInfo.getJzmc())) {
+                    jzmcList = locationInfo.getJzmc().split("\\(__\\)");
+                }
+                for (int i = 0; i < bbidList.length; i++) {
+                    bbid = bbidList[i];
+                    if (jzidList != null) {
+                        jzid = jzidList[i];
+                        locationInfo.setJzid(jzid);
+                    }
+                    if (jzmcList != null) {
+                        jzmc = jzmcList[i];
+                        locationInfo.setJzmc(jzmc);
+                    }
+                    locationInfo.setBbid(bbid);
+
+                    // 保存人员位置
+                    TbWzRywz oldRywz = this.saveRywz(locationInfo);
+                    rytime = System.currentTimeMillis() - startTime;
+                    //警务通采集经纬度为辅
+                    TbQwXfbb bb = this.tbQwzxAdaptRemoteService.getBbxxInfo(locationInfo.getBbid());
+                    bbtime = System.currentTimeMillis() - startTime;
+                    // 保存巡防位置
+                    Integer lc = this.saveXfwz(bb, locationInfo, oldRywz);
+                    xftime = System.currentTimeMillis() - startTime;
+//                    log.info("TbQwXfbb ：{}", System.currentTimeMillis() - startTime);
+                    // 查询巡组实时位置,如果5分钟没有GPS信号，则保存设备的位置信息 （直接判断bb是否在线 在线不添加 不在线 写入数据）
+//                    if (bb.getXfzt().equals("2")) {
+
+                    // 保存实时位置
+                    tbWzSswzService.saveSswz(locationInfo, oldRywz);
+                    sswzTime = System.currentTimeMillis() - startTime;
+                    // 保存历史位置
+                    tbWzLswzService.saveLswz(locationInfo, oldRywz);
+                    lswzTime = System.currentTimeMillis() - startTime;
+                    // 修改巡防报备的坐标
+                    tbQwXfbbService.updateXfbb(bb, locationInfo, oldRywz, lc);
+                    xfbbTime = System.currentTimeMillis() - startTime;
+                }
+
+            }
+            long zsc = System.currentTimeMillis() - startTime;
+            if (zsc > 1000) {
+                System.out.println("位置服务上报保存时长{" + zsc + "}----保存人员位置{" + rytime + "}---" +
+                        "报备查询{" + bbtime + "}---保存巡防位置{" + xftime + "}-----用户{" + locationInfo.getUserId() + "}----" +
+                        "保存实时位置{" + sswzTime + "}---保存历史位置{" + lswzTime + "}---修改巡防报备的坐标{" + xfbbTime + "}-----用户{" + locationInfo.getUserId() + "}");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 生成指令信息
+    private void createdZl(LocationInfo item, TbQwXfbb bb) {
+        String key = Constant.LZYJ_DATA_QKSD;
+        List<TbYjxx> yjxxList = this.redisService.getCacheList(key);
+        if (yjxxList != null && yjxxList.size() > 0) {
+            // 依图人像（脸）
+            List<TbYjxx> ytList = yjxxList.stream().filter(yjxx -> {
+                // 判断相似度大于等于95%
+                if (yjxx.getXsd() == null) return false;
+                int a = yjxx.getXsd().compareTo(new BigDecimal("95"));
+                if (a < 0) return false;
+                // 预警时间半小时之内
+                if (new Date().getTime() - yjxx.getYjSj().getTime() > 30 * 60 * 1000) return false;
+                // 当前位置500米范围内
+                double jl = Kit.getDistance(item.getLng(), item.getLat(), yjxx.getJd().doubleValue(), yjxx.getWd().doubleValue());
+                return !(jl >= 500.0);
+            }).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(ytList)) {
+                // 发送指令到巡组
+                this.sendZl(ytList, bb);
+            }
+            // 旅店网吧
+            List<TbYjxx> ldList = yjxxList.stream().filter(yjxx -> {
+                if (yjxx.getXsd() != null) return false;
+                // 预警时间两小时之内
+                if (new Date().getTime() - yjxx.getYjSj().getTime() > 120 * 60 * 1000) return false;
+                // 当前位置2000米范围内
+                double jl = Kit.getDistance(item.getLng(), item.getLat(), yjxx.getJd().doubleValue(), yjxx.getWd().doubleValue());
+                return !(jl >= 2000);
+            }).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(ldList)) {
+                // 发送指令到巡组
+                this.sendZl(ldList, bb);
+            }
+        }
+    }
+
+    // 发送指令到巡组
+    private void sendZl(List<TbYjxx> yjxxList, TbQwXfbb bb) {
+        if (bb != null) {
+            yjxxList.forEach(yjxx -> {
+                TbZlxxInsertDto zl = new TbZlxxInsertDto();
+                zl.setId(UUIDGenerator.getUUID()).setYwId(yjxx.getId()).setZllx("02").setZlly("02").setZlzxlx("1")
+                        .setZlbt("请核查" + yjxx.getYjBt()).setZlnr(yjxx.getYjNr() + "请核查！")
+                        .setZldj(yjxx.getYjJb()).setJd(yjxx.getJd()).setWd(yjxx.getWd()).setZlfsddxzqh(yjxx.getYjDzXzqh())
+                        .setZlfsdd(yjxx.getYjDz()).setZltp(yjxx.getYjTp());
+                zl.setZljsdx("03");
+                zl.setSsbmid(bb.getSsbmid());
+                List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                zxr.setZlId(zl.getId()).setZxrLx("03").setZxrXzid(bb.getId());
+                zxrDtoList.add(zxr);
+                yjxx.setBz("范围内500米查询到巡组《" + bb.getJzMc() + "》，已下发");
+                zl.setZxrDtoList(zxrDtoList);
+                this.tbYjzlAdaptRemoteService.addZl(zl);
+                // 修改预警信息相关信息
+                this.tbYjzlAdaptRemoteService.updateYjxxSffszl(yjxx.getId());
+            });
+        }
+    }
+
+    public TbWzRywz saveRywz(LocationInfo locationInfo) {
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        String redisKey = Constant.WZ_RYWZ + locationInfo.getUserId() + "-"
+                + DateUtils.getQueryDateString(new Date(), "01");
+        TbWzRywz rywz = redisService.getCacheObject(redisKey);
+//        TbWzRywz oldRywz = redisService.getCacheObject(redisKey);
+        if (rywz == null) {
+            rywz = new TbWzRywz();
+        }
+        rywz.setYhId(locationInfo.getYhid());
+        rywz.setYhXm(locationInfo.getUserName());
+        rywz.setYhSfzh(locationInfo.getUserId());
+        List<BigDecimal[]> list = rywz.getZbList();
+        if (CollectionUtils.isEmpty(list)) {
+            list = new ArrayList<>();
+        }
+        Date oldTime = null;
+        if (locationInfo.getLastTime() != null) {
+            oldTime = locationInfo.getLastTime();
+        }
+
+        Integer lc = DistanceUtils.getLc(rywz.getLc(), rywz.getJd(), rywz.getWd(), jd, wd);
+        Integer sc = DistanceUtils.getSc(oldTime);
+        BigDecimal[] decimals = new BigDecimal[2];
+        decimals[0] = jd;
+        decimals[1] = wd;
+        list.add(decimals);
+        if (list.size() == 1) {
+            list.add(decimals);
+        }
+        if (list.size() >= 3) {
+            BigDecimal[] decimal0 = list.get(0);
+            BigDecimal[] decimal1 = list.get(1);
+            if (decimal0 == decimal1) {
+                list.remove(0);
+            }
+        }
+        rywz.setLc(lc);
+        rywz.setSc(sc);
+        rywz.setZb(JtsUtils.createLine(list));
+        rywz.setZbsl(list.size());
+        rywz.setJd(jd);
+        rywz.setWd(wd);
+        rywz.setXtSjly("1");
+        if (StringUtils.isBlank(rywz.getSsbm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(locationInfo.getDeptId());
+            if (dept != null) {
+                rywz.setSsbm(dept.getDeptname());
+                rywz.setSsbmdm(dept.getDeptcode());
+                rywz.setSsbmid(dept.getDeptid());
+                rywz.setSsxgaj(dept.getFxjname());
+                rywz.setSsxgajid(dept.getFxjid());
+                rywz.setSsxgajdm(dept.getFxjcode());
+                rywz.setSssgajid(dept.getDszid());
+                rywz.setSssgaj(dept.getDszname());
+                rywz.setSssgajdm(dept.getDszcode());
+            }
+        }
+        if (StringUtils.isBlank(rywz.getId())) {
+            rywz.setKssj(new Date());
+            rywz.setDwrq(new Date());
+            tbWzRywzMapper.insertEntity(rywz);
+        } else {
+            tbWzRywzMapper.updateEntity(rywz);
+        }
+        rywz.setZb(null);
+        rywz.setZbList(list);
+        redisService.setCacheObject(redisKey, rywz);
+        return rywz;
+    }
+
+    public Integer saveXfwz(TbQwXfbb bb, LocationInfo locationInfo, TbWzRywz rywz) {
+        if (ObjectUtils.isEmpty(locationInfo) && ObjectUtils.isEmpty(rywz) && ObjectUtils.isEmpty(rywz.getJd()))
+            return 0;
+        String redisKey = Constant.WZ_XFWZ + locationInfo.getBbid();
+        //直接去redis存在问题 20240307
+        TbWzXfwz xfwz = redisService.getCacheObject(redisKey);
+        Integer lc = 0;
+//        TbWzXfwz xfwz = this.baseMapper.queryByBbid(locationInfo.getBbid());
+        if (ObjectUtils.isEmpty(xfwz)) {
+            xfwz = new TbWzXfwz();
+        }
+
+//        else {
+//            List<BigDecimal[]> list = JtsUtils.getz(xfwz.getZb());
+//            if (CollectionUtils.isEmpty(list)) {
+//                list = new ArrayList<>();
+//            }
+//            if (list.size() >= 3) {
+//                BigDecimal[] decimal0 = list.get(0);
+//                BigDecimal[] decimal1 = list.get(1);
+//                if (decimal0 == decimal1) {
+//                    list.remove(0);
+//                }
+//            }
+//            xfwz.setZb(null);
+//            xfwz.setZbList(list);
+//
+//        }
+        // 查询位置人员是否为改报备巡组的报备人员，
+        // 如果是则直接添加修改位置
+        // 查询巡防位置
+//        TbQwXfbb bb = this.tbQwzxAdaptRemoteService.getBbxxInfo(locationInfo.getBbid());
+        boolean flag = false;
+        if ((bb != null && bb.getFzrSfzh().equals(locationInfo.getUserId()))) {
+            // 是报备负责人
+            flag = true;
+        } else {
+            // 如果redis中没得数据，则直接添加数据
+            if (xfwz.getKssj() == null) {
+                flag = true;
+            } else {
+                // 不是报备本人。需要判断之前的时间是否超过5分钟，超过就更新位置数据，不超过
+                // 就不需要更新
+                Date kssj = xfwz.getKssj();
+                if (new Date().getTime() - kssj.getTime() > 5 * 60 * 1000) {
+                    flag = true;
+                }
+            }
+        }
+        if (flag) {
+            BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+            BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+            lc = DistanceUtils.getLc(bb.getXflc(), xfwz.getJd(), xfwz.getWd(), jd, wd);
+            xfwz.setBbId(locationInfo.getBbid());
+            xfwz.setYhId(locationInfo.getYhid());
+            xfwz.setYhSfzh(locationInfo.getUserId());
+            xfwz.setYhXm(locationInfo.getUserName());
+            xfwz.setJzId(locationInfo.getJzid());
+            xfwz.setJzMc(locationInfo.getJzmc());
+            xfwz.setSc(rywz.getSc());
+            xfwz.setLc(rywz.getLc());
+            List<BigDecimal[]> list = new ArrayList<>();
+            if (!CollectionUtils.isEmpty(xfwz.getZbList())) {
+                list = xfwz.getZbList();
+            }
+            BigDecimal[] decimals = new BigDecimal[2];
+            decimals[0] = jd;
+            decimals[1] = wd;
+            list.add(decimals);
+            if (list.size() == 1) {
+                list.add(decimals);
+            }
+            if (list.size() >= 3) {
+                BigDecimal[] decimal0 = list.get(0);
+                BigDecimal[] decimal1 = list.get(1);
+                if (decimal0 == decimal1) {
+                    list.remove(0);
+                }
+            }
+            xfwz.setZb(JtsUtils.createLine(list));
+            xfwz.setZbsl(list.size());
+            xfwz.setDwrq(new Date());
+            xfwz.setKssj(new Date());
+            xfwz.setJd(jd);
+            xfwz.setWd(wd);
+            xfwz.setZhgxsj(new Date());
+            xfwz.setXtSjly("1");
+            if (ObjectUtils.isNotEmpty(rywz)) {
+                xfwz.setSsbm(rywz.getSsbm());
+                xfwz.setSsbmdm(rywz.getSsbmdm());
+                xfwz.setSsbmid(rywz.getSsbmid());
+                xfwz.setSsxgaj(rywz.getSsxgaj());
+                xfwz.setSsxgajid(rywz.getSsxgajid());
+                xfwz.setSsxgajdm(rywz.getSsxgajdm());
+                xfwz.setSssgajid(rywz.getSssgajid());
+                xfwz.setSssgaj(rywz.getSssgaj());
+                xfwz.setSssgajdm(rywz.getSssgajdm());
+            } else {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(locationInfo.getDeptId());
+                if (dept != null) {
+                    xfwz.setSsbm(dept.getDeptname());
+                    xfwz.setSsbmdm(dept.getDeptcode());
+                    xfwz.setSsbmid(dept.getDeptid());
+                    xfwz.setSsxgaj(dept.getFxjname());
+                    xfwz.setSsxgajid(dept.getFxjid());
+                    xfwz.setSsxgajdm(dept.getFxjcode());
+                    xfwz.setSssgajid(dept.getDszid());
+                    xfwz.setSssgaj(dept.getDszname());
+                    xfwz.setSssgajdm(dept.getDszcode());
+
+                }
+            }
+
+            xfwz.setZxzt("1");
+            if (StringUtils.isBlank(xfwz.getId())) {
+                xfwz.setId(UUIDGenerator.getUUID());
+                this.baseMapper.insert(xfwz);
+            } else {
+                this.baseMapper.update(xfwz);
+            }
+            xfwz.setZb(null);
+            xfwz.setZbList(list);
+            redisService.setCacheObject(redisKey, xfwz);
+        }
+        return lc;
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwXfbbServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwXfbbServiceImpl.java
new file mode 100644
index 0000000..2d57767
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwXfbbServiceImpl.java
@@ -0,0 +1,207 @@
+package com.mosty.wzzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.dto.wzzx.XfbbUpdateDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.utils.DistanceUtils;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.wzzx.mapper.TbQwXfbbMapper;
+import com.mosty.wzzx.mapper.TbWzLswzMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.remote.TbQwzxAdaptRemoteService;
+import com.mosty.wzzx.remote.TbWebSocketAdaptRemoteService;
+import com.mosty.wzzx.remote.TbYjzlAdaptRemoteService;
+import com.mosty.wzzx.service.TbQwXfbbService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class TbQwXfbbServiceImpl extends ServiceImpl<TbQwXfbbMapper, TbQwXfbb> implements TbQwXfbbService {
+
+    @Resource
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    @Resource
+    private TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    @Resource
+    private TbWebSocketAdaptRemoteService tbWebSocketAdaptRemoteService;
+    @Resource
+    private TbYjzlAdaptRemoteService tbYjzlAdaptRemoteService;
+    @Resource
+    private TbWzLswzMapper tbWzLswzMapper;
+
+    public Integer updateXfbb(TbQwXfbb xfbb, LocationInfo locationInfo, TbWzRywz oldRywz, Integer lc) {
+        if (StringUtils.isBlank(locationInfo.getBbid())) {
+            return 0;
+        }
+        XfbbUpdateDto dto = new XfbbUpdateDto();
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        dto.setId(locationInfo.getBbid());
+        dto.setJd(jd);
+        dto.setWd(wd);
+        dto.setZb(JtsUtils.getPoint(jd, wd));
+        dto.setZbhash(GeoHashKit.encode(jd, wd));
+        //计算位置
+        dto.setDqwz(locationInfo.getAddress());
+        dto.setZbsj(new Date());
+        //计算巡防里程
+//        Integer lc = DistanceUtils.getLc(xfbb.getXflc(), xfbb.getJd(),  xfbb.getWd(), jd, wd);
+        dto.setXflc(lc);
+        dto.setXfzt("0");
+//        dto.setXfsc(oldRywz.getSc());
+        this.baseMapper.updateXfbb(dto);
+        // 推送位置信息给前端
+//        TbQwXfbb xfbb = this.tbQwzxAdaptRemoteService.getBbxxInfo(locationInfo.getBbid());
+
+        if (xfbb != null) {
+            xfbb.setZb(null);
+            xfbb.setXfzt("0");
+            if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) {
+                SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                xfbb.setLx(user1.getType());
+            }
+            WebSocketObject obj = new WebSocketObject("04", xfbb, null);
+            this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+        }
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                long startTime = System.currentTimeMillis();
+                TbFzJlVo vo = new TbFzJlVo();
+                BeanUtils.copyProperties(xfbb, vo);
+                String xzmc = xfbb.getJzMc();
+                if (StringUtils.isEmpty(xzmc)) {
+                    xzmc = xfbb.getFzrXm() + "警组";
+                }
+                vo.setBbid(xfbb.getId());
+                vo.setXzmc(xzmc);
+                vo.setJd(jd);
+                vo.setWd(wd);
+                tbYjzlAdaptRemoteService.addBySbwz(vo);
+                System.out.println("犯罪线程结束----->"+(System.currentTimeMillis() - startTime));
+            }
+        }).start();
+        return 1;
+    }
+
+
+
+    @Override
+    public void updateXfbbUdp(TbQwXfbb bb, TbWzSbsswz sbsswz, Integer lc) {
+        XfbbUpdateDto dto = new XfbbUpdateDto();
+        BigDecimal jd = sbsswz.getJd();
+        BigDecimal wd = sbsswz.getWd();
+        dto.setId(bb.getId());
+        dto.setJd(jd);
+        dto.setWd(wd);
+        dto.setZb(JtsUtils.getPoint(jd, wd));
+        dto.setZbhash(GeoHashKit.encode(jd, wd));
+        dto.setZbsj(new Date());
+        dto.setXflc(lc);
+        dto.setXfzt("0");
+        // 保存犯罪数据
+        bb.setZb(null);
+        TbFzJlVo vo = new TbFzJlVo();
+        BeanUtils.copyProperties(vo, bb);
+        String xzmc = bb.getJzMc();
+        if (StringUtils.isEmpty(xzmc)) {
+            xzmc = bb.getFzrXm() + "警组";
+        }
+        vo.setBbid(bb.getId());
+        vo.setXzmc(xzmc);
+        vo.setJd(jd);
+        vo.setWd(wd);
+        this.tbYjzlAdaptRemoteService.addBySbwz(vo);
+        this.baseMapper.updateXfbb(dto);
+        TbWzLswz lswz = new TbWzLswz();
+        lswz.setId(UUIDGenerator.getUUID());
+        lswz.setSjly("UDP推送：" + sbsswz.getSbmc());
+        lswz.setSjlydm("01");
+        lswz.setYwid(bb.getId());
+        lswz.setYhId(bb.getFzrId());
+        lswz.setYhXm(bb.getFzrXm());
+        lswz.setYhSfzh(bb.getFzrSfzh());
+        lswz.setJzId(bb.getJzId());
+        lswz.setJzMc(bb.getJzMc());
+        lswz.setDwrq(new Date());
+        lswz.setDwsj(new Date());
+        lswz.setJd(jd);
+        lswz.setWd(wd);
+        lswz.setZb(JtsUtils.getPoint(jd, wd));
+        lswz.setZbhash(GeoHashKit.encode(jd, wd));
+        lswz.setWztgz("01");
+        lswz.setSsbm(bb.getSsbm());
+        lswz.setSsbmdm(bb.getSsbmdm());
+        lswz.setSsbmid(bb.getSsbmid());
+        lswz.setSsxgaj(bb.getSsxgaj());
+        lswz.setSsxgajid(bb.getSsxgajid());
+        lswz.setSsxgajdm(bb.getSsxgajdm());
+        lswz.setSssgajid(bb.getSssgajid());
+        lswz.setSssgaj(bb.getSssgaj());
+        lswz.setSssgajdm(bb.getSssgajdm());
+        lswz.setDwbz("UDP");
+        lswz.setDzxz(sbsswz.getDzxz());
+        this.tbWzLswzMapper.insertEntity(lswz);
+        // 推送位置信息给前端
+        TbQwXfbb xfbb = this.tbQwzxAdaptRemoteService.getBbxxInfo(bb.getId());
+        if (xfbb != null) {
+            xfbb.setZb(null);
+            xfbb.setXfzt("0");
+            if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) {
+                SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh());
+                xfbb.setLx(user1.getType());
+            }
+            WebSocketObject obj = new WebSocketObject("04", xfbb, null);
+            this.tbWebSocketAdaptRemoteService.sendBbMessage(obj);
+        }
+
+    }
+
+    @Override
+    public int getsfbb(String id) {
+        return this.baseMapper.getsfbb(id);
+    }
+
+
+    public Integer updateById(String id, LocationInfo locationInfo) {
+        TbQwXfbb xfbb = this.baseMapper.queryById(id);
+        if (xfbb == null) {
+            return 0;
+        }
+        XfbbUpdateDto dto = new XfbbUpdateDto();
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        Integer lc = DistanceUtils.getLc(xfbb.getXflc(), xfbb.getJd(), xfbb.getWd(), jd, wd);
+        Integer sc = DistanceUtils.getSc(xfbb.getBbkssj());
+        dto.setId(xfbb.getId());
+        dto.setJd(jd);
+        dto.setWd(wd);
+        dto.setZb(JtsUtils.getPoint(jd, wd));
+        dto.setZbhash(GeoHashKit.encode(jd, wd));
+        dto.setZbsj(new Date());
+        dto.setXflc(lc);
+//        dto.setXfsc(sc);
+        return this.baseMapper.updateXfbb(dto);
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwZnzbServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwZnzbServiceImpl.java
new file mode 100644
index 0000000..7cf33bc
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbQwZnzbServiceImpl.java
@@ -0,0 +1,21 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import com.mosty.wzzx.mapper.TbQwZnzbMapper;
+import com.mosty.wzzx.service.TbQwZnzbService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class TbQwZnzbServiceImpl extends ServiceImpl<TbQwZnzbMapper, TbQwZnzb> implements TbQwZnzbService {
+
+    public List<TbQwZnzb> queryListByYwid(List<String> ywidList) {
+        return this.baseMapper.queryListByYwid(ywidList);
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbSjCyjlServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbSjCyjlServiceImpl.java
new file mode 100644
index 0000000..c4a38a6
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbSjCyjlServiceImpl.java
@@ -0,0 +1,52 @@
+package com.mosty.wzzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.dto.wzzx.SjCyjlUpdateDto;
+import com.mosty.base.model.entity.sjzx.TbSjCyjl;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.wzzx.mapper.TbSjCyjlMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.TbSjCyjlService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+public class TbSjCyjlServiceImpl extends ServiceImpl<TbSjCyjlMapper, TbSjCyjl> implements TbSjCyjlService {
+
+    @Resource
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    public Integer updateJlZb(LocationInfo locationInfo) {
+        if (StringUtils.isBlank(locationInfo.getUserId())) {
+            return 0;
+        }
+        TbSjCyjl cyjl = this.baseMapper.queryBySfzh(locationInfo.getUserId());
+        if (cyjl != null) {
+            SjCyjlUpdateDto dto = new SjCyjlUpdateDto();
+            BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+            BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+            dto.setId(cyjl.getId());
+            dto.setJd(jd);
+            dto.setWd(wd);
+            JSONObject json = this.tbBaseAdaptRemoteService.getAddress(jd.toString(),wd.toString());
+            if(json != null){
+                dto.setDqwz(json.getString("address"));
+            }
+            dto.setZb(JtsUtils.getPoint(jd, wd));
+            dto.setZbhash(GeoHashKit.encode(jd, wd));
+            dto.setZbsj(new Date());
+            return this.baseMapper.updateZb(dto);
+        }
+        return 0;
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzLswzServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzLswzServiceImpl.java
new file mode 100644
index 0000000..0d91c07
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzLswzServiceImpl.java
@@ -0,0 +1,114 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.DistanceUtils;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.wzzx.mapper.TbWzLswzMapper;
+import com.mosty.wzzx.mapper.TbWzSswzMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.TbWzLswzService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import sun.util.resources.sq.LocaleNames_sq;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+public class TbWzLswzServiceImpl extends ServiceImpl<TbWzSswzMapper, TbWzSswz> implements TbWzLswzService {
+
+    private final TbWzLswzMapper tbWzLswzMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    public void saveLswz(LocationInfo locationInfo, TbWzRywz oldRywz) {
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        BigDecimal oldJd = null;
+        BigDecimal oldWd = null;
+        Date oldTime = null;
+        if (oldRywz != null) {
+            oldJd = oldRywz.getJd();
+            oldWd = oldRywz.getWd();
+//            oldTime = oldRywz.getJssj();
+        }
+        if (locationInfo.getLastTime() != null) {
+            oldTime = locationInfo.getLastTime();
+        }
+        TbWzLswz lswz = new TbWzLswz();
+        Integer lc = DistanceUtils.getLc(0, oldJd, oldWd, jd, wd);
+        Integer sc = DistanceUtils.getSc(oldTime);
+        String sjly = "移动设备";
+        if (StringUtils.isNotBlank(locationInfo.getUserName())) {
+            sjly = sjly + "-" + locationInfo.getUserName();
+        }
+        if (StringUtils.isNotBlank(locationInfo.getUserId())) {
+            sjly = sjly + "-" + locationInfo.getUserId();
+        }
+        lswz.setSjly(sjly);
+        lswz.setSjlydm("02");
+        lswz.setYwid(locationInfo.getBbid());
+        lswz.setJzId(locationInfo.getJzid());
+        lswz.setJzMc(locationInfo.getJzmc());
+        lswz.setDwrq(new Date());
+        lswz.setDwsj(new Date());
+        lswz.setJd(jd);
+        lswz.setWd(wd);
+        lswz.setXfsc(sc);
+        lswz.setXflc(lc);
+        lswz.setZb(JtsUtils.getPoint(jd, wd));
+        lswz.setZbhash(GeoHashKit.encode(jd, wd));
+        lswz.setYhId(locationInfo.getYhid());
+        lswz.setYhXm(locationInfo.getUserName());
+        lswz.setYhSfzh(locationInfo.getUserId());
+        lswz.setWztgz("02");//综合定位
+        lswz.setXtSjly("1");
+
+        if (ObjectUtils.isNotEmpty(oldRywz)) {
+            lswz.setSsbm(oldRywz.getSsbm());
+            lswz.setSsbmdm(oldRywz.getSsbmdm());
+            lswz.setSsbmid(oldRywz.getSsbmid());
+            lswz.setSsxgaj(oldRywz.getSsxgaj());
+            lswz.setSsxgajid(oldRywz.getSsxgajid());
+            lswz.setSsxgajdm(oldRywz.getSsxgajdm());
+            lswz.setSssgajid(oldRywz.getSssgajid());
+            lswz.setSssgaj(oldRywz.getSssgaj());
+            lswz.setSssgajdm(oldRywz.getSssgajdm());
+        } else {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(locationInfo.getDeptId());
+            if (dept != null) {
+                lswz.setSsbm(dept.getDeptname());
+                lswz.setSsbmdm(dept.getDeptcode());
+                lswz.setSsbmid(dept.getDeptid());
+                lswz.setSsxgaj(dept.getFxjname());
+                lswz.setSsxgajid(dept.getFxjid());
+                lswz.setSsxgajdm(dept.getFxjcode());
+                lswz.setSssgajid(dept.getDszid());
+                lswz.setSssgaj(dept.getDszname());
+                lswz.setSssgajdm(dept.getDszcode());
+            }
+        }
+        lswz.setGuo(locationInfo.getCountry());
+        lswz.setSheng(locationInfo.getProvinc());
+        lswz.setShi(locationInfo.getCity());
+        lswz.setCsbm(locationInfo.getCityCode());
+        lswz.setSsqx(locationInfo.getDistrict());
+        lswz.setQxbm(locationInfo.getAdCode());
+        lswz.setDzxz(locationInfo.getAddress());
+        lswz.setDzjc(locationInfo.getPoiName());
+        lswz.setDwbz(locationInfo.getZbly());
+        tbWzLswzMapper.insertEntity(lswz);
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSblswzServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSblswzServiceImpl.java
new file mode 100644
index 0000000..c28f1e1
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSblswzServiceImpl.java
@@ -0,0 +1,47 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.entity.wzzx.TbWzSblswz;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.wzzx.mapper.TbWzSblswzMapper;
+import com.mosty.wzzx.mongodb.TbWzSblswzMongoService;
+import com.mosty.wzzx.mongodb.entity.TbWzSblswzMo;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.TbWzSblswzService;
+import com.mosty.wzzx.service.TbWzSbsswzService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Service
+public class TbWzSblswzServiceImpl extends ServiceImpl<TbWzSblswzMapper, TbWzSblswz>
+        implements TbWzSblswzService {
+
+    @Resource
+    private TbWzSblswzMongoService tbWzSblswzMongoService;
+
+    public void saveSblswz(TbWzSbsswz sbsswz) {
+        if (ObjectUtils.isNotEmpty(sbsswz)) {
+            TbWzSblswz wz = new TbWzSblswz();
+            BeanUtils.copyProperties(sbsswz, wz);
+            wz.setZb(JtsUtils.getPoint(wz.getJd(), wz.getWd()));
+            this.baseMapper.insertEntity(wz);
+            TbWzSblswzMo mo = new TbWzSblswzMo();
+            BeanUtils.copyProperties(wz, mo);
+            this.tbWzSblswzMongoService.save(mo);
+        }
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSbsswzServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSbsswzServiceImpl.java
new file mode 100644
index 0000000..47d3b48
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSbsswzServiceImpl.java
@@ -0,0 +1,244 @@
+package com.mosty.wzzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.jcgl.TbJcglSbdwVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.model.vo.yjzl.TbFzycPzVo;
+import com.mosty.base.utils.*;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.wzzx.mapper.TbWzSbsswzMapper;
+import com.mosty.wzzx.mapper.TbWzXfwzMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.remote.TbQwzxAdaptRemoteService;
+import com.mosty.wzzx.remote.TbWebSocketAdaptRemoteService;
+import com.mosty.wzzx.remote.TbYjzlAdaptRemoteService;
+import com.mosty.wzzx.service.TbQwXfbbService;
+import com.mosty.wzzx.service.TbWzSbsswzService;
+import com.mosty.wzzx.udp.UdpLzEntity;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+public class TbWzSbsswzServiceImpl extends ServiceImpl<TbWzSbsswzMapper, TbWzSbsswz> implements TbWzSbsswzService {
+
+    private final RedisService redisService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbWzXfwzMapper tbWzXfwzMapper;
+    private final TbYjzlAdaptRemoteService tbYjzlAdaptRemoteService;
+    private final TbQwXfbbService tbQwXfbbService;
+
+    // 查询巡组实时位置,如果5分钟没有GPS信号，则保存设备的位置信息
+    private void saveXzwz(TbQwXfbb bb, TbWzSbsswz sbsswz) {
+        String redisKey = Constant.WZ_XFWZ + sbsswz.getYwid();
+        TbWzXfwz xfwz = redisService.getCacheObject(redisKey);
+//        TbWzXfwz xfwz = this.tbWzXfwzMapper.queryByBbid(bb.getId());
+        if (ObjectUtils.isNotEmpty(xfwz)) {
+            Integer lc = DistanceUtils.getLc(bb.getXflc(), xfwz.getJd(), xfwz.getWd(), sbsswz.getJd(), sbsswz.getWd());
+            List<BigDecimal[]> list = xfwz.getZbList();
+//            if (sbsswz.getDwsj().getTime() - xfwz.getZhgxsj().getTime() >= 5 * 60 * 1000) {
+            xfwz.setJd(sbsswz.getJd());
+            xfwz.setWd(sbsswz.getWd());
+            xfwz.setZhgxsj(new Date());
+            if (CollectionUtils.isEmpty(list)) {
+                list = new ArrayList<>();
+            }
+            BigDecimal[] decimals = new BigDecimal[2];
+            decimals[0] = sbsswz.getJd();
+            decimals[1] = sbsswz.getWd();
+            list.add(decimals);
+            if (list.size() == 1) {
+                list.add(decimals);
+            }
+            if (list.size() >= 3) {
+                BigDecimal[] decimal0 = list.get(0);
+                BigDecimal[] decimal1 = list.get(1);
+                if (decimal0 == decimal1) {
+                    list.remove(0);
+                }
+            }
+            xfwz.setZb(JtsUtils.createLine(list));
+            xfwz.setZbsl(list.size());
+            xfwz.setZbList(list);
+            xfwz.setZxzt("1");
+            this.tbWzXfwzMapper.update(xfwz);
+            xfwz.setZb(null);
+            //修改数据 报备数据
+            this.tbQwXfbbService.updateXfbbUdp(bb, sbsswz, lc);
+            redisService.setCacheObject(redisKey, xfwz);
+//            }
+        } else {
+            xfwz = new TbWzXfwz();
+            xfwz.setJd(sbsswz.getJd());
+            xfwz.setWd(sbsswz.getWd());
+            xfwz.setZhgxsj(new Date());
+            List<BigDecimal[]> list = new ArrayList<>();
+            BigDecimal[] decimals = new BigDecimal[2];
+            decimals[0] = sbsswz.getJd();
+            decimals[1] = sbsswz.getWd();
+            list.add(decimals);
+            if (list.size() == 1) {
+                list.add(decimals);
+            }
+            if (list.size() >= 3) {
+                BigDecimal[] decimal0 = list.get(0);
+                BigDecimal[] decimal1 = list.get(1);
+                if (decimal0 == decimal1) {
+                    list.remove(0);
+                }
+            }
+            xfwz.setZb(JtsUtils.createLine(list));
+            xfwz.setZbsl(list.size());
+            xfwz.setZxzt("1");
+            xfwz.setZbList(list);
+            xfwz.setBbId(bb.getId());
+            xfwz.setYhId(bb.getFzrId());
+            xfwz.setYhSfzh(bb.getFzrSfzh());
+            xfwz.setYhXm(bb.getFzrXm());
+            xfwz.setJzId(bb.getJzId());
+            xfwz.setJzMc(bb.getJzId());
+            xfwz.setId(UUIDGenerator.getUUID());
+            xfwz.setZbsl(list.size());
+            xfwz.setDwrq(new Date());
+            xfwz.setKssj(new Date());
+            xfwz.setXtSjly("1");
+            xfwz.setSsbm(bb.getSsbm());
+            xfwz.setSsbmdm(bb.getSsbmdm());
+            xfwz.setSsbmid(bb.getSsbmid());
+            xfwz.setSsxgaj(bb.getSsxgaj());
+            xfwz.setSsxgajid(bb.getSsxgajid());
+            xfwz.setSsxgajdm(bb.getSsxgajdm());
+            xfwz.setSssgajid(bb.getSssgajid());
+            xfwz.setSssgaj(bb.getSssgaj());
+            xfwz.setSssgajdm(bb.getSssgajdm());
+
+            this.tbWzXfwzMapper.insert(xfwz);
+            xfwz.setZb(null);
+            //修改数据 报备数据
+            this.tbQwXfbbService.updateXfbbUdp(bb, sbsswz, 0);
+            redisService.setCacheObject(redisKey, xfwz);
+        }
+
+
+    }
+
+    @Override
+    public TbWzSbsswz saveSbsswz(UdpLzEntity lzEntity) {
+        TbJcglSbdwVo sbdwVo = redisService.getCacheObject(Constant.PGIS_SB + lzEntity.getPgisId());
+        //udp数量太多 如果设备里面没有数据 udp数据就先不保存
+        if (ObjectUtils.isNotEmpty(sbdwVo)) {
+            String redisKey = Constant.WZ_SBWZ + lzEntity.getPgisId() + "-" +
+                    DateUtils.getQueryDateString(new Date(), "01");
+            BigDecimal jd = BigDecimal.valueOf(lzEntity.getLng());
+            BigDecimal wd = BigDecimal.valueOf(lzEntity.getLat());
+            TbWzSbsswz oldSbsswz = redisService.getCacheObject(redisKey);
+            BigDecimal oldJd = null;
+            BigDecimal oldWd = null;
+            Timestamp oldTime = null;
+            if (oldSbsswz != null) {
+                oldJd = oldSbsswz.getJd();
+                oldWd = oldSbsswz.getWd();
+                oldTime = new Timestamp(oldSbsswz.getDwsj().getTime());
+            }
+
+            TbWzSbsswz sbsswz = new TbWzSbsswz();
+            Integer lc = DistanceUtils.getLc(0, oldJd, oldWd, jd, wd);
+            Integer sc = DistanceUtils.getSc(oldTime);
+            sbsswz.setSbid(lzEntity.getPgisId());
+            sbsswz.setSbmc("LZ-" + lzEntity.getPgisId());
+            sbsswz.setSjly("UDP推送位置信息");
+            sbsswz.setSjlydm("86");
+            sbsswz.setDwrq(lzEntity.getTime());
+            sbsswz.setDwsj(lzEntity.getTime());
+            sbsswz.setJd(jd);
+            sbsswz.setWd(wd);
+            sbsswz.setXfsc(sc);
+            sbsswz.setXflc(lc);
+            sbsswz.setZb(JtsUtils.getPoint(jd, wd));
+            sbsswz.setZbhash(GeoHashKit.encode(jd, wd));
+            sbsswz.setWztgz("03");
+            sbsswz.setXtSjly("1");
+            sbsswz.setDwbz("03");
+            sbsswz.setSsbm("四川省德阳市公安局");
+            sbsswz.setSsbmdm("510600000000");
+            sbsswz.setSsbmid("44015");
+            sbsswz.setSsxgaj("四川省德阳市公安局");
+            sbsswz.setSsxgajid("44015");
+            sbsswz.setSsxgajdm("510600000000");
+            sbsswz.setSssgajid("44015");
+            sbsswz.setSssgaj("四川省德阳市公安局");
+            sbsswz.setSssgajdm("510600000000");
+
+            List<TbQwXfbb> bbList = new ArrayList<>();
+            if (ObjectUtils.isNotEmpty(sbdwVo)) {
+                sbsswz.setSbmc(sbdwVo.getSbmc());
+                sbsswz.setSjlydm(sbdwVo.getScode());
+                sbsswz.setSsbm(sbdwVo.getSsbm());
+                sbsswz.setSsbmdm(sbdwVo.getSsbmdm());
+                sbsswz.setSsbmid(sbdwVo.getSsbmid());
+                sbsswz.setSsxgaj(sbdwVo.getSsxgaj());
+                sbsswz.setSsxgajid(sbdwVo.getSsxgajid());
+                sbsswz.setSsxgajdm(sbdwVo.getSsxgajdm());
+                sbsswz.setSssgajid(sbdwVo.getSssgajid());
+                sbsswz.setSssgaj(sbdwVo.getSssgaj());
+                sbsswz.setSssgajdm(sbdwVo.getSssgajdm());
+            }
+            // 查询是否有该设备的报备信息
+            if (StringUtils.isNotEmpty(sbsswz.getSjlydm()) && sbsswz.getSjlydm().equals("05")) {
+                bbList = this.tbQwzxAdaptRemoteService.getClBbList(lzEntity.getPgisId());
+            } else {
+                bbList = this.tbQwzxAdaptRemoteService.getBbList(lzEntity.getPgisId());
+            }
+            if (!CollectionUtils.isEmpty(bbList)) {
+                for (TbQwXfbb bb : bbList) {
+//                TbQwXfbb bb = bbList.get(0);
+                    sbsswz.setYhId(bb.getFzrId());
+                    sbsswz.setYhXm(bb.getFzrXm());
+                    sbsswz.setYhSfzh(bb.getFzrSfzh());
+                    sbsswz.setJzId(bb.getJzId());
+                    sbsswz.setJzMc(bb.getJzMc());
+                    sbsswz.setYwid(bb.getId());
+                    sbsswz.setSsbm(bb.getSsbm());
+                    sbsswz.setSsbmdm(bb.getSsbmdm());
+                    sbsswz.setSsbmid(bb.getSsbmid());
+                    sbsswz.setSssgaj(bb.getSssgaj());
+                    sbsswz.setSssgajdm(bb.getSssgajdm());
+                    sbsswz.setSssgajid(bb.getSssgajid());
+                    // 查询巡组实时位置,如果5分钟没有GPS信号，则保存设备的位置信息 （直接判断bb是否在线 在线不添加 不在线 写入数据）
+                    if (bb.getXfzt().equals("2")) {
+                        this.saveXzwz(bb, sbsswz);
+                    }
+                }
+            }
+            this.baseMapper.insertEntity(sbsswz);
+            sbsswz.setZb(null);
+            redisService.setCacheObject(redisKey, sbsswz);
+            return sbsswz;
+        }
+        return null;
+    }
+
+
+    public void delHistory() {
+        this.baseMapper.delHistory();
+    }
+
+
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSswzServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSswzServiceImpl.java
new file mode 100644
index 0000000..4e86f30
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzSswzServiceImpl.java
@@ -0,0 +1,228 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.LocationInfo;
+import com.mosty.base.model.entity.wzzx.TbWzLswz;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSswz;
+import com.mosty.base.model.query.wzzx.TbWzRywzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSswzSearchDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.*;
+import com.mosty.wzzx.mapper.TbWzLswzMapper;
+import com.mosty.wzzx.mapper.TbWzRywzMapper;
+import com.mosty.wzzx.mapper.TbWzSswzMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.TbWzSswzService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class TbWzSswzServiceImpl extends ServiceImpl<TbWzSswzMapper, TbWzSswz> implements TbWzSswzService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbWzLswzMapper tbWzLswzMapper;
+    private final TbWzRywzMapper tbWzRywzMapper;
+
+    public void saveSswz(LocationInfo locationInfo, TbWzRywz oldRywz) {
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        BigDecimal oldJd = null;
+        BigDecimal oldWd = null;
+        Date oldTime = null;
+        if (oldRywz != null) {
+            oldJd = oldRywz.getJd();
+            oldWd = oldRywz.getWd();
+        }
+        if (locationInfo.getLastTime() != null) {
+            oldTime = locationInfo.getLastTime();
+        }
+        TbWzSswz sswz = new TbWzSswz();
+        Integer lc = DistanceUtils.getLc(0, oldJd, oldWd, jd, wd);
+        Integer sc = DistanceUtils.getSc(oldTime);
+        sswz.setSjlydm("02");
+        String sjly = "移动设备";
+        if (StringUtils.isNotBlank(locationInfo.getUserName())) {
+            sjly = sjly + "-" + locationInfo.getUserName();
+        }
+        if (StringUtils.isNotBlank(locationInfo.getUserId())) {
+            sjly = sjly + "-" + locationInfo.getUserId();
+        }
+        sswz.setSjly(sjly);
+        sswz.setYwid(locationInfo.getBbid());
+        sswz.setJzId(locationInfo.getJzid());
+        sswz.setJzMc(locationInfo.getJzmc());
+        sswz.setDwrq(new Date());
+        sswz.setDwsj(new Date());
+        sswz.setJd(jd);
+        sswz.setWd(wd);
+        sswz.setXfsc(sc);
+        sswz.setXflc(lc);
+        sswz.setZb(JtsUtils.getPoint(jd, wd));
+        sswz.setZbhash(GeoHashKit.encode(jd, wd));
+        sswz.setYhId(locationInfo.getYhid());
+        sswz.setYhXm(locationInfo.getUserName());
+        sswz.setYhSfzh(locationInfo.getUserId());
+        sswz.setJrbh(locationInfo.getAccessNumber());
+        sswz.setWztgz("02");//综合定位
+        if (ObjectUtils.isNotEmpty(oldRywz)) {
+            sswz.setSsbm(oldRywz.getSsbm());
+            sswz.setSsbmdm(oldRywz.getSsbmdm());
+            sswz.setSsbmid(oldRywz.getSsbmid());
+            sswz.setSsxgaj(oldRywz.getSsxgaj());
+            sswz.setSsxgajid(oldRywz.getSsxgajid());
+            sswz.setSsxgajdm(oldRywz.getSsxgajdm());
+            sswz.setSssgajid(oldRywz.getSssgajid());
+            sswz.setSssgaj(oldRywz.getSssgaj());
+            sswz.setSssgajdm(oldRywz.getSssgajdm());
+        } else {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(locationInfo.getDeptId());
+            if (dept != null) {
+                sswz.setSsbm(dept.getDeptname());
+                sswz.setSsbmdm(dept.getDeptcode());
+                sswz.setSsbmid(dept.getDeptid());
+                sswz.setSsxgaj(dept.getFxjname());
+                sswz.setSsxgajid(dept.getFxjid());
+                sswz.setSsxgajdm(dept.getFxjcode());
+                sswz.setSssgajid(dept.getDszid());
+                sswz.setSssgaj(dept.getDszname());
+                sswz.setSssgajdm(dept.getDszcode());
+            }
+        }
+        sswz.setGuo(locationInfo.getCountry());
+        sswz.setSheng(locationInfo.getProvinc());
+        sswz.setShi(locationInfo.getCity());
+        sswz.setCsbm(locationInfo.getCityCode());
+        sswz.setSsqx(locationInfo.getDistrict());
+        sswz.setQxbm(locationInfo.getAdCode());
+        sswz.setDzxz(locationInfo.getAddress());
+        sswz.setDzjc(locationInfo.getPoiName());
+        sswz.setDwbz(locationInfo.getZbly());
+        this.baseMapper.insertEntity(sswz);
+    }
+
+    public TbWzSswz insert(LocationInfo locationInfo) {
+        TbWzSswz fronSswz = this.baseMapper.querySswzNow(locationInfo.getUserId(), null);
+        TbWzSswz sswz = new TbWzSswz();
+        BigDecimal jd = BigDecimal.valueOf(locationInfo.getLng());
+        BigDecimal wd = BigDecimal.valueOf(locationInfo.getLat());
+        Integer lc = 0;
+        Integer sc = 0;
+        if (fronSswz != null) {
+            lc = DistanceUtils.getLc(0, fronSswz.getJd(), fronSswz.getWd(), jd, wd);
+            sc = DistanceUtils.getSc(fronSswz.getDwsj());
+        }
+        sswz.setYhId(locationInfo.getUserId());
+        sswz.setYhXm(locationInfo.getUserName());
+        sswz.setYhSfzh(locationInfo.getUserId());
+        String sjly = "移动设备";
+        if (StringUtils.isNotBlank(locationInfo.getUserName())) {
+            sjly = sjly + "-" + locationInfo.getUserName();
+        }
+        if (StringUtils.isNotBlank(locationInfo.getUserId())) {
+            sjly = sjly + "-" + locationInfo.getUserId();
+        }
+        sswz.setSjly(sjly);
+        sswz.setSjlydm("02");
+        sswz.setDwrq(new Date());
+        sswz.setDwsj(new Date());
+        sswz.setJd(jd);
+        sswz.setWd(wd);
+        sswz.setZb(JtsUtils.getPoint(jd, wd));
+        sswz.setZbhash(GeoHashKit.encode(jd, wd));
+        sswz.setJrbh(locationInfo.getAccessNumber());
+        sswz.setWztgz("02");//综合定位
+        sswz.setXtSjly("1");
+        sswz.setId(UUIDGenerator.getUUID());
+        sswz.setGuo(locationInfo.getCountry());
+        sswz.setSheng(locationInfo.getProvinc());
+        sswz.setShi(locationInfo.getCity());
+        sswz.setQxbm(locationInfo.getCityCode());
+        sswz.setDzxz(locationInfo.getAddress());
+        sswz.setDzjc(locationInfo.getPoiName());
+        sswz.setYwid(locationInfo.getBbid());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(locationInfo.getDeptId());
+        if (dept != null) {
+            sswz.setSsbm(dept.getDeptname());
+            sswz.setSsbmdm(dept.getDeptcode());
+            sswz.setSsbmid(dept.getDeptid());
+            sswz.setSsxgaj(dept.getFxjname());
+            sswz.setSsxgajid(dept.getFxjid());
+            sswz.setSsxgajdm(dept.getFxjcode());
+            sswz.setSssgajid(dept.getDszid());
+            sswz.setSssgaj(dept.getDszname());
+            sswz.setSssgajdm(dept.getDszcode());
+        }
+        sswz.setXfsc(sc);
+        sswz.setXflc(lc);
+        this.baseMapper.insertEntity(sswz);
+        return sswz;
+    }
+
+    public TbWzSswz insertEntity(TbWzSswz sswz) {
+        this.baseMapper.insertEntity(sswz);
+        return sswz;
+    }
+
+    public TbWzSswz queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+
+    public TbWzSswz querySswzNow(String yhid, String jrbh) {
+        return this.baseMapper.querySswzNow(yhid, jrbh);
+    }
+
+    public void delHistory() {
+        this.baseMapper.delHistory();
+    }
+
+    @Override
+    public IPage<TbWzSswz> getRygjList(TbWzSswzSearchDto dto) {
+        IPage<TbWzLswz> page = this.tbWzLswzMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbWzLswz>()
+                        .eq(TbWzLswz::getYhSfzh, dto.getSfzh())
+                        .eq(TbWzLswz::getXtSjzt, "1")
+                        .ge(TbWzLswz::getDwrq, dto.getDwrq())
+        );
+        IPage<TbWzSswz> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbWzSswz> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbWzSswz sswz = new TbWzSswz();
+                BeanUtils.copyProperties(item, sswz);
+                sswz.setZb(null);
+                resList.add(sswz);
+            });
+            resPage.setRecords(resList);
+            resPage.setTotal(page.getTotal());
+        }
+        return resPage;
+    }
+
+    @Override
+    public TbWzRywz getRywz(TbWzRywzSearchDto dto) {
+        TbWzRywz wz = this.tbWzRywzMapper.selectBySfz(dto);
+        if (wz != null) {
+            wz.setZbList(JtsUtils.decodeLineString(wz.getZb()));
+            wz.setZb(null);
+        }
+        return wz;
+    }
+}
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzXfwzServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzXfwzServiceImpl.java
new file mode 100644
index 0000000..193361b
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/TbWzXfwzServiceImpl.java
@@ -0,0 +1,338 @@
+package com.mosty.wzzx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.wzzx.AppLocationReceiveDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.wzzx.*;
+import com.mosty.base.model.query.wzzx.TbWzLswzSearchDto;
+import com.mosty.base.model.query.wzzx.TbWzSbLswzSearchDto;
+import com.mosty.base.utils.*;
+import com.mosty.base.utils.mongo.core.wrapper.Wrappers;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.wzzx.mapper.*;
+import com.mosty.wzzx.mongodb.TbWzSblswzMongoService;
+import com.mosty.wzzx.mongodb.entity.TbWzSblswzMo;
+import com.mosty.wzzx.service.TbWzXfwzService;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+public class TbWzXfwzServiceImpl extends ServiceImpl<TbWzXfwzMapper, TbWzXfwz> implements TbWzXfwzService {
+
+    private final TbWzRywzMapper tbWzRywzMapper;
+    private final TbWzSswzMapper tbWzSswzMapper;
+    private final TbWzLswzMapper tbWzLswzMapper;
+    private final TbQwXfbbMapper tbQwXfbbMapper;
+    private final TbWzSblswzMapper tbWzSblswzMapper;
+    private final TbWzSblswzMongoService tbWzSblswzMongoService;
+
+
+    public List<TbWzXfwz> queryAll() {
+        return this.baseMapper.queryAll();
+    }
+
+    public TbWzXfwz queryById(String id) {
+        return this.baseMapper.queryById(id);
+    }
+
+    public TbWzXfwz insert(TbWzXfwz tbWzXfwz) {
+        this.baseMapper.insert(tbWzXfwz);
+        return tbWzXfwz;
+    }
+
+    public TbWzXfwz update(TbWzXfwz tbWzXfwz) {
+        this.baseMapper.update(tbWzXfwz);
+        return this.queryById(tbWzXfwz.getId());
+    }
+
+    public boolean deleteById(String id) {
+        return this.baseMapper.deleteById(id) > 0;
+    }
+
+    public Object selectTrack(TbWzXfwz tbWzXfwz) {
+        TbWzXfwz xfwz = this.baseMapper.queryByBbid(tbWzXfwz.getBbId());
+        if (ObjectUtils.isNotEmpty(xfwz)) {
+            List<BigDecimal[]> list = JtsUtils.decodeLineString(xfwz.getZb());
+          /*  if (CollectionUtils.isEmpty(list)) {
+                list = new ArrayList<>();
+            }
+            if (list.size() >= 3) {
+                BigDecimal[] decimal0 = list.get(0);
+                BigDecimal[] decimal1 = list.get(1);
+                if (decimal0 == decimal1) {
+                    list.remove(0);
+                }
+            }*/
+            xfwz.setZb(null);
+            xfwz.setZbList(list);
+        }
+        return xfwz;
+    }
+
+    @Override
+    public Object selectLswz(TbWzLswzSearchDto dto) {
+        if (StringUtils.isEmpty(dto.getBbId())) throw new BusinessException("报备业务ID为空！");
+        if (StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(DateUtils.getSystemDateString());
+        }
+        List<TbWzLswz> tbWzLswzs = this.tbWzLswzMapper.selectList(new LambdaQueryWrapper<TbWzLswz>()
+                .eq(StringUtils.isNotBlank(dto.getBbId()), TbWzLswz::getYwid, dto.getBbId())
+                .ge(StringUtils.isNotBlank(dto.getKssj()), TbWzLswz::getDwsj, dto.getKssj())
+                .le(StringUtils.isNotBlank(dto.getJssj()), TbWzLswz::getDwsj, dto.getJssj())
+                .orderByAsc(TbWzLswz::getDwsj)
+        );
+        return tbWzLswzs;
+    }
+
+    @Override
+    public Object selectSbLswz(TbWzSbLswzSearchDto dto) {
+        if (StringUtils.isEmpty(dto.getGpsId())) throw new BusinessException("设备id为空！");
+        if (StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(DateUtils.getSystemDateString());
+        }
+        List<TbWzSblswz> tbWzLswzs = this.tbWzSblswzMapper.selectList(new LambdaQueryWrapper<TbWzSblswz>()
+                .eq(StringUtils.isNotBlank(dto.getGpsId()), TbWzSblswz::getSbid, dto.getGpsId())
+                .ge(StringUtils.isNotBlank(dto.getKssj()), TbWzSblswz::getXtCjsj, dto.getKssj())
+                .le(StringUtils.isNotBlank(dto.getJssj()), TbWzSblswz::getXtCjsj, dto.getJssj())
+                .orderByAsc(TbWzSblswz::getXtCjsj)
+        );
+        return tbWzLswzs;
+    }
+
+    @Override
+    public Object selectSbLswzMo(TbWzSbLswzSearchDto dto) {
+        if (StringUtils.isEmpty(dto.getGpsId())) throw new BusinessException("设备id为空！");
+        if (StringUtils.isEmpty(dto.getKssj())) {
+            dto.setKssj(DateUtils.getSystemDateString() + " 00:00:00");
+        }
+        com.mosty.base.utils.mongo.core.wrapper.LambdaQueryWrapper<TbWzSblswzMo> query = Wrappers.<TbWzSblswzMo>lambdaQuery()
+                .eq(StringUtils.isNotBlank(dto.getGpsId()), TbWzSblswzMo::getSbid, dto.getGpsId())
+                .ge(StringUtils.isNotBlank(dto.getKssj()), TbWzSblswzMo::getXtCjsj, DateUtils.dateToISODate(dto.getKssj()));
+        if (StringUtils.isNotBlank(dto.getJssj())) {
+            query.le(TbWzSblswzMo::getXtCjsj, DateUtils.dateToISODate(dto.getJssj()));
+        }
+        query.orderByAsc(TbWzSblswzMo::getXtCjsj);
+        List<TbWzSblswzMo> list = tbWzSblswzMongoService.list(query);
+        return list;
+    }
+
+    public Boolean locationReceive(AppLocationReceiveDto receiveDto) {
+        //经度、纬度为空不接收数据
+        if (receiveDto.getJd() == null && receiveDto.getWd() == null) {
+            return false;
+        }
+        //保存人员预警
+        TbWzRywz rywz = saveRywz(receiveDto);
+        TbQwXfbb bbxx = null;
+        if (StringUtils.isNotBlank(receiveDto.getBbid())) {
+            bbxx = tbQwXfbbMapper.queryById(receiveDto.getBbid());
+        }
+        saveSsjl(receiveDto, bbxx, rywz);
+        saveLsjl(receiveDto, bbxx, rywz);
+        if (bbxx != null) {
+            saveXfwz(receiveDto, bbxx, rywz);
+        }
+        return true;
+    }
+
+    public TbWzRywz saveRywz(AppLocationReceiveDto receiveDto) {
+        TbWzRywz rywz = tbWzRywzMapper.queryBySfzh(receiveDto.getYhSfzh());
+        if (rywz == null) {
+            rywz = new TbWzRywz();
+        }
+        rywz.setYhId(receiveDto.getYhid());
+        rywz.setYhXm(receiveDto.getYhxm());
+        rywz.setYhSfzh(receiveDto.getYhSfzh());
+        rywz.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        List<BigDecimal[]> list = JtsUtils.decodeLineString(rywz.getZb());
+        if (CollectionUtils.isEmpty(list)) {
+            list = new ArrayList<>();
+        }
+        Integer lc = DistanceUtils.getLc(rywz.getLc(), rywz.getJd(), rywz.getWd(), receiveDto.getJd(),
+                receiveDto.getWd());
+        Integer sc = DistanceUtils.getSc(rywz.getZhgxsj());
+        BigDecimal[] decimals = new BigDecimal[2];
+        decimals[0] = receiveDto.getJd();
+        decimals[1] = receiveDto.getWd();
+        list.add(decimals);
+        if (list.size() == 1) {
+            list.add(decimals);
+        }
+        if (list.size() >= 3) {
+            BigDecimal[] decimal0 = list.get(0);
+            BigDecimal[] decimal1 = list.get(1);
+            if (decimal0 == decimal1) {
+                list.remove(0);
+            }
+        }
+        rywz.setLc(lc);
+        rywz.setSc(sc);
+        rywz.setZb(JtsUtils.createLine(list));
+        rywz.setZbsl(list.size());
+        rywz.setJd(receiveDto.getJd());
+        rywz.setWd(receiveDto.getWd());
+        rywz.setZhgxsj(new Timestamp(System.currentTimeMillis()));
+        rywz.setXtSjly("1");
+        rywz.setJd(receiveDto.getJd());
+        rywz.setWd(receiveDto.getWd());
+        rywz.setSsxgajdm("510109000000");
+        rywz.setSsxgajid("1");
+        rywz.setSsxgaj("高新区分局");
+        rywz.setSssgaj("成都市公安局");
+        rywz.setSssgajdm("510100000000");
+        rywz.setSssgajid("10001");
+        if (StringUtils.isBlank(rywz.getId())) {
+            rywz.setId(UUIDGenerator.getUUID());
+            rywz.setKssj(new Date());
+            rywz.setDwrq(new Date());
+            rywz.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+            tbWzRywzMapper.insertEntity(rywz);
+        } else {
+            tbWzRywzMapper.updateEntity(rywz);
+        }
+        return rywz;
+    }
+
+    public void saveXfwz(AppLocationReceiveDto receiveDto, TbQwXfbb bbxx, TbWzRywz rywz) {
+        TbWzXfwz xfwz = this.baseMapper.queryByBbid(receiveDto.getBbid());
+        if (xfwz == null) {
+            xfwz = new TbWzXfwz();
+        }
+        Integer lc = DistanceUtils.getLc(rywz.getLc(), rywz.getJd(), rywz.getWd(), receiveDto.getJd(),
+                receiveDto.getWd());
+        Integer sc = DistanceUtils.getSc(rywz.getZhgxsj());
+        xfwz.setBbId(receiveDto.getBbid());
+        xfwz.setYhId(receiveDto.getYhid());
+        xfwz.setYhSfzh(receiveDto.getYhSfzh());
+        xfwz.setYhXm(receiveDto.getYhxm());
+        xfwz.setJzId(bbxx.getJzId());
+        xfwz.setJzMc(bbxx.getJzMc());
+        xfwz.setSc(sc);
+        xfwz.setLc(lc);
+        List<BigDecimal[]> list = JtsUtils.decodeLineString(xfwz.getZb());
+        if (CollectionUtils.isEmpty(list)) {
+            list = new ArrayList<>();
+        }
+        BigDecimal[] decimals = new BigDecimal[2];
+        decimals[0] = receiveDto.getJd();
+        decimals[1] = receiveDto.getWd();
+        list.add(decimals);
+        if (list.size() == 1) {
+            list.add(decimals);
+        }
+        if (list.size() >= 3) {
+            BigDecimal[] decimal0 = list.get(0);
+            BigDecimal[] decimal1 = list.get(1);
+            if (decimal0 == decimal1) {
+                list.remove(0);
+            }
+        }
+        xfwz.setZb(JtsUtils.createLine(list));
+        xfwz.setZbsl(list.size());
+        xfwz.setDwrq(new Date());
+        xfwz.setKssj(new Date());
+        xfwz.setJd(receiveDto.getJd());
+        xfwz.setWd(receiveDto.getWd());
+        xfwz.setZhgxsj(new Date());
+        xfwz.setXtSjly("1");
+        xfwz.setSsxgajdm("510109000000");
+        xfwz.setSsxgajid("1");
+        xfwz.setSsxgaj("高新区分局");
+        xfwz.setSssgaj("成都市公安局");
+        xfwz.setSssgajdm("510100000000");
+        xfwz.setSssgajid("10001");
+        if (StringUtils.isBlank(xfwz.getId())) {
+            xfwz.setId(UUIDGenerator.getUUID());
+            xfwz.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+            this.baseMapper.insert(xfwz);
+        } else {
+            xfwz.setJssj(new Date());
+            this.baseMapper.update(xfwz);
+        }
+    }
+
+    public void saveSsjl(AppLocationReceiveDto receiveDto, TbQwXfbb bbxx, TbWzRywz rywz) {
+        TbWzSswz sswz = new TbWzSswz();
+        Integer lc = DistanceUtils.getLc(0, rywz.getJd(), rywz.getWd(), receiveDto.getJd(), receiveDto.getWd());
+        Integer sc = DistanceUtils.getSc(rywz.getZhgxsj());
+        BeanUtils.copyProperties(receiveDto, sswz);
+        sswz.setSjly("移动设备-" + receiveDto.getYhxm() + "-" + receiveDto.getYhSfzh());
+        sswz.setSjlydm("02");
+        sswz.setYwid(receiveDto.getBbid());
+        if (bbxx != null) {
+            sswz.setJzId(bbxx.getJzId());
+            sswz.setJzMc(bbxx.getJzMc());
+        }
+        sswz.setDwrq(new Date());
+        sswz.setDwsj(new Date());
+        sswz.setJd(receiveDto.getJd());
+        sswz.setWd(receiveDto.getWd());
+        sswz.setXfsc(sc);
+        sswz.setXflc(lc);
+        if (receiveDto.getJd() != null && receiveDto.getWd() != null) {
+            sswz.setZb(JtsUtils.getPoint(receiveDto.getJd(), receiveDto.getWd()));
+            sswz.setZbhash(GeoHashKit.encode(receiveDto.getJd(), receiveDto.getWd()));
+        }
+        sswz.setYhId(receiveDto.getYhid());
+        sswz.setYhXm(receiveDto.getYhxm());
+        sswz.setJrbh(receiveDto.getJrbh());
+        sswz.setWztgz("02");//综合定位
+        sswz.setXtSjly("1");
+        sswz.setSsxgajdm("510109000000");
+        sswz.setSsxgajid("1");
+        sswz.setSsxgaj("高新区分局");
+        sswz.setSssgaj("成都市公安局");
+        sswz.setSssgajdm("510100000000");
+        sswz.setSssgajid("10001");
+        tbWzSswzMapper.insertEntity(sswz);
+    }
+
+    public void saveLsjl(AppLocationReceiveDto receiveDto, TbQwXfbb bbxx, TbWzRywz rywz) {
+        TbWzLswz lswz = new TbWzLswz();
+        BeanUtils.copyProperties(receiveDto, lswz);
+        Integer lc = DistanceUtils.getLc(0, rywz.getJd(), rywz.getWd(), receiveDto.getJd(), receiveDto.getWd());
+        Integer sc = DistanceUtils.getSc(rywz.getZhgxsj());
+        lswz.setSjly("移动设备" + receiveDto.getYhxm() + "-" + receiveDto.getYhSfzh());
+        lswz.setSjlydm("02");
+        lswz.setYwid(receiveDto.getBbid());
+        if (bbxx != null) {
+            lswz.setJzId(bbxx.getJzId());
+            lswz.setJzMc(bbxx.getJzMc());
+        }
+        lswz.setDwrq(new Date());
+        lswz.setDwsj(new Date());
+        lswz.setJd(receiveDto.getJd());
+        lswz.setWd(receiveDto.getWd());
+        lswz.setXfsc(sc);
+        lswz.setXflc(lc);
+        if (receiveDto.getJd() != null && receiveDto.getWd() != null) {
+            lswz.setZb(JtsUtils.getPoint(receiveDto.getJd(), receiveDto.getWd()));
+            lswz.setZbhash(GeoHashKit.encode(receiveDto.getJd(), receiveDto.getWd()));
+        }
+        lswz.setYhId(receiveDto.getYhid());
+        lswz.setYhXm(receiveDto.getYhxm());
+        lswz.setWztgz("02");//综合定位
+        lswz.setXtSjly("1");
+        lswz.setSsxgajdm("510109000000");
+        lswz.setSsxgajid("1");
+        lswz.setSsxgaj("高新区分局");
+        lswz.setSssgaj("成都市公安局");
+        lswz.setSssgajdm("510100000000");
+        lswz.setSssgajid("10001");
+        tbWzLswzMapper.insertEntity(lswz);
+    }
+}
+
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WztjServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WztjServiceImpl.java
new file mode 100644
index 0000000..bb72e0e
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WztjServiceImpl.java
@@ -0,0 +1,265 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.dto.wzzx.WzcxQuery;
+import com.mosty.base.model.dto.wzzx.WztjQuery;
+import com.mosty.base.model.entity.qwzx.TbQwXfBxfsq;
+import com.mosty.base.model.entity.wzzx.TbWzRywz;
+import com.mosty.base.model.entity.wzzx.TbWzSblswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.wzzx.mapper.TbWzRywzMapper;
+import com.mosty.wzzx.mapper.TbWzSblswzMapper;
+import com.mosty.wzzx.mapper.TbWzXfwzMapper;
+import com.mosty.wzzx.mapper.WztjMapper;
+import com.mosty.wzzx.remote.TbBaseAdaptRemoteService;
+import com.mosty.wzzx.service.WztjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class WztjServiceImpl implements WztjService {
+
+    private final WztjMapper wztjMapper;
+    private final TbWzXfwzMapper tbWzXfwzMapper;
+    private final TbWzRywzMapper tbWzRywzMapper;
+    private final TbWzSblswzMapper tbWzSblswzMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public List<Map<String, Object>> rywz(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.jwzbmlbtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> xz(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.xz(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrlcs(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.jrlcs(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> rslcxz(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.rslcxz(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrwzrs(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.jrwzrs(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jrxzwzs(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.jrxzwzs(map);
+    }
+
+    @Override
+    public IPage<Map<String, Object>> rywzlb(WztjQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        int count = this.wztjMapper.rywzlbCount(map);
+        List<Map<String, Object>> list = this.wztjMapper.rywzlb(map);
+        IPage<Map<String, Object>> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> bbgjcx(WzcxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.bbgjcx(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> bbwzcx(WzcxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.bbwzcx(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> mjgjcx(WzcxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.mjgjcx(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> wbbwz(WzcxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        UserInfo user = UserInfoManager.get();
+        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.wztjMapper.wbbwz(map);
+    }
+
+
+    @Override
+    public Map<String, Object> xfsltj(String type) {
+        String kssj = null, jssj = null, startTime = null, endTime = null;
+        if ("1".equals(type)) { // 类型如果为 1 说明是当天
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            // 当天的环比
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) { // 7天
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            // 环比7天的 开始时间，结束时间
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) { // 30天
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            // 环比的30天，开始时间，结束时间
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        }
+//        UserInfo user = UserInfoManager.get(); // 获取登陆信息
+        QueryWrapper<TbWzXfwz> qw = new QueryWrapper<>(); // mybatisplus
+//        PermissionsUtil.queryWrapperUtil(qw, user); // mybatisplus
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+
+        qw.likeRight(StringUtils.isNotBlank(ssbm), "ssbmdm", ssbm);
+
+        Map<String, Object> map = new HashMap<>();
+        int nowCount = this.tbWzXfwzMapper.selectCount( // 近期的count：计数 lambda遍历 根据日期开始时间结束时间计数 比较ge大于开始时间，le小于结束时间
+                qw.lambda().ge(TbWzXfwz::getDwrq, kssj)
+                        .le(TbWzXfwz::getDwrq, jssj)
+        );
+        // 近期的count
+        map.put("nowCount", nowCount);
+        // 上一期的数量
+        int prevCount = this.tbWzXfwzMapper.selectCount(
+                qw.lambda().ge(TbWzXfwz::getDwrq, startTime)
+                        .le(TbWzXfwz::getDwrq, endTime)
+        );
+        map.put("prevCount", prevCount);
+        map.put("hb", prevCount != 0 ? ( // 环比, 三目， 保存两位小数， BigDecimal，
+                new BigDecimal((nowCount - prevCount)).divide(new BigDecimal(prevCount), BigDecimal.ROUND_HALF_UP, 4)
+        ) : 0);
+        map.put("hbCount", nowCount - prevCount); // 环比计数 近期的count - 上期的count
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> rysltj(String type) {
+        String kssj = null, jssj = null, startTime = null, endTime = null;
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        }
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("",user);
+        Map<String, Object> map = new HashMap<>();
+        int nowCount = tbWzRywzMapper.getRysltjCount(kssj,jssj,useSql); // 需要去重
+        // 近期
+        map.put("nowCount", nowCount);
+        // 上一期的数量
+        int prevCount = tbWzRywzMapper.getRysltjCount(startTime,endTime,useSql);
+        map.put("prevCount", prevCount);
+        map.put("hb", prevCount != 0 ? (
+                new BigDecimal((nowCount - prevCount)).divide(new BigDecimal(prevCount), BigDecimal.ROUND_HALF_UP, 4)
+        ) : 0);
+        map.put("hbCount", nowCount - prevCount); // 环比计数 近期的count - 上期的count
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> sblswz(String type) {
+        String kssj = null, jssj = null, startTime = null, endTime = null;
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -1), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -14), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+            startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -60), "01");
+            endTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+        }
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("",user);
+        Map<String, Object> map = new HashMap<>();
+        int nowCount = tbWzSblswzMapper.getSblswzCount(kssj,jssj,useSql);
+        // 近期
+        map.put("nowCount", nowCount);
+        // 上一期的数量
+        int prevCount = tbWzSblswzMapper.getSblswzCount(startTime,endTime,useSql);
+        map.put("prevCount", prevCount);
+        map.put("hb", prevCount != 0 ? (
+                new BigDecimal((nowCount - prevCount)).divide(new BigDecimal(prevCount), BigDecimal.ROUND_HALF_UP, 4)
+        ) : 0);
+        map.put("hbCount", nowCount - prevCount);
+        return map;
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WzzxSysUserServiceImpl.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WzzxSysUserServiceImpl.java
new file mode 100644
index 0000000..e32da61
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/service/impl/WzzxSysUserServiceImpl.java
@@ -0,0 +1,22 @@
+package com.mosty.wzzx.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.wzzx.mapper.WzzxUserMapper;
+import com.mosty.wzzx.service.WzzxSysUserService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class WzzxSysUserServiceImpl extends ServiceImpl<WzzxUserMapper, SysUser> implements WzzxSysUserService {
+
+    public List<SysUser> queryList() {
+        return this.baseMapper.selectByPage();
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationCenterTask.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationCenterTask.java
new file mode 100644
index 0000000..38cbe6a
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationCenterTask.java
@@ -0,0 +1,113 @@
+package com.mosty.wzzx.task;
+
+import com.mosty.base.model.entity.qwzx.TbQwZnzb;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DistanceUtils;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.wzzx.service.TbWzXfwzService;
+import com.mosty.wzzx.service.impl.TbQwZnzbServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 位置定时器
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LocationCenterTask {
+
+    private final RedisService redisService;
+    private final RedisTemplate redisTemplate;
+    private final TbWzXfwzService tbWzXfwzService;
+    private final TbQwZnzbServiceImpl tbQwZnzbService;
+
+    //    @Scheduled(cron = "0 0/2 * * * ? ")
+    public void locationCompletion() {
+        System.out.println("开始执行位置定时器补全坐标位置");
+        //巡防位置
+        String key = Constant.WZ_XFWZ + "*";
+        Set<String> sets = redisTemplate.keys(key);
+        if (!CollectionUtils.isEmpty(sets)) {
+            List<TbWzXfwz> zfwzList = redisTemplate.opsForValue().multiGet(sets);
+            //设备实时位置
+            String sbwzKey = Constant.WZ_SBWZ + "*";
+            Set<String> sbwzSets = redisTemplate.keys(sbwzKey);
+            if (!CollectionUtils.isEmpty(sbwzSets)) {
+                List<TbWzSbsswz> sbwzList = redisTemplate.opsForValue().multiGet(sbwzSets);
+                if (!CollectionUtils.isEmpty(zfwzList) && !CollectionUtils.isEmpty(sbwzList)) {
+                    List<String> bbList = zfwzList.stream().map(TbWzXfwz::getBbId).collect(Collectors.toList());
+                    List<TbQwZnzb> znnbList = tbQwZnzbService.queryListByYwid(bbList);
+                    for (TbWzXfwz xfwz : zfwzList) {
+                        Date zhgxsj = xfwz.getZhgxsj();
+                        //上报时长
+                        long sbsc = System.currentTimeMillis() - zhgxsj.getTime();
+                        if (sbsc >= 60000) {//超过1分钟离线
+                            xfwz.setZxzt("0");
+                            if (!CollectionUtils.isEmpty(znnbList)) {
+                                //获取当前报备的智能装备
+                                List<TbQwZnzb> bbzbList =
+                                        znnbList.stream().filter(item -> item.getYwid().equals(xfwz.getBbId())).collect(Collectors.toList());
+                                //获取报备装备呼号
+                                List<String> hhList = bbzbList.stream().map(TbQwZnzb::getHh).collect(Collectors.toList());
+                                //获取缓存报备装备位置
+                                List<TbWzSbsswz> bbSbwzList =
+                                        sbwzList.stream().filter(entity -> hhList.contains(entity.getSbid())).collect(Collectors.toList());
+                                if (!CollectionUtils.isEmpty(bbSbwzList)) {
+                                    //对报备装备根据定位时间排序
+                                    bbSbwzList.stream().sorted(Comparator.comparing(TbWzSbsswz::getDwsj).reversed());
+                                    TbWzSbsswz sswz = bbSbwzList.get(0);
+                                    //如果实时位置最新坐标的时间大于
+                                    if (sswz.getDwsj().getTime() > xfwz.getZhgxsj().getTime()) {
+                                        //更新巡防位置坐标
+                                        BigDecimal jd = sswz.getJd();
+                                        BigDecimal wd = sswz.getWd();
+                                        Integer lc = DistanceUtils.getLc(xfwz.getLc(), xfwz.getJd(), xfwz.getWd(), jd,
+                                                wd);
+                                        Integer sc = DistanceUtils.getSc(xfwz.getZhgxsj());
+                                        xfwz.setSc(sc);
+                                        xfwz.setLc(lc);
+                                        List<BigDecimal[]> list = JtsUtils.decodeLineString(xfwz.getZb());
+                                        if (CollectionUtils.isEmpty(list)) {
+                                            list = new ArrayList<>();
+                                        }
+                                        BigDecimal[] decimals = new BigDecimal[2];
+                                        decimals[0] = jd;
+                                        decimals[1] = wd;
+                                        list.add(decimals);
+                                        if (list.size() == 1) {
+                                            list.add(decimals);
+                                        }
+                                        xfwz.setZb(JtsUtils.createLine(list));
+                                        xfwz.setZbsl(list.size());
+                                        xfwz.setDwrq(sswz.getDwrq());
+                                        xfwz.setJd(jd);
+                                        xfwz.setWd(wd);
+                                        xfwz.setZhgxsj(sswz.getXtZhgxsj());
+                                    }
+                                }
+                            }
+                            tbWzXfwzService.update(xfwz);
+                            String redisKey = Constant.WZ_XFWZ + xfwz.getBbId();
+                            redisService.setCacheObject(redisKey, xfwz);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationClearTask.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationClearTask.java
new file mode 100644
index 0000000..3c9825f
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/task/LocationClearTask.java
@@ -0,0 +1,60 @@
+package com.mosty.wzzx.task;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.wzzx.service.TbWzSbsswzService;
+import com.mosty.wzzx.service.TbWzSswzService;
+import com.mosty.wzzx.service.impl.TbWzSbsswzServiceImpl;
+import com.mosty.wzzx.service.impl.TbWzSswzServiceImpl;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Set;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LocationClearTask {
+
+    private final RedisTemplate redisTemplate;
+    private final TbWzSbsswzService tbWzSbsswzService;
+    private final TbWzSswzService tbWzSswzService;
+
+    //每天凌晨执行（删除redis数据，删除实时位置的7天前的数据）
+    @Scheduled(cron = "0 0 1 * * ? ")
+    public void locationClear() {
+        System.out.println("开始执行位置定时器位置清理");
+        //清除人员位置
+        String key = Constant.WZ_RYWZ + "*";
+        Set<String> ryKeys = redisTemplate.keys(key);
+        if (CollectionUtils.isNotEmpty(ryKeys)) {
+            ryKeys.forEach(v -> {
+                if (!v.contains(DateUtils.getSystemDateString())) {
+                    redisTemplate.delete(v);
+                }
+            });
+        }
+        //清除设备位置
+        String sbwzKey = Constant.WZ_SBWZ + "*";
+        Set<String> sbKeys = redisTemplate.keys(sbwzKey);
+        if (CollectionUtils.isNotEmpty(sbKeys)) {
+            sbKeys.forEach(v -> {
+                if (!v.contains(DateUtils.getSystemDateString())) {
+                    redisTemplate.delete(v);
+                }
+            });
+        }
+
+        //删除实时位置7天前数据
+        tbWzSswzService.delHistory();
+        //删除设备实时位置7天前数据
+        tbWzSbsswzService.delHistory();
+    }
+
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpLzEntity.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpLzEntity.java
new file mode 100644
index 0000000..d413be4
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpLzEntity.java
@@ -0,0 +1,201 @@
+package com.mosty.wzzx.udp;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.utils.DateUtils;
+import lombok.Data;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 泸州udp转换
+ *
+ * @author esacpe
+ */
+@Data
+public class UdpLzEntity {
+
+    /**
+     * pgisId
+     */
+    private String pgisId;
+    /**
+     * 经度，单位度
+     */
+    private Double lng;
+    /**
+     * 纬度，单位度
+     */
+    private Double lat;
+    /**
+     * 高程，单位米
+     */
+    private Integer altitude;
+    /**
+     * 速度，单位Km/h
+     */
+    private Integer speed;
+    /**
+     * 方向，0-359，正北为0，顺时针
+     */
+    private Integer direction;
+    /**
+     * 定位时间
+     */
+    private Date time;
+
+    /**
+     * 精度
+     */
+    private Integer precision;
+
+    //解析
+    public boolean parseLz(byte[] data) {
+        return parseLz(data, data.length);
+    }
+
+    private int destPos = 0;
+
+    public boolean parseLz(byte[] data, int dataLength) {
+        if (data == null || dataLength < 10 || dataLength > data.length) {
+            return false;
+        }
+        if (data[0] == 0xAA) {
+            return false;
+        }
+
+        byte[] bytes3 = new byte[20];
+//        System.arraycopy(data, 10, bytes3, 0, 20);
+//
+//        pgisId = new String(bytes3, Charset.forName("UTF-8"));
+//         pgisId = new String(bytes3, Charset.forName("UTF-8"));
+        destPos = 10;
+        pgisId = (new String(arraycopy(data, destPos, 20,20), Charset.forName("UTF-8"))).trim();
+
+//        byte[] jdbt=new byte[8];
+//        System.arraycopy(data, 30, jdbt, 0, 8);
+//         lng = bytes2Double(jdbt);
+
+        lng = bytes2Double(arraycopy(data, destPos, 8,8));
+
+//        byte[] wdbt=new byte[8];
+//        System.arraycopy(data, 38, wdbt, 0, 8);
+//         lat = bytes2Double(wdbt);
+
+        lat = bytes2Double(arraycopy(data, destPos, 8,8));
+
+
+//        byte[] dspeedbyte=new byte[8];
+//        System.arraycopy(data, 46, dspeedbyte, 0, 2);
+//        speed = byte2int(dspeedbyte);
+
+        speed = byte2int(arraycopy(data, destPos, 2,4));
+
+
+//        byte[] dirsbyte=new byte[8];
+//        System.arraycopy(data, 48, dirsbyte, 0, 2);
+//        direction = byte2int(dirsbyte);
+
+        direction = byte2int(arraycopy(data, destPos, 2,4));
+
+        altitude = byte2int(arraycopy(data, destPos, 2,4));
+
+        precision = byte2int(arraycopy(data, destPos, 2,4));
+
+        Integer year = byte2int(arraycopyYear(data, destPos, 2,4));
+        Integer month = byte2int(arraycopy(data, destPos, 1,4));
+        Integer day = byte2int(arraycopy(data, destPos, 1,4));
+        Integer hours = byte2int(arraycopy(data, destPos, 1,4));
+        Integer minutes = byte2int(arraycopy(data, destPos, 1,4));
+        Integer seconds = byte2int(arraycopy(data, destPos, 1,4));
+        try {
+            time = DateUtils.stringToDate(year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds, "yyyy-MM-dd HH:mm:ss");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return time != null;
+
+    }
+
+    /**
+     * 加密有问题 把54 55单独替换位置
+     * @param arr
+     * @param dest
+     * @param len
+     * @param end
+     * @return
+     */
+    private byte[] arraycopyYear(byte[] arr, int dest, int len,int end) {
+        byte[] copy = new byte[end];
+        System.arraycopy(arr, 55, copy, 0, 1);
+        System.arraycopy(arr, 54, copy, 1, 1);
+        destPos = dest + len;
+        return copy;
+    }
+
+
+    private byte[] arraycopy(byte[] arr, int dest, int len,int end) {
+        byte[] copy = new byte[end];
+        System.arraycopy(arr, dest, copy, 0, len);
+        destPos = dest + len;
+        return copy;
+    }
+
+
+    private double bytes2Double(byte[] arr) {
+        long value = 0;
+        for (int i = 0; i < 8; i++) {
+            value |= ((long) (arr[i] & 0xff)) << (8 * i);
+        }
+        return Double.longBitsToDouble(value);
+    }
+
+    public int byte2int(byte[] res) {
+        int targets = (res[0] & 0xff) | ((res[1] << 8) & 0xff00) | ((res[2] << 24) >>> 8) | (res[3] << 24);
+        return targets;
+    }
+
+    public static byte[] hexStringToByte(String hexstr) {
+        if (hexstr == null)
+            return null;
+        byte[] b = new byte[hexstr.length() / 2];
+        int j = 0;
+        for (int i = 0; i < b.length; i++) {
+            char c0 = hexstr.charAt(j++);
+            char c1 = hexstr.charAt(j++);
+            b[i] = ((byte) (charToInt(c0) << 4 | charToInt(c1)));
+        }
+        return b;
+    }
+
+    // char转换成int
+    public static int charToInt(char c) {
+        if (c >= 'a') {
+            return c - 'a' + 10 & 0xF;
+        }
+        if (c >= 'A') {
+            return c - 'A' + 10 & 0xF;
+        }
+        return c - '0' & 0xF;
+    }
+    public static String byteArrayToString(byte[] data) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : data) {
+            sb.append(String.format("%02X", b));
+        }
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        UdpLzEntity lzEntity = new UdpLzEntity();
+        byte[] bytes2 = UdpLzEntity.hexStringToByte("AAAACCCC002200000033313334303430313837343700000000000000000016A6EF3504305A403BC43F6CE9BD3F400000000001E4000007E8040B100402");
+        lzEntity.parseLz(bytes2);
+
+        System.out.println(JSON.toJSONString(lzEntity));
+    }
+}
diff --git a/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpServerForLz.java b/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpServerForLz.java
new file mode 100644
index 0000000..6932517
--- /dev/null
+++ b/mosty-wzzx/src/main/java/com/mosty/wzzx/udp/UdpServerForLz.java
@@ -0,0 +1,115 @@
+package com.mosty.wzzx.udp;
+
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.wzzx.service.TbWzSblswzService;
+import com.mosty.wzzx.service.TbWzSbsswzService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.integration.annotation.Filter;
+import org.springframework.integration.annotation.Router;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.annotation.Transformer;
+import org.springframework.integration.dsl.IntegrationFlow;
+import org.springframework.integration.dsl.IntegrationFlows;
+import org.springframework.integration.ip.dsl.Udp;
+import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * esacpe
+ * 泸州udp
+ * 2023-01-10
+ */
+@Component
+public class UdpServerForLz {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(UdpServerForLz.class);
+
+    @Value("${custom.udp.LzUdpPort}")
+    private Integer bureauPort;
+    @Resource
+    private TbWzSbsswzService tbWzSbsswzService;
+    @Resource
+    private TbWzSblswzService tbWzSblswzService;
+
+    // UDP服务
+    @Bean(name = "integrationLzUdp")
+    public IntegrationFlow integrationFlow() {
+        logger.info("UDP-UDP-启动成功，端口号为: {}", bureauPort);
+        return IntegrationFlows.from(Udp.inboundAdapter(bureauPort)).channel("udpChannelLz").get();
+    }
+
+
+    // 数据转换器
+    @Transformer(inputChannel = "udpChannelLz", outputChannel = "udpFilterLz")
+    public UdpLzEntity transformer(@Payload byte[] payload) {
+//        logger.info("UDP-定位接收服务-开始转换数据");
+        UdpLzEntity lzEntity = new UdpLzEntity();
+        try {
+            String s = UdpLzEntity.byteArrayToString(payload);
+//            logger.info("UDP推送信息---》", s);
+            if (lzEntity.parseLz(payload)) {
+
+                if (ObjectUtils.isNotEmpty(lzEntity)) {
+//                    long time = new Date().getTime();
+//                    long i = time - lzEntity.getTime().getTime();
+//                    if (i > 300000) {
+//                        logger.info("UDP-定位接收服务-返回位置信息异常 : {}", s);
+//                    }
+                    lzEntity.setPgisId(lzEntity.getPgisId().replace("000", ""));
+                }
+                return lzEntity;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new UdpLzEntity();
+    }
+
+
+    // 过滤器
+    @Filter(inputChannel = "udpFilterLz", outputChannel = "udpRouterLz")
+    public boolean filter(@Headers Map<String, Object> headers) {
+        String id = headers.get("id").toString();
+        String ip = headers.get("ip_address").toString();
+        String port = headers.get("ip_port").toString();
+//        System.err.println("filter-id : " + id + "，filter-ip : " + ip + ",filter-port : " + port);
+        return true;
+    }
+
+
+    // 路由分发处理器 - 可根据消息或者headers数据进行分发处理
+    @Router(inputChannel = "udpRouterLz")
+    public String router(UdpLzEntity lzEntity) {
+        if (null == lzEntity.getLat() || lzEntity.getLat() == 0
+                || null == lzEntity.getLng() || lzEntity.getLng() == 0) {
+            return "locationExceptionHandleLz";
+        }
+        return "locationHandleLz";
+    }
+
+
+    // 位置信息处理方法
+    @ServiceActivator(inputChannel = "locationHandleLz")
+    public void locationHandleLz(UdpLzEntity lzEntity) {
+//        logger.info("UDP-定位接收服务-获取到正常位置信息 : {}", lzEntity.toString());
+        TbWzSbsswz sswz = this.tbWzSbsswzService.saveSbsswz(lzEntity);
+        this.tbWzSblswzService.saveSblswz(sswz);
+    }
+
+
+    // 位置信息解析异常处理方法
+    @ServiceActivator(inputChannel = "locationExceptionHandleLz")
+    public void locationExceptionHandleLz(UdpLzEntity lzEntity) {
+        logger.error("UDP-定位接收服务-获取到解析异常位置信息 : {} ", lzEntity.toString());
+    }
+}
diff --git a/mosty-wzzx/src/main/resources/application.yml b/mosty-wzzx/src/main/resources/application.yml
new file mode 100644
index 0000000..ec4ce17
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/application.yml
@@ -0,0 +1,93 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_wzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 20000000
+    jedis:
+      pool:
+        max-active: 1000
+  data:
+    mongodb:
+      uri: mongodb://admin:mosty888@80.93.7.13:35620/mosty-wzzx?authSource=admin&serverTimezone=UTC
+      table: mosty-wzzx
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+custom:
+  #POINAME分组位置信息默偏移天数
+  userTrackPoiNameOffset: -15
+  #启动是否清空实时位置数据
+  isCleanRealTime: true
+  udp:
+    #UDP 泸州位置接收服务
+    LzUdpPort: 18004
+    LzUdpTest: false
+
+
+config:
+  orgCode: 510600000000
+
+logging:
+  level:
+    root: error
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/resources/bootstrap.yml b/mosty-wzzx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..e798d23
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 51822
+  servlet:
+    context-path: /mosty-wzzx/
+spring:
+  application:
+    name: mosty-wzzx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-wzzx/src/main/resources/logback-spring.xml b/mosty-wzzx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..5c6fb1d
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+<!--    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />-->
+<!--    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />-->
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+<!--        <appender-ref ref="LOG_FILE_INFO" />-->
+<!--        <appender-ref ref="LOG_FILE_WARN" />-->
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/resources/mapper/TbQwXfbbMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbQwXfbbMapper.xml
new file mode 100644
index 0000000..7c7528c
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbQwXfbbMapper.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbQwXfbbMapper">
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.qwzx.TbQwXfbb">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="xfpb_id" property="xfpbId"/>
+        <result column="qwdj_id" property="qwdjId"/>
+        <result column="qwdj" property="qwdj"/>
+        <result column="qwbc_id" property="qwbcId"/>
+        <result column="jz_id" property="jzId"/>
+        <result column="jz_mc" property="jzMc"/>
+        <result column="xfbm" property="xfbm"/>
+        <result column="xfbmdm" property="xfbmdm"/>
+        <result column="fzr_sfzh" property="fzrSfzh"/>
+        <result column="fzr_xm" property="fzrXm"/>
+        <result column="fzr_id" property="fzrId"/>
+        <result column="fzr_lxdh" property="fzrLxdh"/>
+        <result column="xfrq" property="xfrq"/>
+        <result column="kssj" property="kssj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="zqsc" property="zqsc"/>
+        <result column="jgts" property="jgts"/>
+        <result column="mjsl" property="mjsl"/>
+        <result column="pbmj" property="pbmj"/>
+        <result column="fjsl" property="fjsl"/>
+        <result column="pbfj" property="pbfj"/>
+        <result column="jcsl" property="jcsl"/>
+        <result column="pbcl" property="pbcl"/>
+        <result column="txzbsl" property="txzbsl"/>
+        <result column="txzb" property="txzb"/>
+        <result column="jyqxsl" property="jyqxsl"/>
+        <result column="jyqx" property="jyqx"/>
+        <result column="wzlx" property="wzlx"/>
+        <result column="zzlx" property="zzlx"/>
+        <result column="xlfs" property="xlfs"/>
+        <result column="xfzt" property="xfzt"/>
+        <result column="bbkssj" property="bbkssj"/>
+        <result column="bbjssj" property="bbjssj"/>
+        <result column="bbzt" property="bbzt"/>
+        <result column="dqwz" property="dqwz"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="zbsj" property="zbsj"/>
+        <result column="xfsc" property="xfsc"/>
+        <result column="xflc" property="xflc"/>
+        <result column="xffwlx" property="xffwlx"/>
+        <result column="xffwid" property="xffwid"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="bz" property="bz"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, xfpb_id, qwdj_id, qwdj, qwbc_id, jz_id, jz_mc,
+       xfbm, xfbmdm, fzr_sfzh, fzr_xm, fzr_id, fzr_lxdh, xfrq, kssj, jssj,
+       zqsc, jgts, mjsl, pbmj, fjsl, pbfj, jcsl, pbcl, txzbsl, txzb, jyqxsl,
+       jyqx, wzlx, zzlx, xlfs, xfzt, bbkssj, bbjssj, bbzt, dqwz, jd, wd,
+       zbhash, zbsj, xfsc, xflc, xffwlx, xffwid, ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+       sssgaj, sssgajdm, bz, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+       xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+       xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <!--id查询-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from mosty_qwgl.tb_qw_xfbb
+        where xt_scbz = '0' and id = #{id,jdbcType=VARCHAR}
+    </select>
+    <!--    gx_mosty_qwgl.-->
+    <!--更新报备坐标-->
+    <update id="updateXfbb">
+        update mosty_qwgl.tb_qw_xfbb
+        <set>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="dqwz != null and dqwz != ''">
+                dqwz = #{dqwz},
+            </if>
+            <if test="zbsj != null">
+                zbsj = #{zbsj},
+            </if>
+<!--            <if test="xfsc != null">-->
+<!--                xfsc = #{xfsc},-->
+<!--            </if>-->
+            <if test="xflc != null">
+                xflc = #{xflc},
+            </if>
+            <if test="xfzt != null and xfzt != ''">
+                xfzt = #{xfzt},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getsfbb" resultType="java.lang.Integer">
+        SELECT COUNT(1) FROM mosty_qwgl.tb_qw_xfbb where xt_scbz = '0' and bbzt = '0'
+        <if test="id != null and id != ''">
+            and id = #{id}
+        </if>
+    </select>
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbQwZnzbMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbQwZnzbMapper.xml
new file mode 100644
index 0000000..54673bc
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbQwZnzbMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbQwZnzbMapper">
+
+    <select id="queryListByYwid" resultType="com.mosty.base.model.entity.qwzx.TbQwZnzb">
+        select a.* from mosty_qwgl.tb_qw_znzb a
+        where a.xt_scbz = '0'
+        and a.ywid in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+
+    </select>
+
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbSjCyjlMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbSjCyjlMapper.xml
new file mode 100644
index 0000000..5da1568
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbSjCyjlMapper.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbSjCyjlMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.sjzx.TbSjCyjl">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="sj_id" property="sjId"/>
+        <result column="bb_id" property="bbId"/>
+        <result column="jl_id" property="jlId"/>
+        <result column="jl_sfzh" property="jlSfzh"/>
+        <result column="jl_xm" property="jlXm"/>
+        <result column="jl_lxdh" property="jlLxdh"/>
+        <result column="sdzlsj" property="sdzlsj"/>
+        <result column="qszlsj" property="qszlsj"/>
+        <result column="ddxcsj" property="ddxcsj"/>
+        <result column="jssj" property="jssj"/>
+        <result column="mjfj" property="mjfj"/>
+        <result column="sfzyjz" property="sfzyjz"/>
+        <result column="zybqdm" property="zybqdm"/>
+        <result column="zybq" property="zybq"/>
+        <result column="dqwz" property="dqwz"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="jlzt" property="jlzt"/>
+        <result column="tp_id" property="tpId"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result column="bz" property="bz"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, sj_id, bb_id, jl_id, jl_sfzh, jl_xm, jl_lxdh, sdzlsj, qszlsj, ddxcsj,
+        jssj, mjfj, sfzyjz, zybqdm, zybq, dqwz, jd, wd, zbhash, zbsj, jlzt, tp_id,
+        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, bz, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+        xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,ssbmid,ssxgajid,sssgajid,bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <!--身份证号码查询-->
+    <select id="queryBySfzh" resultMap="BaseResultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from mosty_sjzx.tb_sj_cyjl
+        where xt_scbz = '0' and jssj is null and jl_sfzh = #{sfzh,jdbcType=VARCHAR}
+    </select>
+
+    <!--更新坐标-->
+    <update id="updateZb">
+        update mosty_sjzx.tb_sj_cyjl
+        <set>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="dqwz != null and dqwz != ''">
+                dqwz = #{dqwz},
+            </if>
+            <if test="zbsj != null">
+                zbsj = #{zbsj},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzLswzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzLswzMapper.xml
new file mode 100644
index 0000000..811d29b
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzLswzMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzLswzMapper">
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzLswz">
+        insert into tb_wz_lswz (id,sjly,sjlydm,ywid,yh_id,yh_xm,
+                                yh_sfzh,jz_id,jz_mc,dwrq,dwsj,jd,wd,zb,
+                                zbhash,wztgz,guo,sheng,shi,csbm,ssqx,
+                                qxbm,dzxz,dzjc,dwbz,xfsc,xflc,
+                                ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+                                sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id},#{sjly},#{sjlydm},#{ywid},#{yhId}, #{yhXm},
+                #{yhSfzh},#{jzId},#{jzMc},#{dwrq},#{dwsj},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                                #{zbhash},#{wztgz},#{guo},#{sheng},#{shi},#{csbm},#{ssqx},
+                                #{qxbm},#{dzxz},#{dzjc},#{dwbz},#{xfsc},#{xflc},
+                                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},#{ssbmid},#{ssxgajid},#{sssgajid},
+                                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzRywzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzRywzMapper.xml
new file mode 100644
index 0000000..13c4a29
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzRywzMapper.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzRywzMapper">
+    <resultMap type="com.mosty.base.model.entity.wzzx.TbWzRywz" id="BaseResultMap">
+        <result property="id" column="id"/>
+        <result property="yhId" column="yh_id"/>
+        <result property="yhSfzh" column="yh_sfzh"/>
+        <result property="yhXm" column="yh_xm"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.LineStringTypeHandler"/>
+        <result property="zbsl" column="zbsl"/>
+        <result property="dwrq" column="dwrq"/>
+        <result property="kssj" column="kssj"/>
+        <result property="sc" column="sc"/>
+        <result property="lc" column="lc"/>
+        <result property="jd" column="jd"/>
+        <result property="wd" column="wd"/>
+        <result property="zhgxsj" column="zhgxsj"/>
+        <result property="ssbm" column="ssbm"/>
+        <result property="ssbmid" column="ssbmid"/>
+        <result property="ssbmdm" column="ssbmdm"/>
+        <result property="ssxgaj" column="ssxgaj"/>
+        <result property="ssxgajid" column="ssxgajid"/>
+        <result property="ssxgajdm" column="ssxgajdm"/>
+        <result property="sssgajid" column="sssgajid"/>
+        <result property="sssgaj" column="sssgaj"/>
+        <result property="sssgajdm" column="sssgajdm"/>
+        <result property="xtSjly" column="xt_sjly"/>
+        <result property="xtSjzt" column="xt_sjzt"/>
+        <result property="xtScbz" column="xt_scbz"/>
+        <result property="xtCjip" column="xt_cjip"/>
+        <result property="xtCjsj" column="xt_cjsj"/>
+        <result property="xtCjrId" column="xt_cjr_id"/>
+        <result property="xtCjr" column="xt_cjr"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc"/>
+        <result property="xtZhgxip" column="xt_zhgxip"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid"/>
+        <result property="xtZhgxr" column="xt_zhgxr"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm"/>
+        <result property="bz" column="bz"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, yh_id, yh_sfzh, yh_xm,
+        zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj,
+         ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+         sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+         xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <!--保存必巡线信息-->
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzRywz">
+        insert into tb_wz_rywz (id, yh_id, yh_sfzh, yh_xm,
+                                zb,
+                                zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj,
+                                ssbm, ssbmdm, ssxgaj, ssxgajdm, ssbmid, ssxgajid, sssgajid,
+                                sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{yhId}, #{yhSfzh}, #{yhXm},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+                #{zbsl}, #{dwrq}, #{kssj}, #{jssj}, #{sc}, #{lc}, #{jd}, #{wd}, #{zhgxsj},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzRywz">
+        update tb_wz_rywz
+        <set>
+            <if test="yhId != null and yhId != ''">
+                yh_id = #{yhId},
+            </if>
+            <if test="yhSfzh != null and yhSfzh != ''">
+                yh_sfzh = #{yhSfzh},
+            </if>
+            <if test="yhXm != null and yhXm != ''">
+                yh_xm = #{yhXm},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            </if>
+            <if test="zbsl != null and zbsl != ''">
+                zbsl = #{zbsl},
+            </if>
+            <if test="dwrq != null">
+                dwrq = #{dwrq},
+            </if>
+            <if test="kssj != null">
+                kssj = #{kssj},
+            </if>
+            <if test="jssj != null and jssj != ''">
+                jssj = #{jssj},
+            </if>
+            <if test="sc != null and sc != ''">
+                sc = #{sc},
+            </if>
+            <if test="lc != null and lc != ''">
+                lc = #{lc},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zhgxsj != null">
+                zhgxsj = #{zhgxsj},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="queryBySfzh" resultMap="BaseResultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_rywz
+        where xt_scbz = '0'
+        and yh_sfzh = #{yhSfzh,jdbcType=VARCHAR}
+        and TO_DAYS(dwrq) = TO_DAYS(NOW())
+    </select>
+
+    <select id="selectBySfz" resultMap="BaseResultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_rywz
+        where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="sfzh != null and sfzh != ''">
+            and yh_sfzh = #{sfzh}
+        </if>
+        <if test="dwrq != null and dwrq != ''">
+            and dwrq = #{dwrq}
+        </if>
+        limit 1
+    </select>
+
+    <select id="getRysltjCount" resultType="java.lang.Integer">
+        select count(DISTINCT yh_id) from tb_wz_rywz where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="kssj != null and kssj != ''">
+            and dwrq >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and dwrq &lt;= #{jssj}
+        </if>
+        ${useSql}
+    </select>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzSblswzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzSblswzMapper.xml
new file mode 100644
index 0000000..bddddec
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzSblswzMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzSblswzMapper">
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzSblswz">
+        insert into tb_wz_sblswz (id, sjly, sjlydm, ywid, sbid, sbmc, yh_id, yh_xm,
+                                yh_sfzh, jz_id, jz_mc, dwrq, dwsj, jd, wd, zb,
+                                zbhash, wztgz, guo, sheng, shi, csbm, ssqx,
+                                qxbm, dzxz, dzjc, dwbz, xfsc, xflc,
+                                ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+                                sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{sjly}, #{sjlydm}, #{ywid}, #{sbid}, #{sbmc}, #{yhId}, #{yhXm},
+                #{yhSfzh},#{jzId},#{jzMc},#{dwrq},#{dwsj},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                                #{zbhash},#{wztgz},#{guo},#{sheng},#{shi},#{csbm},#{ssqx},
+                                #{qxbm},#{dzxz},#{dzjc},#{dwbz},#{xfsc},#{xflc},
+                                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},#{ssbmid},#{ssxgajid},#{sssgajid},
+                                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <select id="getSblswzCount" resultType="java.lang.Integer">
+        select count(DISTINCT sbid) from tb_wz_sblswz where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="kssj != null and kssj != ''">
+            and dwrq >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and dwrq &lt;= #{jssj}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="selectSbLswz" resultType="com.mosty.base.model.entity.wzzx.TbWzSblswz">
+        SELECT jd,wd FROM `tb_wz_sblswz` where
+        <if test="gpsId != null and gpsId != ''">
+            and sbid >= #{gpsId}
+        </if>
+
+        <if test="kssj != null and kssj != ''">
+            and xt_cjsj >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and xt_cjsj &lt;= #{jssj}
+        </if>
+
+    </select>
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzSbsswzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzSbsswzMapper.xml
new file mode 100644
index 0000000..08f26e5
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzSbsswzMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzSbsswzMapper">
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzSbsswz">
+        insert into tb_wz_sbsswz (id, sjly, sjlydm, ywid, sbid, sbmc, yh_id, yh_xm,
+                                yh_sfzh, jz_id, jz_mc, dwrq, dwsj, jd, wd, zb,
+                                zbhash, wztgz, guo, sheng, shi, csbm, ssqx,
+                                qxbm, dzxz, dzjc, dwbz, xfsc, xflc,
+                                ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+                                sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{sjly}, #{sjlydm}, #{ywid}, #{sbid}, #{sbmc}, #{yhId}, #{yhXm},
+                #{yhSfzh}, #{jzId}, #{jzMc}, #{dwrq}, #{dwsj}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                                #{zbhash},#{wztgz},#{guo},#{sheng},#{shi},#{csbm},#{ssqx},
+                                #{qxbm},#{dzxz},#{dzjc},#{dwbz},#{xfsc},#{xflc},
+                                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},#{ssbmid},#{ssxgajid},#{sssgajid},
+                                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--删除7日前数据-->
+    <delete id="delHistory" parameterType="java.lang.String">
+        delete from tb_wz_sbsswz where DATE(dwsj) &lt;= DATE(DATE_SUB(NOW(),INTERVAL 7 DAY));
+    </delete>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzSswzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzSswzMapper.xml
new file mode 100644
index 0000000..77da375
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzSswzMapper.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzSswzMapper">
+
+    <resultMap type="com.mosty.base.model.entity.wzzx.TbWzSswz" id="BaseResultMap">
+        <result property="id" column="id"/>
+        <result property="sjly" column="sjly"/>
+        <result property="sjlydm" column="sjlydm"/>
+        <result property="ywid" column="ywid"/>
+        <result property="yhId" column="yh_id"/>
+        <result property="yhXm" column="yh_xm"/>
+        <result property="yhSfzh" column="yh_sfzh"/>
+        <result property="jzId" column="jz_id"/>
+        <result property="jzMc" column="jz_mc"/>
+        <result property="dwrq" column="dwrq"/>
+        <result property="dwsj" column="dwsj"/>
+        <result property="jd" column="jd"/>
+        <result property="wd" column="wd"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash"/>
+        <result property="wztgz" column="wztgz"/>
+        <result property="guo" column="guo"/>
+        <result property="sheng" column="sheng"/>
+        <result property="shi" column="shi"/>
+        <result property="csbm" column="csbm"/>
+        <result property="ssqx" column="ssqx"/>
+        <result property="qxbm" column="qxbm"/>
+        <result property="dzxz" column="dzxz"/>
+        <result property="dzjc" column="dzjc"/>
+        <result property="dwbz" column="dwbz"/>
+        <result property="xfsc" column="xfsc"/>
+        <result property="xflc" column="xflc"/>
+        <result property="jrbh" column="jrbh"/>
+        <result property="ssbm" column="ssbm"/>
+        <result property="ssbmdm" column="ssbmdm" />
+        <result property="ssbmid" column="ssbmid" />
+        <result property="ssxgaj" column="ssxgaj" />
+        <result property="ssxgajid" column="ssxgajid" />
+        <result property="ssxgajdm" column="ssxgajdm" />
+        <result property="sssgaj" column="sssgaj" />
+        <result property="sssgajid" column="sssgajid" />
+        <result property="sssgajdm" column="sssgajdm" />
+        <result property="xtSjly" column="xt_sjly" />
+        <result property="xtSjzt" column="xt_sjzt" />
+        <result property="xtScbz" column="xt_scbz" />
+        <result property="xtCjip" column="xt_cjip" />
+        <result property="xtCjsj" column="xt_cjsj" />
+        <result property="xtCjrId" column="xt_cjr_id" />
+        <result property="xtCjr" column="xt_cjr" />
+        <result property="xtCjbmdm" column="xt_cjbmdm" />
+        <result property="xtCjbmmc" column="xt_cjbmmc" />
+        <result property="xtZhgxip" column="xt_zhgxip" />
+        <result property="xtZhgxsj" column="xt_zhgxsj" />
+        <result property="xtZhgxrid" column="xt_zhgxrid" />
+        <result property="xtZhgxr" column="xt_zhgxr" />
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" />
+        <result property="xtZhgxbm" column="xt_zhgxbm" />
+        <result property="bz" column="bz" />
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, sjly, sjlydm, ywid, yh_id, yh_xm, yh_sfzh, jz_id, jz_mc,
+        dwrq, dwsj, jd, wd, zbhash, wztgz, guo, sheng, shi,
+        csbm, ssqx, qxbm, dzxz, dzjc, dwbz, xfsc, xflc, jrbh,
+        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,ssbmid,ssxgajid,sssgajid, xt_sjly,
+        xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+        xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+        xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.wzzx.TbWzSswz">
+        insert into tb_wz_sswz (id,sjly,sjlydm,ywid,yh_id,yh_xm,
+                                yh_sfzh,jz_id,jz_mc,dwrq,dwsj,jd,wd,zb,
+                                zbhash, wztgz, guo, sheng, shi, csbm, ssqx,
+                                qxbm, dzxz, dzjc, dwbz, xfsc, xflc, jrbh,
+                                ssbm, ssbmdm, ssxgaj, ssxgajdm,ssbmid,ssxgajid,sssgajid,
+                                sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+                                xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id},#{sjly},#{sjlydm},#{ywid},#{yhId}, #{yhXm},
+                #{yhSfzh},#{jzId},#{jzMc},#{dwrq},#{dwsj},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{wztgz}, #{guo}, #{sheng}, #{shi}, #{csbm}, #{ssqx},
+                #{qxbm}, #{dzxz}, #{dzjc}, #{dwbz}, #{xfsc}, #{xflc}, #{jrbh},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--id查询-->
+    <select id="queryById" resultMap="BaseResultMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_sswz
+        where xt_scbz = '0' and id = #{id,jdbcType=VARCHAR}
+    </select>
+
+    <!--查询用户最新的位置-->
+    <select id="querySswzNow" resultMap="BaseResultMap">
+        SELECT
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        FROM `tb_wz_sswz`
+        where xt_scbz = '0'
+        <if test="yhId != null and yhId != ''">
+            and yh_id = #{yhId}
+        </if>
+        <if test="jrbh != null and jrbh != ''">
+            and jrbh = #{jrbh}
+        </if>
+        order by dwsj desc limit 0,1
+    </select>
+
+    <!--查询用户最新的位置-->
+    <select id="querySswzToday" resultMap="BaseResultMap">
+        SELECT
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        FROM `tb_wz_sswz`
+        where xt_scbz = '0'
+        and to_days(dwsj) = to_days(now());
+        <if test="yhId != null and yhId != ''">
+            and yh_id = #{yhId}
+        </if>
+        <if test="jrbh != null and jrbh != ''">
+            and jrbh = #{jrbh}
+        </if>
+        order by dwsj desc
+    </select>
+
+    <!--根据用户ID查询-->
+    <select id="querySswzYhid" resultType="java.lang.String">
+        SELECT
+            yh_id
+        FROM
+            tb_wz_sswz
+        WHERE
+            xt_scbz = '0'
+          AND yh_id IS NOT NULL
+          AND to_days( dwsj ) = to_days(
+                now())
+        GROUP BY
+            yh_id
+    </select>
+
+    <!--删除7日前数据-->
+    <delete id="delHistory" parameterType="java.lang.String">
+        delete from tb_wz_sswz where DATE(dwsj) &lt;= DATE(DATE_SUB(NOW(),INTERVAL 7 DAY));
+    </delete>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/mapper/TbWzXfwzMapper.xml b/mosty-wzzx/src/main/resources/mapper/TbWzXfwzMapper.xml
new file mode 100644
index 0000000..2108502
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/TbWzXfwzMapper.xml
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.TbWzXfwzMapper">
+
+    <resultMap type="com.mosty.base.model.entity.wzzx.TbWzXfwz" id="TbWzXfwzMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="bbId" column="bb_id" jdbcType="VARCHAR"/>
+        <result property="yhId" column="yh_id" jdbcType="VARCHAR"/>
+        <result property="yhSfzh" column="yh_sfzh" jdbcType="VARCHAR"/>
+        <result property="yhXm" column="yh_xm" jdbcType="VARCHAR"/>
+        <result property="jzId" column="jz_id" jdbcType="VARCHAR"/>
+        <result property="jzMc" column="jz_mc" jdbcType="VARCHAR"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.LineStringTypeHandler"/>
+        <result property="zbsl" column="zbsl" jdbcType="INTEGER"/>
+        <result property="dwrq" column="dwrq" jdbcType="TIMESTAMP"/>
+        <result property="kssj" column="kssj" jdbcType="TIMESTAMP"/>
+        <result property="jssj" column="jssj" jdbcType="TIMESTAMP"/>
+        <result property="sc" column="sc" jdbcType="INTEGER"/>
+        <result property="lc" column="lc" jdbcType="INTEGER"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zhgxsj" column="zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id, bb_id, yh_id, yh_sfzh, yh_xm, jz_id, jz_mc,
+       zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj,
+       ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,ssbmid,ssxgajid,sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+       xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+       xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <!--查询所有-->
+    <select id="queryAll" resultMap="TbWzXfwzMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_xfwz
+        where xt_scbz = '0'
+    </select>
+    
+    <!--查询单个-->
+    <select id="queryById" resultMap="TbWzXfwzMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_xfwz
+        where xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="queryAllByLimit" resultMap="TbWzXfwzMap">
+        select
+          id, bb_id, yh_id, yh_sfzh, yh_xm, jz_id, jz_mc, zb, zbsl, dwrq, kssj, jssj, sc, lc,
+        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,ssbmid,ssxgajid,sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+        xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+        from tb_wz_xfwz
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="bbId != null and bbId != ''">
+                and bb_id = #{bbId}
+            </if>
+            <if test="yhId != null and yhId != ''">
+                and yh_id = #{yhId}
+            </if>
+            <if test="yhSfzh != null and yhSfzh != ''">
+                and yh_sfzh = #{yhSfzh}
+            </if>
+            <if test="yhXm != null and yhXm != ''">
+                and yh_xm = #{yhXm}
+            </if>
+            <if test="jzId != null and jzId != ''">
+                and jz_id = #{jzId}
+            </if>
+            <if test="jzMc != null and jzMc != ''">
+                and jz_mc = #{jzMc}
+            </if>
+            <if test="zb != null and zb != ''">
+                and zb = #{zb}
+            </if>
+            <if test="zbsl != null">
+                and zbsl = #{zbsl}
+            </if>
+            <if test="dwrq != null">
+                and dwrq = #{dwrq}
+            </if>
+            <if test="kssj != null">
+                and kssj = #{kssj}
+            </if>
+            <if test="jssj != null">
+                and jssj = #{jssj}
+            </if>
+            <if test="sc != null">
+                and sc = #{sc}
+            </if>
+            <if test="lc != null">
+                and lc = #{lc}
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                and ssbm = #{ssbm}
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                and ssbmid = #{ssbmid}
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                and ssbmdm = #{ssbmdm}
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                and ssxgaj = #{ssxgaj}
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                and ssxgajid = #{ssxgajid}
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                and ssxgajdm = #{ssxgajdm}
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                and sssgaj = #{sssgaj}
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                and sssgajid = #{sssgajid}
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                and sssgajdm = #{sssgajdm}
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                and xt_sjly = #{xtSjly}
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                and xt_sjzt = #{xtSjzt}
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                and xt_scbz = #{xtScbz}
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                and xt_cjip = #{xtCjip}
+            </if>
+            <if test="xtCjsj != null">
+                and xt_cjsj = #{xtCjsj}
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                and xt_cjr_id = #{xtCjrId}
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                and xt_cjr = #{xtCjr}
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                and xt_cjbmdm = #{xtCjbmdm}
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                and xt_cjbmmc = #{xtCjbmmc}
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                and xt_zhgxip = #{xtZhgxip}
+            </if>
+            <if test="xtZhgxsj != null">
+                and xt_zhgxsj = #{xtZhgxsj}
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                and xt_zhgxrid = #{xtZhgxrid}
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                and xt_zhgxr = #{xtZhgxr}
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                and xt_zhgxbmdm = #{xtZhgxbmdm}
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                and xt_zhgxbm = #{xtZhgxbm}
+            </if>
+            <if test="bz != null and bz != ''">
+                and bz = #{bz}
+            </if>
+        </where>
+        limit #{pageable.offset}, #{pageable.pageSize}
+    </select>
+
+    <!--统计总行数-->
+    <select id="count" resultType="java.lang.Long">
+        select count(1)
+        from tb_wz_xfwz
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="bbId != null and bbId != ''">
+                and bb_id = #{bbId}
+            </if>
+            <if test="yhId != null and yhId != ''">
+                and yh_id = #{yhId}
+            </if>
+            <if test="yhSfzh != null and yhSfzh != ''">
+                and yh_sfzh = #{yhSfzh}
+            </if>
+            <if test="yhXm != null and yhXm != ''">
+                and yh_xm = #{yhXm}
+            </if>
+            <if test="jzId != null and jzId != ''">
+                and jz_id = #{jzId}
+            </if>
+            <if test="jzMc != null and jzMc != ''">
+                and jz_mc = #{jzMc}
+            </if>
+            <if test="zb != null and zb != ''">
+                and zb = #{zb}
+            </if>
+            <if test="zbsl != null">
+                and zbsl = #{zbsl}
+            </if>
+            <if test="dwrq != null">
+                and dwrq = #{dwrq}
+            </if>
+            <if test="kssj != null">
+                and kssj = #{kssj}
+            </if>
+            <if test="jssj != null">
+                and jssj = #{jssj}
+            </if>
+            <if test="sc != null">
+                and sc = #{sc}
+            </if>
+            <if test="lc != null">
+                and lc = #{lc}
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                and ssbm = #{ssbm}
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                and ssbmid = #{ssbmid}
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                and ssbmdm = #{ssbmdm}
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                and ssxgaj = #{ssxgaj}
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                and ssxgajid = #{ssxgajid}
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                and ssxgajdm = #{ssxgajdm}
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                and sssgaj = #{sssgaj}
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                and sssgajid = #{sssgajid}
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                and sssgajdm = #{sssgajdm}
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                and xt_sjly = #{xtSjly}
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                and xt_sjzt = #{xtSjzt}
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                and xt_scbz = #{xtScbz}
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                and xt_cjip = #{xtCjip}
+            </if>
+            <if test="xtCjsj != null">
+                and xt_cjsj = #{xtCjsj}
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                and xt_cjr_id = #{xtCjrId}
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                and xt_cjr = #{xtCjr}
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                and xt_cjbmdm = #{xtCjbmdm}
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                and xt_cjbmmc = #{xtCjbmmc}
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                and xt_zhgxip = #{xtZhgxip}
+            </if>
+            <if test="xtZhgxsj != null">
+                and xt_zhgxsj = #{xtZhgxsj}
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                and xt_zhgxrid = #{xtZhgxrid}
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                and xt_zhgxr = #{xtZhgxr}
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                and xt_zhgxbmdm = #{xtZhgxbmdm}
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                and xt_zhgxbm = #{xtZhgxbm}
+            </if>
+            <if test="bz != null and bz != ''">
+                and bz = #{bz}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_wz_xfwz(id, bb_id, yh_id, yh_sfzh, yh_xm, jz_id, jz_mc,
+                               zb,
+                               zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj,ssbmid,ssxgajid,sssgajid,
+                               ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+                               xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                               xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{bbId}, #{yhId}, #{yhSfzh}, #{yhXm}, #{jzId}, #{jzMc},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+                #{zbsl}, #{dwrq}, #{kssj}, #{jssj}, #{sc}, #{lc},  #{jd}, #{wd}, #{zhgxsj},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz},
+                #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+                #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_wz_xfwz(bb_id, yh_id, yh_sfzh, yh_xm, jz_id, jz_mc, zb, zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj, ssbm,
+        ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+        xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+        (#{entity.bbId}, #{entity.yhId}, #{entity.yhSfzh}, #{entity.yhXm}, #{entity.jzId}, #{entity.jzMc},
+            #{entity.zb}, #{entity.zbsl}, #{entity.dwrq}, #{entity.kssj}, #{entity.jssj}, #{entity.sc}, #{entity.lc},
+            #{jd}, #{wd}, #{zhgxsj}, #{entity.ssbm}, #{entity.ssbmdm}, #{entity.ssxgaj}, #{entity.ssxgajdm},
+            #{entity.sssgaj}, #{entity.sssgajdm}, #{entity.xtSjly}, #{entity.xtSjzt}, #{entity.xtScbz}, #{entity.xtCjip}, #{entity.xtCjsj}, #{entity.xtCjrId}, #{entity.xtCjr}, #{entity.xtCjbmdm}, #{entity.xtCjbmmc}, #{entity.xtZhgxip}, #{entity.xtZhgxsj}, #{entity.xtZhgxrid}, #{entity.xtZhgxr}, #{entity.xtZhgxbmdm}, #{entity.xtZhgxbm}, #{entity.bz})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_wz_xfwz(bb_id, yh_id, yh_sfzh, yh_xm, jz_id, jz_mc, zb, zbsl, dwrq, kssj, jssj, sc, lc,  jd, wd, zhgxsj,
+                               ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz, xt_cjip,
+        xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm,
+        xt_zhgxbm, bz)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.bbId}, #{entity.yhId}, #{entity.yhSfzh}, #{entity.yhXm}, #{entity.jzId}, #{entity.jzMc},
+             #{entity.zb}, #{entity.zbsl}, #{entity.dwrq}, #{entity.kssj}, #{entity.jssj}, #{entity.sc},
+             #{entity.lc},  #{jd}, #{wd}, #{zhgxsj},
+             #{entity.ssbm}, #{entity.ssbmdm}, #{entity.ssxgaj}, #{entity.ssxgajdm}, #{entity.sssgaj},
+            #{entity.sssgajdm}, #{entity.xtSjly}, #{entity.xtSjzt}, #{entity.xtScbz}, #{entity.xtCjip},
+            #{entity.xtCjsj}, #{entity.xtCjrId}, #{entity.xtCjr}, #{entity.xtCjbmdm}, #{entity.xtCjbmmc}, #{entity.xtZhgxip}, #{entity.xtZhgxsj}, #{entity.xtZhgxrid}, #{entity.xtZhgxr}, #{entity.xtZhgxbmdm}, #{entity.xtZhgxbm}, #{entity.bz})
+        </foreach>
+        on duplicate key update
+        bb_id = values(bb_id),
+        yh_id = values(yh_id),
+        yh_sfzh = values(yh_sfzh),
+        yh_xm = values(yh_xm),
+        jz_id = values(jz_id),
+        jz_mc = values(jz_mc),
+        zb = values(zb),
+        zbsl = values(zbsl),
+        dwrq = values(dwrq),
+        kssj = values(kssj),
+        jssj = values(jssj),
+        sc = values(sc),
+        lc = values(lc),
+        jd = values(jd),
+        wd = values(wd),
+        zhgxsj = values(zhgxsj),
+        ssbm = values(ssbm),
+        ssbmdm = values(ssbmdm),
+        ssxgaj = values(ssxgaj),
+        ssxgajdm = values(ssxgajdm),
+        sssgaj = values(sssgaj),
+        sssgajdm = values(sssgajdm),
+        xt_sjly = values(xt_sjly),
+        xt_sjzt = values(xt_sjzt),
+        xt_scbz = values(xt_scbz),
+        xt_cjip = values(xt_cjip),
+        xt_cjsj = values(xt_cjsj),
+        xt_cjr_id = values(xt_cjr_id),
+        xt_cjr = values(xt_cjr),
+        xt_cjbmdm = values(xt_cjbmdm),
+        xt_cjbmmc = values(xt_cjbmmc),
+        xt_zhgxip = values(xt_zhgxip),
+        xt_zhgxsj = values(xt_zhgxsj),
+        xt_zhgxrid = values(xt_zhgxrid),
+        xt_zhgxr = values(xt_zhgxr),
+        xt_zhgxbmdm = values(xt_zhgxbmdm),
+        xt_zhgxbm = values(xt_zhgxbm),
+        bz = values(bz)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update tb_wz_xfwz
+        <set>
+            <if test="bbId != null and bbId != ''">
+                bb_id = #{bbId},
+            </if>
+            <if test="yhId != null and yhId != ''">
+                yh_id = #{yhId},
+            </if>
+            <if test="yhSfzh != null and yhSfzh != ''">
+                yh_sfzh = #{yhSfzh},
+            </if>
+            <if test="yhXm != null and yhXm != ''">
+                yh_xm = #{yhXm},
+            </if>
+            <if test="jzId != null and jzId != ''">
+                jz_id = #{jzId},
+            </if>
+            <if test="jzMc != null and jzMc != ''">
+                jz_mc = #{jzMc},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            </if>
+            <if test="zbsl != null">
+                zbsl = #{zbsl},
+            </if>
+            <if test="dwrq != null">
+                dwrq = #{dwrq},
+            </if>
+            <if test="kssj != null">
+                kssj = #{kssj},
+            </if>
+            <if test="jssj != null">
+                jssj = #{jssj},
+            </if>
+            <if test="sc != null">
+                sc = #{sc},
+            </if>
+            <if test="lc != null">
+                lc = #{lc},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zhgxsj != null">
+                zhgxsj = #{zhgxsj},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete from tb_wz_xfwz where id = #{id}
+    </delete>
+
+    <select id="queryByBbid" resultMap="TbWzXfwzMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_wz_xfwz
+        where xt_scbz = '0'
+        and bb_id = #{bbid,jdbcType=VARCHAR}  limit 1
+    </select>
+
+</mapper>
+
+
diff --git a/mosty-wzzx/src/main/resources/mapper/WztjMapper.xml b/mosty-wzzx/src/main/resources/mapper/WztjMapper.xml
new file mode 100644
index 0000000..c474a2e
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/WztjMapper.xml
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.wzzx.mapper.WztjMapper">
+    <select id="jwzbmlbtj" resultType="java.util.Map">
+        select id, yh_id, yh_sfzh, yh_xm, zb, zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj, ssbm, ssbmdm
+        from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.yhxm != null and dto.yhxm != ''">
+            and yh_xm like concat('%',#{dto.yhxm},'%')
+        </if>
+        <if test="dto.kslc != null and dto.kslc != ''">
+            and lc >= #{dto.kslc}
+        </if>
+        <if test="dto.jslc != null and dto.jslc != ''">
+            and lc &lt;= #{dto.jslc}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="xz" resultType="java.util.Map">
+        select id, bb_id as bbId, yh_id as yhId, yh_sfzh as yhSfzh, yh_xm as yhXm,jz_id as jzId, jz_mc as jcMc, zb,
+        zbsl, dwrq, kssj, jssj, sc, lc, jd, wd, zhgxsj, ssbm, ssbmdm
+        from mosty_wzzx.tb_wz_xfwz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.yhxm != null and dto.yhxm != ''">
+            and yh_xm like concat('%',#{dto.yhxm},'%')
+        </if>
+        <if test="dto.kslc != null and dto.kslc != ''">
+            and lc >= #{dto.kslc}
+        </if>
+        <if test="dto.jslc != null and dto.jslc != ''">
+            and lc &lt;= #{dto.jslc}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="jrlcs" resultType="java.util.Map">
+        select COALESCE(sum(lc), 0) as lcs from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="rslcxz" resultType="java.util.Map">
+        select a.sl as wzrs,b.lcs as lcs,c.wzs as wzs from
+        (
+        select count(1) as sl from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        ) a,
+        (
+        select COALESCE(sum(lc), 0) as lcs from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        ) b,
+        (
+        select count(1) as wzs from mosty_wzzx.tb_wz_xfwz where xt_sjzt='1' and xt_scbz='0' and bb_id is not null
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        ) c
+    </select>
+
+    <select id="jrwzrs" resultType="java.util.Map">
+        select count(1) as sl from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="jrxzwzs" resultType="java.util.Map">
+        select count(1) as wzs from mosty_wzzx.tb_wz_xfwz where xt_sjzt='1' and xt_scbz='0' and bb_id is not null
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="rywzlbCount" resultType="int">
+        select count(1) from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.yhxm != null and dto.yhxm != ''">
+            and yh_xm like concat('%',#{dto.yhxm},'%')
+        </if>
+        <if test="dto.kslc != null and dto.kslc != ''">
+            and lc >= #{dto.kslc}
+        </if>
+        <if test="dto.jslc != null and dto.jslc != ''">
+            and lc &lt;= #{dto.jslc}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+    </select>
+
+    <select id="rywzlb" resultType="java.util.Map">
+        select id, yh_id, yh_sfzh,yh_xm,zb,zbsl,dwrq,kssj,jssj,sc,lc,ssbm,ssbmdm,ssbmid
+        from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.ksrq != null and dto.ksrq != ''">
+            and dwrq >= #{dto.ksrq}
+        </if>
+        <if test="dto.jsrq != null and dto.jsrq != ''">
+            and dwrq &lt;= #{dto.jsrq}
+        </if>
+        <if test="dto.ksrq == null and dto.ksrq == '' and dto.jsrq == null and dto.jsrq == ''">
+            and TO_DAYS(dwrq) = TO_DAYS(NOW())
+        </if>
+        <if test="dto.yhxm != null and dto.yhxm != ''">
+            and yh_xm like concat('%',#{dto.yhxm},'%')
+        </if>
+        <if test="dto.kslc != null and dto.kslc != ''">
+            and lc >= #{dto.kslc}
+        </if>
+        <if test="dto.jslc != null and dto.jslc != ''">
+            and lc &lt;= #{dto.jslc}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="bbgjcx" resultType="java.util.Map">
+        select * from mosty_wzzx.tb_wz_xfwz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbid != null and dto.bbid != ''">
+            and bb_id = #{dto.bbid}
+        </if>
+        <if test="dto.yhid != null and dto.yhid != ''">
+            and yh_id = #{dto.yhid}
+        </if>
+        <if test="dto.yhsfzh != null and dto.yhsfzh != ''">
+            and yh_sfzh = #{dto.yhsfzh}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+    </select>
+
+    <select id="bbwzcx" resultType="java.util.Map">
+        select * from mosty_wzzx.tb_wz_xfwz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.bbid != null and dto.bbid != ''">
+            and bb_id = #{dto.bbid}
+        </if>
+        <if test="dto.yhid != null and dto.yhid != ''">
+            and yh_id = #{dto.yhid}
+        </if>
+        <if test="dto.yhsfzh != null and dto.yhsfzh != ''">
+            and yh_sfzh = #{dto.yhsfzh}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and dwrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and dwrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+    </select>
+
+    <select id="mjgjcx" resultType="java.util.Map">
+        select * from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.yhid != null and dto.yhid != ''">
+            and yh_id = #{dto.yhid}
+        </if>
+        <if test="dto.yhsfzh != null and dto.yhsfzh != ''">
+            and yh_sfzh = #{dto.yhsfzh}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+    </select>
+
+    <select id="wbbwz" resultType="java.util.Map">
+        select * from mosty_wzzx.tb_wz_rywz where xt_sjzt='1' and xt_scbz='0'
+        <if test="dto.yhid != null and dto.yhid != ''">
+            and yh_id = #{dto.yhid}
+        </if>
+        <if test="dto.yhsfzh != null and dto.yhsfzh != ''">
+            and yh_sfzh = #{dto.yhsfzh}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and dwrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and dwrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-wzzx/src/main/resources/mapper/WzzxUserMapper.xml b/mosty-wzzx/src/main/resources/mapper/WzzxUserMapper.xml
new file mode 100644
index 0000000..d5b525b
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/mapper/WzzxUserMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.wzzx.mapper.WzzxUserMapper">
+
+    <resultMap id="BaseResultMap" type="com.mosty.common.core.business.entity.SysUser">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="positionId" column="position_id" jdbcType="BIGINT"/>
+            <result property="positionName" column="position_name" jdbcType="VARCHAR"/>
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="loginName" column="login_name" jdbcType="VARCHAR"/>
+            <result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+            <result property="telePhone" column="tele_phone" jdbcType="VARCHAR"/>
+            <result property="idEntityCard" column="id_entity_card" jdbcType="VARCHAR"/>
+            <result property="inDustRialId" column="in_dust_rial_id" jdbcType="VARCHAR"/>
+            <result property="sex" column="sex" jdbcType="VARCHAR"/>
+            <result property="xtLrsj" column="xt_lrsj" jdbcType="TIMESTAMP"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
+            <result property="deptCode" column="dept_code" jdbcType="VARCHAR"/>
+            <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,position_id,position_name,
+        user_name,login_name,mobile,tele_phone,
+        id_entity_card,in_dust_rial_id,sex,
+        xt_lrsj,dept_id,dept_code,
+        dept_name
+    </sql>
+
+    <select id="selectByPage" resultType="com.mosty.common.core.business.entity.SysUser">
+        select  a.id, a.position_id, a.position_name,
+                a.user_name, a.login_name, a.mobile, a.tele_phone,
+                a.id_entity_card, a.in_dust_rial_id, a.sex,
+                a.xt_lrsj, c.id as dept_id, c.org_code as dept_code,
+                c.org_name as dept_name
+        from mosty_base.sys_user a
+        LEFT JOIN mosty_base.sys_user_dept b on a.id = b.user_id
+        LEFT JOIN mosty_base.sys_dept c on b.dept_id = c.id
+        where a.xt_zxbz = 0
+    </select>
+
+</mapper>
diff --git a/mosty-wzzx/src/main/resources/rebel.xml b/mosty-wzzx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..38c943e
--- /dev/null
+++ b/mosty-wzzx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-wzzx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-wzzx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-yjzl/mosty-yjzl.iml b/mosty-yjzl/mosty-yjzl.iml
new file mode 100644
index 0000000..3143c24
--- /dev/null
+++ b/mosty-yjzl/mosty-yjzl.iml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353926" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-yjzl/pom.xml b/mosty-yjzl/pom.xml
new file mode 100644
index 0000000..eb478a8
--- /dev/null
+++ b/mosty-yjzl/pom.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-yjzl</artifactId>
+    <description>预警指令</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.4.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/MostyYjzlApplication.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/MostyYjzlApplication.java
new file mode 100644
index 0000000..6c2566a
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/MostyYjzlApplication.java
@@ -0,0 +1,30 @@
+package com.mosty.yjzl;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ *	预警指令 微服务
+ * @author zengbo
+ * @date 2022/7/11 14:29 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.yjzl.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+@EnableScheduling
+public class MostyYjzlApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyYjzlApplication.class, args);
+	}
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/Cluster.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/Cluster.java
new file mode 100644
index 0000000..a1a13a8
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/Cluster.java
@@ -0,0 +1,12 @@
+package com.mosty.yjzl.cluster;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+public class Cluster {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/DistanceRunnable.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/DistanceRunnable.java
new file mode 100644
index 0000000..a199338
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/DistanceRunnable.java
@@ -0,0 +1,38 @@
+package com.mosty.yjzl.cluster;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class DistanceRunnable implements Runnable {
+
+	private WGS84Point point;
+	private Set<WGS84Point> points;
+	private List<NeighborDTO> neighborList;
+	private long scope;
+
+	public DistanceRunnable(WGS84Point point, Set<WGS84Point> points, List<NeighborDTO> neighborList, long scope) {
+		super();
+		this.point = point;
+		this.points = points;
+		this.neighborList = neighborList;
+		this.scope = scope;
+	}
+
+	@Override
+	public void run() {
+		Map<WGS84Point, Long> map = new HashMap<>();
+		for (WGS84Point point2 : points) {
+			if (point.equals(point2)) {
+				continue;
+			}
+			long distance = PositionUtil.getDistance(point.getLatitude(), point.getLongitude(), point2.getLatitude(), point2.getLongitude());
+			if (distance < scope) {
+				map.put(point2, distance);
+			}
+		}
+		neighborList.add(new NeighborDTO(point, map));
+	}
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDTO.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDTO.java
new file mode 100644
index 0000000..1be6be0
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDTO.java
@@ -0,0 +1,37 @@
+package com.mosty.yjzl.cluster;
+
+import java.util.Map;
+
+public class NeighborDTO implements Comparable<NeighborDTO> {
+
+	private WGS84Point point;
+	private Map<WGS84Point, Long> neighbors;
+
+	public NeighborDTO(WGS84Point point, Map<WGS84Point, Long> neighbors) {
+		super();
+		this.point = point;
+		this.neighbors = neighbors;
+	}
+
+	public WGS84Point getPoint() {
+		return point;
+	}
+
+	public void setPoint(WGS84Point point) {
+		this.point = point;
+	}
+
+	public Map<WGS84Point, Long> getNeighbors() {
+		return neighbors;
+	}
+
+	public void setNeighbors(Map<WGS84Point, Long> neighbors) {
+		this.neighbors = neighbors;
+	}
+
+	@Override
+	public int compareTo(NeighborDTO o) {
+		return o.getNeighbors().size() - neighbors.size();
+	}
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDistanceDTO.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDistanceDTO.java
new file mode 100644
index 0000000..53434ac
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/NeighborDistanceDTO.java
@@ -0,0 +1,24 @@
+package com.mosty.yjzl.cluster;
+
+public class NeighborDistanceDTO {
+
+	private long distance;
+	private WGS84Point neighbor;
+
+	public long getDistance() {
+		return distance;
+	}
+
+	public void setDistance(long distance) {
+		this.distance = distance;
+	}
+
+	public WGS84Point getNeighbor() {
+		return neighbor;
+	}
+
+	public void setNeighbor(WGS84Point neighbor) {
+		this.neighbor = neighbor;
+	}
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/PositionUtil.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/PositionUtil.java
new file mode 100644
index 0000000..1e53452
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/PositionUtil.java
@@ -0,0 +1,197 @@
+package com.mosty.yjzl.cluster;
+
+import java.util.Arrays;
+
+/**
+ * 坐标系转换工具类 </br>
+ * WGS84坐标系 地球坐标系，国际通用坐标系 </br>
+ * GCJ02坐标系 火星坐标系，WGS84坐标系加密后的坐标系；Google国内地图、高德、QQ地图 使用 </br>
+ * BD09坐标系 百度坐标系，GCJ02坐标系加密后的坐标系
+ */
+public class PositionUtil {
+
+	private static double pi = 3.1415926535897932384626;
+	private static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	private static double a = 6378245.0;
+	private static double ee = 0.00669342162296594323;
+
+	private static double transformLat(double x, double y) {
+		double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	private static double transformLon(double x, double y) {
+		double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+		ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0;
+		ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0;
+		ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 * pi)) * 2.0 / 3.0;
+		return ret;
+	}
+
+	private static double[] transform(double latitude, double longitude) {
+		if (outOfChina(latitude, longitude)) {
+			return new double[] { latitude, longitude };
+		}
+		double dLat = transformLat(longitude - 105.0, latitude - 35.0);
+		double dLon = transformLon(longitude - 105.0, latitude - 35.0);
+		double radLat = latitude / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = latitude + dLat;
+		double mgLon = longitude + dLon;
+		return new double[] { mgLat, mgLon };
+	}
+
+	private static boolean outOfChina(double latitude, double longitude) {
+		if (longitude < 72.004 || longitude > 137.8347) {
+			return true;
+		}
+		if (latitude < 0.8293 || latitude > 55.8271) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * WGS-84 转 火星坐标系
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] wgs84ToGcj02(double latitude, double longitude) {
+		if (outOfChina(latitude, longitude)) {
+			return new double[] { latitude, longitude };
+		}
+		double dLat = transformLat(longitude - 105.0, latitude - 35.0);
+		double dLon = transformLon(longitude - 105.0, latitude - 35.0);
+		double radLat = latitude / 180.0 * pi;
+		double magic = Math.sin(radLat);
+		magic = 1 - ee * magic * magic;
+		double sqrtMagic = Math.sqrt(magic);
+		dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi);
+		dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi);
+		double mgLat = latitude + dLat;
+		double mgLon = longitude + dLon;
+		return new double[] { mgLat, mgLon };
+	}
+	
+	public static void main(String[] args) {
+		double[] wgs84ToGcj02 = wgs84ToGcj02(30.55956521, 104.27152736);
+		System.out.println(Arrays.toString(wgs84ToGcj02));
+	}
+
+	/**
+	 * 火星坐标系 (GCJ-02) 转 WGS-84
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] gcj02ToWgs84(double latitude, double longitude) {
+		double[] wgs = transform(latitude, longitude);
+		double longitudetitude = longitude * 2 - wgs[1];
+		double latitudeitude = latitude * 2 - wgs[0];
+		return new double[] { latitudeitude, longitudetitude };
+	}
+
+	/**
+	 * 火星坐标系 (GCJ-02) 转百度坐标系 (BD-09)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] gcj02ToBd09(double latitude, double longitude) {
+		double x = longitude, y = latitude;
+		double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta) + 0.0065;
+		double tempLat = z * Math.sin(theta) + 0.006;
+		double[] wgs = { tempLat, tempLon };
+		return wgs;
+	}
+
+	/**
+	 * 百度坐标系 (BD-09) 转 火星坐标系 (GCJ-02)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] bd09ToGcj02(double latitude, double longitude) {
+		double x = longitude - 0.0065, y = latitude - 0.006;
+		double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+		double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+		double tempLon = z * Math.cos(theta);
+		double tempLat = z * Math.sin(theta);
+		double[] wgs = { tempLat, tempLon };
+		return wgs;
+	}
+
+	/**
+	 * WGS-84 转 百度坐标系 (BD-09)
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] wgs84ToBd09(double latitude, double longitude) {
+		double[] gcj02 = wgs84ToGcj02(latitude, longitude);
+		double[] bd09 = gcj02ToBd09(gcj02[0], gcj02[1]);
+		return bd09;
+	}
+
+	/**
+	 * 百度坐标系 (BD-09) 转 WGS-84
+	 *
+	 * @param latitude
+	 * @param longitude
+	 * @return
+	 */
+	public static double[] bd09ToWgs84(double latitude, double longitude) {
+		double[] gcj02 = bd09ToGcj02(latitude, longitude);
+		double[] wgs84 = gcj02ToWgs84(gcj02[0], gcj02[1]);
+		// 保留小数点后六位
+		wgs84[0] = retain6(wgs84[0]);
+		wgs84[1] = retain6(wgs84[1]);
+		return wgs84;
+	}
+
+	/**
+	 * 保留小数点后六位
+	 *
+	 * @param num
+	 * @return
+	 */
+	private static double retain6(double num) {
+		String result = String.format("%.6f", num);
+		return Double.valueOf(result);
+	}
+
+	/**
+	 * 计算两个坐标之间的距离
+	 * 
+	 * @param latitude1
+	 * @param longitude1
+	 * @param latitude2
+	 * @param longitude2
+	 * @return
+	 */
+	public static long getDistance(double latitude1, double longitude1, double latitude2, double longitude2) {
+		double rad = pi / 180.0;
+		double radlatitude1 = latitude1 * rad;
+		double radlatitude2 = latitude2 * rad;
+		double s = 2
+				* Math.asin(Math.sqrt(Math.pow(Math.sin((radlatitude1 - radlatitude2) / 2), 2) + Math.cos(radlatitude1)
+						* Math.cos(radlatitude2) * Math.pow(Math.sin(((longitude1 - longitude2) * rad) / 2), 2)));
+		return Math.round(s * a * 100) / 100;
+	}
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/WGS84Point.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/WGS84Point.java
new file mode 100644
index 0000000..ae5246a
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/cluster/WGS84Point.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010, Silvio Heuberger @ IFS www.ifs.hsr.ch
+ *
+ * This code is release under the Apache License 2.0.
+ * You should have received a copy of the license
+ * in the LICENSE file. If you have not, see
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.mosty.yjzl.cluster;
+
+import java.io.Serializable;
+
+/**
+ * {@link WGS84Point} encapsulates coordinates on the earths surface.<br>
+ * Coordinate projections might end up using this class...
+ */
+public class WGS84Point implements Serializable {
+	private static final long serialVersionUID = 7457963026513014856L;
+	private final double longitude;
+	private final double latitude;
+	private String ssbmdm;
+
+	public String getSsbmdm() {
+		return ssbmdm;
+	}
+
+	public void setSsbmdm(String ssbmdm) {
+		this.ssbmdm = ssbmdm;
+	}
+
+	public WGS84Point(double latitude, double longitude, String ssbmdm) {
+		this.latitude = latitude;
+		this.longitude = longitude;
+		this.ssbmdm = ssbmdm;
+		if (Math.abs(latitude) > 90 || Math.abs(longitude) > 180) {
+			throw new IllegalArgumentException("The supplied coordinates " + this + " are out of range.");
+		}
+	}
+
+	public WGS84Point(WGS84Point other) {
+		this(other.latitude, other.longitude, other.ssbmdm);
+	}
+
+	public double getLatitude() {
+		return latitude;
+	}
+
+	public double getLongitude() {
+		return longitude;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("(" + latitude + "," + longitude + ")");
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof WGS84Point) {
+			WGS84Point other = (WGS84Point) obj;
+			return latitude == other.latitude && longitude == other.longitude;
+		}
+		return false;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = 42;
+		long latBits = Double.doubleToLongBits(latitude);
+		long lonBits = Double.doubleToLongBits(longitude);
+		result = 31 * result + (int) (latBits ^ (latBits >>> 32));
+		result = 31 * result + (int) (lonBits ^ (lonBits >>> 32));
+		return result;
+	}
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/config/FeignConfig.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/FeignConfig.java
new file mode 100644
index 0000000..6f0fc8c
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.yjzl.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/config/GlobalYmlConfig.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..6c80f07
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.yjzl.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/config/WebMvcConfig.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/WebMvcConfig.java
new file mode 100644
index 0000000..38ebe84
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.yjzl.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycController.java
new file mode 100644
index 0000000..e56d0b8
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycController.java
@@ -0,0 +1,82 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.TbFzycDto;
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbFzycService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@Api(tags = "犯罪预测接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbFzyc")
+public class TbFzycController {
+
+    private TbFzycService tbFzycService;
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "犯罪预测新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbFzyc vo) {
+        return ResponseResult.success(tbFzycService.insert(vo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "犯罪预测更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbFzyc vo) {
+        return ResponseResult.success(tbFzycService.fzUpdateById(vo));
+    }
+
+    @ApiOperation("删除数据")
+    @JwtSysUser
+    @DeleteMapping("/{id}")
+    @Log(title = "犯罪预测删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> update(@PathVariable("id") String id) {
+        return ResponseResult.success(tbFzycService.deleteById(id));
+    }
+
+    @ApiOperation("App查询犯罪预测列表")
+    @JwtSysUser
+    @PostMapping("/queryListApp")
+    @Log(title = "查询犯罪预测列表", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbFzyc>> queryListApp(@RequestBody TbFzycDto tbFzycDto) {
+        return ResponseResult.success(tbFzycService.queryListApp(tbFzycDto));
+    }
+
+
+    @ApiOperation("查询犯罪预测列表")
+    @JwtSysUser
+    @PostMapping("/queryList")
+    @Log(title = "查询犯罪预测列表", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbFzyc>> queryList(@RequestBody TbFzycDto tbFzycDto) {
+        return ResponseResult.success(tbFzycService.queryList(tbFzycDto));
+    }
+
+    @ApiOperation("分页查询犯罪预测列表")
+    @JwtSysUser
+    @PostMapping("/queryListPage")
+    @Log(title = "分页查询犯罪预测列表", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbFzyc>> queryListPage(@RequestBody TbFzycDto tbFzycDto) {
+        return ResponseResult.success(tbFzycService.queryListPage(tbFzycDto));
+    }
+
+    @GetMapping("/getFzyjCount")
+    @ApiOperation("查询犯罪预测数量")
+    public ResponseResult<Integer> getFzyjCount(String ssbmdm, String time, String sfxl) {
+        return ResponseResult.success(tbFzycService.getFzyjCount(ssbmdm, time, sfxl));
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycPzController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycPzController.java
new file mode 100644
index 0000000..55f7968
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycPzController.java
@@ -0,0 +1,49 @@
+package com.mosty.yjzl.controller;
+
+import com.mosty.base.model.vo.yjzl.TbFzycPzVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbFzycPzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+@Api(tags = "犯罪预测配置接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbFzycPz")
+public class TbFzycPzController {
+
+    private TbFzycPzService tbFzycService;
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "犯罪预测配置新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbFzycPzVo vo) {
+        return ResponseResult.success(tbFzycService.insert(vo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "犯罪预测配置更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbFzycPzVo vo) {
+        return ResponseResult.success(tbFzycService.updateById(vo));
+    }
+
+    @ApiOperation("删除数据")
+    @JwtSysUser
+    @DeleteMapping("/{id}")
+    @Log(title = "犯罪预测配置删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> update(@PathVariable("id") String id) {
+        return ResponseResult.success(tbFzycService.deleteById(id));
+    }
+
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycXljlController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycXljlController.java
new file mode 100644
index 0000000..be338ad
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbFzycXljlController.java
@@ -0,0 +1,80 @@
+package com.mosty.yjzl.controller;
+
+import com.mosty.base.model.dto.yjzl.TbFzycXljlDto;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.yjzl.TbFzycXljl;
+import com.mosty.base.model.vo.wzzx.TbWzSblswzVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.model.vo.yjzl.TbFzycPzVo;
+import com.mosty.base.model.vo.yjzl.TbFzycXljlVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbFzycPzService;
+import com.mosty.yjzl.service.TbFzycXljlService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@Api(tags = "犯罪预测巡逻记录接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbFzycXljl")
+public class TbFzycXljlController {
+
+    private TbFzycXljlService tbFzycXljlService;
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "犯罪预测巡逻记录新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbFzycXljlVo vo) {
+        return ResponseResult.success(tbFzycXljlService.insert(vo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "犯罪预测巡逻记录更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbFzycXljlVo vo) {
+        return ResponseResult.success(tbFzycXljlService.updateById(vo));
+    }
+
+    @ApiOperation("删除数据")
+    @JwtSysUser
+    @DeleteMapping("/{id}")
+    @Log(title = "犯罪预测巡逻记录删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> update(@PathVariable("id") String id) {
+        return ResponseResult.success(tbFzycXljlService.deleteById(id));
+    }
+
+    @ApiOperation("根据ID查询")
+    @JwtSysUser
+    @GetMapping("/{id}")
+    @Log(title = "根据ID查询", businessType = BusinessType.OTHER)
+    public ResponseResult<TbFzycXljl> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(tbFzycXljlService.queryById(id));
+    }
+
+    @ApiOperation("查询犯罪预警预测指令巡逻记录列表")
+    @JwtSysUser
+    @GetMapping("/qfzxl")
+    @Log(title = "查询犯罪预警预测指令巡逻记录列表", businessType = BusinessType.OTHER)
+    public ResponseResult<List<TbFzycXljlDto>> qfzxl(String id) {
+        return ResponseResult.success(tbFzycXljlService.qfzxl(id));
+    }
+
+    @ApiOperation("新增数据")
+    @PostMapping("/addBySbwz")
+    @Log(title = "通过设备位置新增犯罪预测巡逻记录", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> addBySbwz(@RequestBody TbFzJlVo vo) {
+        tbFzycXljlService.addBySbwz(vo);
+        return ResponseResult.success();
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjDyyjxxController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjDyyjxxController.java
new file mode 100644
index 0000000..6d631b8
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjDyyjxxController.java
@@ -0,0 +1,50 @@
+package com.mosty.yjzl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.yjzl.TbYjDyyjxx;
+import com.mosty.base.model.query.yjzl.TbYjDyyjxxQuery;
+import com.mosty.yjzl.service.TbYjDyyjxxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "订阅预警信息接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjDyyjxx")
+public class TbYjDyyjxxController {
+
+    private TbYjDyyjxxService tbYjDyyjxxService;
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbYjDyyjxx>> paginQuery(TbYjDyyjxxQuery dto){
+        return ResponseResult.success(tbYjDyyjxxService.queryByPage(dto));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "订阅预警信息新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjDyyjxx dyyjxx){
+        return ResponseResult.success(tbYjDyyjxxService.insert(dyyjxx));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "订阅预警信息删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> deleteByIds(@RequestParam List<String> list){
+        return ResponseResult.success(tbYjDyyjxxService.deleteById(list));
+    }
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxController.java
new file mode 100644
index 0000000..2950acc
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxController.java
@@ -0,0 +1,73 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjmxQuery;
+import com.mosty.base.model.vo.yjzl.TbYjmxAllVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbYjmxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+
+@Api(tags = "预警模型接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjmx")
+public class TbYjmxController {
+
+    private TbYjmxService tbYjmxService;
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警模型新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjmxVo vo){
+        return ResponseResult.success(tbYjmxService.insert(vo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警模型更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjmxVo clVo){
+        return ResponseResult.success(tbYjmxService.updateById(clVo));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    @Log(title = "分页查询", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbYjmxVo>> getPage(TbYjmxQuery dto){
+        return ResponseResult.success(tbYjmxService.getPage(dto));
+    }
+
+    @ApiOperation("删除数据")
+    @JwtSysUser
+    @DeleteMapping("/{id}")
+    @Log(title = "预警模型删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> update(@PathVariable("id") String id){
+        return ResponseResult.success(tbYjmxService.deleteById(id));
+    }
+
+    @ApiOperation("启动、停止模型")
+    @JwtSysUser
+    @GetMapping("/{id}")
+    @Log(title = "启动、停止模型", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> start(@PathVariable("id") String id){
+        return ResponseResult.success(tbYjmxService.startMx(id));
+    }
+
+    @ApiOperation("查询模型参数详情信息")
+    @JwtSysUser
+    @PostMapping("/getMxCs/{mxid}")
+    public ResponseResult<TbYjmxAllVo> getMxCs(@PathVariable("mxid") String mxid){
+        return ResponseResult.success(this.tbYjmxService.getMxCs(mxid));
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxCsbController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxCsbController.java
new file mode 100644
index 0000000..39eccc7
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjmxCsbController.java
@@ -0,0 +1,60 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjmxCsbQuery;
+import com.mosty.base.model.vo.yjzl.TbYjmxCsbVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbYjmxCsbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+
+@Api(tags = "预警模型参数表接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjmxCsb")
+public class TbYjmxCsbController {
+
+    private TbYjmxCsbService tbYjmxCsbService;
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警模型参数表新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjmxCsbVo vo){
+        return ResponseResult.success(tbYjmxCsbService.insert(vo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警模型参数表更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjmxCsbVo clVo){
+        return ResponseResult.success(tbYjmxCsbService.updateById(clVo));
+    }
+
+    @ApiOperation("删除数据")
+    @JwtSysUser
+    @DeleteMapping("/{id}")
+    @Log(title = "预警模型参数表删除", businessType = BusinessType.DELETE)
+    public ResponseResult<Integer> delete(@PathVariable("id") String id){
+        return ResponseResult.success(tbYjmxCsbService.deleteById(id));
+    }
+
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    @Log(title = "分页查询", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbYjmxCsbVo>> getPage(TbYjmxCsbQuery dto){
+        return ResponseResult.success(tbYjmxCsbService.getPage(dto));
+    }
+
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxClController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxClController.java
new file mode 100644
index 0000000..1bba557
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxClController.java
@@ -0,0 +1,92 @@
+package com.mosty.yjzl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.query.yjzl.TbYjxxClQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxClVo;
+import com.mosty.yjzl.service.TbYjxxClService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Api(tags = "预警信息人员接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjxxCl")
+public class TbYjxxClController {
+
+    private TbYjxxClService tbYjxxClService;
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "预警信息车辆数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "配置ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbYjxxClVo> queryById(@PathVariable String id){
+        return ResponseResult.success(tbYjxxClService.queryById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping("/paginQuery")
+    public ResponseResult<IPage<TbYjxxClVo>> paginQuery(TbYjxxClQuery tbYjxxClQuery){
+        try {
+            return ResponseResult.success(tbYjxxClService.queryByPage(tbYjxxClQuery));
+        }catch (Exception e){
+            return ResponseResult.fail(500, e.getMessage());
+        }
+    }
+
+    @ApiOperation("不分页查询")
+    @JwtSysUser
+    @GetMapping("/queryListNoPager")
+    public ResponseResult<List<TbYjxxClVo>> queryListNoPager(TbYjxxClQuery tbYjxxClQuery){
+        try {
+            return ResponseResult.success(tbYjxxClService.queryList(tbYjxxClQuery));
+        }catch (Exception e){
+            return ResponseResult.fail(500, e.getMessage());
+        }
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警车辆信息新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjxxClVo ryVo){
+        return ResponseResult.success(tbYjxxClService.insert(ryVo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警信息人员更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjxxClVo clVo){
+        return ResponseResult.success(tbYjxxClService.update(clVo));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "预警车辆信息删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "list", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Integer> deleteByIds(@RequestParam List<String> list){
+        return ResponseResult.success(tbYjxxClService.deleteById(list));
+    }
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxController.java
new file mode 100644
index 0000000..9e60546
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxController.java
@@ -0,0 +1,175 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.GetLastYjDto;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.model.dto.yjzl.YjConvertZlDto;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.yjzl.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.yjzl.service.TbYjxxService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.yaml.snakeyaml.util.UriEncoder;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 预警信息表(TbYjxx)表控制层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-11 20:06:06
+ */
+@Api(tags = "预警信息相关接口")
+@RestController
+@RequestMapping("tbYjxx")
+@AllArgsConstructor
+public class TbYjxxController {
+
+    private final TbYjxxService tbYjxxService;
+
+
+    @ApiOperation("查询预警列表-分页")
+    @PostMapping(value = "/getPageList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbYjxx>> getPageList(@RequestBody TbYjxxQuery dto) {
+        return ResponseResult.success(tbYjxxService.getPageList(dto));
+    }
+
+    @ApiOperation("查询预警列表-不分页")
+    @GetMapping("/getList")
+    @JwtSysUser
+    public ResponseResult<List<TbYjxx>> getList(TbYjxxNoPageQuery dto) {
+        return ResponseResult.success(tbYjxxService.getList(dto));
+    }
+
+    @ApiOperation("查询预警列表-根据预警内容查询")
+    @GetMapping("/selectYjByNr")
+    @JwtSysUser
+    public ResponseResult<List<TbYjxxDTO>> selectYjByNr(@RequestParam("yjNr") String yjNr) {
+        return ResponseResult.success(tbYjxxService.selectYjByNr(yjNr));
+    }
+
+    @ApiOperation("查询预警列表-热力图使用")
+    @GetMapping("/getListHotMapEs")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getListHotMapEs(TbYjxxNoPageQuery dto) {
+        return ResponseResult.success(tbYjxxService.getListHotMapEs(dto));
+    }
+
+
+    @ApiOperation("查询预警列表-热力图使用")
+    @GetMapping("/getListHotMap")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getListHotMap(TbYjxxNoPageQuery dto) {
+        return ResponseResult.success(tbYjxxService.getListHotMap(dto));
+    }
+
+    @ApiOperation("查询预警详情")
+    @GetMapping("/getInfo/{id}")
+    @JwtSysUser
+    public ResponseResult<TbYjxx> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(tbYjxxService.getInfo(id));
+    }
+
+
+    @ApiOperation("大屏-巡组气泡框-预警轨迹")
+    @GetMapping("/selectTrack")
+    @JwtSysUser
+    @Log(title = "大屏-巡组气泡框-预警轨迹", businessType = BusinessType.OTHER)
+    public ResponseResult<IPage<TbYjxx>> selectTrack(TbYjxxYjgjQuery tbYjxx) {
+        return ResponseResult.success(tbYjxxService.selectTrack(tbYjxx));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping("/insert")
+    @Log(title = "预警新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjxx yjxx) {
+        return ResponseResult.success(tbYjxxService.insert(yjxx));
+    }
+
+    @ApiOperation("查询预警列表-不分页")
+    @GetMapping("/queryYjxx")
+    @JwtSysUser
+    public ResponseResult<TbYjxx> queryYjxx(TbYjxx dto) {
+        return ResponseResult.success(tbYjxxService.queryYjxx(dto));
+    }
+
+    @ApiOperation("通过证件号码和车牌号查询人员的预警信息")
+    @GetMapping("/getYjgj")
+    @JwtSysUser
+    public ResponseResult<IPage<TbYjxx>> getYjgj(VwSyrkJzgjGxListQuery dto) {
+        return ResponseResult.success(tbYjxxService.getYjgj(dto));
+    }
+
+    @ApiOperation("APP端预警信息统计-预警级别")
+    @GetMapping("/getYjxxTj")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getYjxxTj(TbYjxxYjjbStatisticsQuery dto) {
+        return ResponseResult.success(tbYjxxService.getYjxxTj(dto));
+    }
+
+    @ApiOperation("APP端预警信息统计-预警类型")
+    @GetMapping("/getYjxxTjYjlx")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getYjxxTjYjlx(String kssj, String jssj) {
+        return ResponseResult.success(tbYjxxService.getYjxxTjYjlx(kssj, jssj));
+    }
+
+    @ApiOperation("APP端单人、单车预警统计")
+    @GetMapping("/getStatistics")
+    @JwtSysUser
+    public ResponseResult<Map<String, Object>> getStatistics(TbYjxxStatisticsQuery dto) {
+        return ResponseResult.success(tbYjxxService.getStatistics(dto));
+    }
+
+    @ApiOperation("APP各时段预警")
+    @GetMapping("/gsdyj")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今天 2.7天 3.30天 4.90天", required = true, dataType = "String"),
+    })
+    public ResponseResult<Object> gsdyj(String type) {
+        return ResponseResult.success(tbYjxxService.gsdyj(type));
+    }
+
+    @ApiOperation("APP预警转为指令")
+    @PostMapping(value = "/yjConvertZl")
+    public ResponseResult<Void> yjConvertZl(@RequestBody YjConvertZlDto dto) {
+        this.tbYjxxService.yjConvertZl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取最新一条预警")
+    @PostMapping(value = "/getLastYj")
+    public ResponseResult<TbYjxx> getLastYj(@RequestBody GetLastYjDto dto) {
+        return ResponseResult.success(this.tbYjxxService.getLastYj(dto));
+    }
+
+    @ApiOperation("修改预警信息是否发送指令")
+    @PostMapping(value = "/updateYjxxSffszl/{id}")
+    public ResponseResult<TbYjxx> updateYjxxSffszl(@PathVariable("id") String id) {
+        this.tbYjxxService.updateYjxxSffszl(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询预警信息列表（只查询又经纬度信息的）")
+    @PostMapping(value = "/getYjxx30Day")
+    public ResponseResult<List<TbYjxx>> getYjxx30Day(@RequestBody TbYjxxQuery dto) {
+        return ResponseResult.success(this.tbYjxxService.getYjxx30Day(dto));
+    }
+
+}
+
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxDypzController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxDypzController.java
new file mode 100644
index 0000000..cf1e9b3
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxDypzController.java
@@ -0,0 +1,68 @@
+package com.mosty.yjzl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.query.yjzl.TbYjxxDypzQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxDypzVo;
+import com.mosty.yjzl.service.TbYjxxDypzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "预警信息配置接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjxxDypz")
+public class TbYjxxDypzController {
+
+    private TbYjxxDypzService tbYjxxDypzService;
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "预警配置数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "配置ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbYjxxDypzVo> queryById(@PathVariable String id){
+        return ResponseResult.success(tbYjxxDypzService.queryById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbYjxxDypzVo>> paginQuery(TbYjxxDypzQuery dto){
+        return ResponseResult.success(tbYjxxDypzService.queryList(dto));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警配置新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjxxDypzVo dypz){
+        return ResponseResult.success(tbYjxxDypzService.insert(dypz));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警配置更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjxxDypzVo dypz){
+        return ResponseResult.success(tbYjxxDypzService.updateById(dypz));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "预警配置删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "list", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Integer> deleteByIds(@RequestParam List<String> list){
+        return ResponseResult.success(tbYjxxDypzService.deleteById(list));
+    }
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxLzController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxLzController.java
new file mode 100644
index 0000000..cb3b615
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxLzController.java
@@ -0,0 +1,46 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.BasePage;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.yjzl.TbYjxxMxyj;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.yjzl.service.TbYjxxLzService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 预警信息表(TbYjxx)泸州拓尔思
+ *
+ * @author dw
+ * @since 2022-11-20
+ */
+@Api(tags = "预警信息相关接口(泸州拓尔思)")
+@RestController
+@RequestMapping("tbYjxxLz")
+@AllArgsConstructor
+public class TbYjxxLzController {
+
+    private final TbYjxxLzService tbYjxxLzService;
+
+    @ApiOperation("添加泸州拓尔思预警信息")
+    @PostMapping(value = "/addYjxx")
+    public ResponseResult<Void> addYjxx(@RequestBody TAlarmYjgj item) {
+        this.tbYjxxLzService.addYjxx(item);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("LZ模型预警查询")
+    @GetMapping
+    public ResponseResult<IPage<TbYjxxMxyj>> querYjmx(BasePage basePage, String ssbmdm) {
+        return ResponseResult.success(this.tbYjxxLzService.querYjmx(basePage,ssbmdm));
+    }
+
+
+
+
+}
+
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxRyController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxRyController.java
new file mode 100644
index 0000000..b41bd0b
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxRyController.java
@@ -0,0 +1,84 @@
+package com.mosty.yjzl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.query.yjzl.TbYjxxRyQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxRyVo;
+import com.mosty.yjzl.service.TbYjxxRyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Api(tags = "预警信息人员接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjxxRy")
+public class TbYjxxRyController {
+
+    private TbYjxxRyService tbYjxxRyService;
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "预警信息人员数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "配置ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbYjxxRyVo> queryById(@PathVariable String id){
+        return ResponseResult.success(tbYjxxRyService.queryById(id));
+    }
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping("/paginQuery")
+    public ResponseResult<IPage<TbYjxxRyVo>> paginQuery(TbYjxxRyQuery tbYjxxRyQuery){
+        return ResponseResult.success(tbYjxxRyService.queryByPage(tbYjxxRyQuery));
+    }
+
+    @ApiOperation("不分页查询")
+    @JwtSysUser
+    @GetMapping("/queryListNoPager")
+    public ResponseResult<List<TbYjxxRyVo>> queryListNoPager(TbYjxxRyQuery tbYjxxRyQuery){
+        return ResponseResult.success(tbYjxxRyService.queryList(tbYjxxRyQuery));
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警信息人员新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjxxRyVo ryVo){
+        return ResponseResult.success(tbYjxxRyService.insert(ryVo));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警信息人员更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjxxRyVo ryVo){
+        return ResponseResult.success(tbYjxxRyService.update(ryVo));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "预警信息人员删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "list", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Integer> deleteByIds(@RequestParam List<String> list){
+        return ResponseResult.success(tbYjxxRyService.deleteById(list));
+    }
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxSjController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxSjController.java
new file mode 100644
index 0000000..d680b42
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbYjxxSjController.java
@@ -0,0 +1,83 @@
+package com.mosty.yjzl.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.query.yjzl.TbYjxxSjQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxSjVo;
+import com.mosty.yjzl.service.TbYjxxSjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  预警信息-事件表 前端控制器
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Api(tags = "预警信息事件表接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbYjxxSj")
+public class TbYjxxSjController {
+
+    private TbYjxxSjService tbYjxxSjService;
+
+
+    @ApiOperation("通过ID查询单条数据")
+    @JwtSysUser
+    @GetMapping("{id}")
+    @Log(title = "预警事件数据", businessType = BusinessType.OTHER)
+    @ApiImplicitParam(name = "id", value = "配置ID", paramType = "path", required = true, dataType="String")
+    public ResponseResult<TbYjxxSjVo> queryById(@PathVariable String id){
+        return ResponseResult.success(tbYjxxSjService.queryById(id));
+    }
+
+
+    @ApiOperation("分页查询")
+    @JwtSysUser
+    @GetMapping
+    public ResponseResult<IPage<TbYjxxSjVo>> paginQuery(TbYjxxSjQuery tbYjxxSjQuery){
+        try {
+            return ResponseResult.success(tbYjxxSjService.queryByPage(tbYjxxSjQuery));
+        }catch (Exception e){
+            return ResponseResult.fail(500, e.getMessage());
+        }
+    }
+
+    @ApiOperation("新增数据")
+    @JwtSysUser
+    @PostMapping
+    @Log(title = "预警事件新增", businessType = BusinessType.INSERT)
+    public ResponseResult<Integer> add(@RequestBody TbYjxxSjVo yjsj){
+        return ResponseResult.success(tbYjxxSjService.insert(yjsj));
+    }
+
+    @ApiOperation("更新数据")
+    @JwtSysUser
+    @PutMapping
+    @Log(title = "预警事件更新", businessType = BusinessType.UPDATE)
+    public ResponseResult<Integer> edit(@RequestBody TbYjxxSjVo yjsj){
+        return ResponseResult.success(tbYjxxSjService.update(yjsj));
+    }
+
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/bacth")
+    @Log(title = "预警事件删除", businessType = BusinessType.UPDATE)
+    @ApiImplicitParam(name = "list", value = "标签主键", paramType = "path", required = true, dataType="String")
+    public ResponseResult<Integer> deleteByIds(@RequestParam List<String> list){
+        return ResponseResult.success(tbYjxxSjService.deleteById(list));
+    }
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxController.java
new file mode 100644
index 0000000..77951cb
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxController.java
@@ -0,0 +1,246 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.entity.trs.VwAlermYjgl;
+import com.mosty.base.model.entity.trs.VwAlermYjzl;
+import com.mosty.base.model.entity.yjzl.TbZlYjRy;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import com.mosty.base.model.vo.yjzl.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbZlxxService;
+import com.mosty.yjzl.service.TbZlxxZxjlService;
+import io.swagger.annotations.*;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "指令信息相关接口")
+@RestController
+@AllArgsConstructor
+@CrossOrigin
+@RequestMapping("/tbZl")
+public class TbZlxxController {
+
+    private final TbZlxxService tbZlxxService;
+    private final TbZlxxZxjlService tbZlxxZxjlService;
+
+    @ApiOperation("根据时间查询指令执行情况")
+    @GetMapping("/selectInstructCount")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "查询开始时间（默认查询当天）", name = "startTime", dataType = "String"),
+            @ApiImplicitParam(value = "查询结束时间（默认查询当天）", name = "endTime", dataType = "String")
+    })
+    public ResponseResult<Map<String, Object>> selectInstructCount(String startTime, String endTime) {
+        return ResponseResult.success(this.tbZlxxService.selectInstructCount(startTime, endTime));
+    }
+
+
+    @ApiOperation("大屏-查询指令列表-分页")
+    @PostMapping(value = "/selectInstructList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbZlxxVo>> selectInstructList(@RequestBody TbZlxxQuery dto) {
+        return ResponseResult.success(this.tbZlxxService.selectInstructList(dto));
+    }
+
+    @ApiOperation("添加指令信息")
+    @PostMapping(value = "/addZl")
+    @Log(title = "添加指令信息", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Void> addZl(@RequestBody TbZlxxInsertDto dto) {
+        this.tbZlxxService.addZl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改指令信息")
+    @PostMapping(value = "/updateZl")
+    @Log(title = "修改指令信息", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Void> updateZl(@RequestBody TbZlxxInsertDto dto) {
+        this.tbZlxxService.updateZl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询事件的参与警力")
+    @GetMapping(value = "/getCyjlList")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getCyjlList(CyjlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getCyjlList(dto));
+    }
+
+    @ApiOperation("查询事件的现场装备")
+    @GetMapping(value = "/getXczbList")
+    @JwtSysUser
+    public ResponseResult<List<TbQwXfbbVo>> getXczbList(String sjid) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getXczbList(sjid));
+    }
+
+    @ApiOperation("APP获取我的指令数量")
+    @GetMapping(value = "/getMyZlCount")
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getMyZlCount() {
+        return ResponseResult.success(this.tbZlxxZxjlService.getMyZlCount());
+    }
+
+    @ApiOperation("APP获取我的指令列表")
+    @GetMapping(value = "/getMyZlList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbZlxxZxrVo>> getMyZlList(MyZlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getMyZlList(dto));
+    }
+
+    @ApiOperation("查询指令处置流程以及最新记录")
+    @GetMapping(value = "/getZxjlList")
+    @JwtSysUser
+    public ResponseResult<List<TbZlxxZxjlVo>> getNewZxjl(NewZxjlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getNewZxjl(dto));
+    }
+
+    @ApiOperation("指令到期状态修改")
+    @PostMapping(value = "/changeZlGqzt")
+    @JwtSysUser
+    public ResponseResult<Void> changeZlGqzt() {
+        this.tbZlxxService.changeZlGqzt();
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("指令处置流程")
+    @PostMapping(value = "/zlHandle")
+    @Log(title = "指令处置流程", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Void> zlHandle(@RequestBody TbZlxxZtChangeDto dto) {
+        this.tbZlxxService.zlHandle(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("指令处置流程（人员管控）")
+    @PostMapping(value = "/zlHandleRygk")
+    @Log(title = "指令处置流程（人员管控）", businessType = BusinessType.UPDATE)
+    @JwtSysUser
+    public ResponseResult<Void> zlHandleRygk(@RequestBody TbZlxxZtChangeRygkDto dto) {
+        this.tbZlxxService.zlHandleRygk(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询指令详细信息")
+    @GetMapping(value = "{id}")
+    @JwtSysUser
+    public ResponseResult<TbZlxxInfoVo> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbZlxxService.getInfo(id));
+    }
+
+    @ApiOperation("添加指令执行记录")
+    @PostMapping(value = "/addZxjl")
+    @Log(title = "添加指令执行记录", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Void> addZxjl(@RequestBody TbZlxxZxjlInsertDto dto) {
+        this.tbZlxxService.addZxjl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("添加指令盘查人车的记录")
+    @PostMapping(value = "/addPcrycl")
+    @Log(title = "添加指令盘查人车的记录", businessType = BusinessType.INSERT)
+    @JwtSysUser
+    public ResponseResult<Void> addPcrycl(@RequestBody TbZlxxPcryclInsertDto dto) {
+        this.tbZlxxService.addPcrycl(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取托尔斯预警指令信息添加")
+    @PostMapping(value = "/addTrsZl")
+    public ResponseResult<Void> addTrsZl(@RequestBody VwAlermYjzlVo vo) {
+        this.tbZlxxService.addTrsZl(vo);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取托尔斯预警信息添加")
+    @PostMapping(value = "/addTrsYj")
+    public ResponseResult<Void> addTrsYj(@RequestBody VwAlermYjgl vo) {
+        this.tbZlxxService.addTrsYj(vo);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取最后一条TRS推送的指令信息")
+    @PostMapping(value = "/getLastZlxx")
+    public ResponseResult<TbZlxx> getLastZlxx() {
+        return ResponseResult.success(this.tbZlxxService.getLastZlxx());
+    }
+
+    @ApiOperation("查询实有人口指令信息")
+    @GetMapping(value = "/getSyrkZlxx")
+    public ResponseResult<IPage<TbZlYjRyVo>> getSyrkZlxx(VwSyrkJzgjGxListQuery dto) {
+        return ResponseResult.success(this.tbZlxxService.getSyrkZlxx(dto));
+    }
+
+    @ApiOperation("APP指令统计--指令类型")
+    @GetMapping(value = "/getTjOfZllx")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今日 2.近7日 3.近30日 4.近90日", dataType = "String", required = true)
+    })
+    @JwtSysUser
+    public ResponseResult<List<Map<String, Object>>> getTjOfZllx(String type) {
+        return ResponseResult.success(this.tbZlxxService.getTjOfZllx(type));
+    }
+
+    @ApiOperation("根据完成情况统计指令数量")
+    @JwtSysUser
+    @GetMapping(value = "/getStatisticsByStatus")
+    public ResponseResult<Map<String, Object>> getStatisticsByStatus() {
+        return ResponseResult.success(this.tbZlxxService.getStatisticsByStatus());
+    }
+
+    @ApiOperation("查询我发送的指令")
+    @JwtSysUser
+    @GetMapping(value = "/getMySendZlList")
+    public ResponseResult<IPage<TbZlxxVo>> getMySendZlList(MyZlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxService.getMySendZlList(dto));
+    }
+
+    @ApiOperation("查询我发送的指令")
+    @JwtSysUser
+    @GetMapping(value = "/getZlCount")
+    public ResponseResult<Integer> getZlCount(String ssbmdm, String time, String zlzxzt) {
+        return ResponseResult.success(this.tbZlxxService.getZlCount(ssbmdm, time, zlzxzt));
+    }
+
+    @ApiOperation("大屏预警统计")
+    @JwtSysUser
+    @PostMapping(value = "/yjzlTj")
+    public ResponseResult<Map<String,Integer>> yjzlTj() {
+        return ResponseResult.success(this.tbZlxxService.yjzlTj());
+    }
+
+
+
+    @ApiOperation("警情转指令")
+    @JwtSysUser
+    @GetMapping(value = "/andJqZl")
+    public ResponseResult<Void> andJqZl(String ssbmid,String jqid, String bbids, String zlxflx) {
+        this.tbZlxxService.andJqZl(ssbmid,jqid, bbids,zlxflx);
+        return ResponseResult.success();
+    }
+
+
+    @ApiOperation("预警转指令")
+    @JwtSysUser
+    @GetMapping(value = "/andYjZl")
+    public ResponseResult<Void> andYjZl(String yjid, String bbids) {
+        this.tbZlxxService.andYjZl(yjid, bbids);
+        return ResponseResult.success();
+    }
+
+
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxtjController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxtjController.java
new file mode 100644
index 0000000..c61ae9f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZlxxtjController.java
@@ -0,0 +1,69 @@
+package com.mosty.yjzl.controller;
+
+import com.mosty.base.model.vo.yjzl.TbYjzlZqtjVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjphVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjxxVo;
+import com.mosty.base.model.vo.yjzl.TbYzzlDjtjVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbYjzltjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "指令中心统计接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/tbZlxxtj")
+public class TbZlxxtjController {
+
+    private TbYjzltjService tbYjzltjService;
+
+    @ApiOperation("指令中心--首页指令状态统计信息")
+    @GetMapping(value = "/ZlZtTjxx")
+    @JwtSysUser
+    public ResponseResult<List<TbYjzltjxxVo>> ZlZtTjxx() {
+        return ResponseResult.success(tbYjzltjService.rwzttjxx());
+    }
+
+    @ApiOperation("指令中心--首页指令排行统计信息")
+    @GetMapping(value = "/zlPhTjxx")
+    @JwtSysUser
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "type", value = "1.今日 2.近7日 3.近30日 4.近90日", dataType = "String", required = true)
+    })
+    public ResponseResult<List<TbYjzltjphVo>> zlPhTjxx(String type) {
+        return ResponseResult.success(tbYjzltjService.rwphtjxx(type));
+    }
+
+    @ApiOperation("指令中心--首页指令周期统计信息")
+    @GetMapping(value = "/zlZqtjxx")
+    @JwtSysUser
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "type", value = "1.今日 2.近7日 3.近30日 4.近90日", dataType = "String", required = true)
+    })
+    public ResponseResult<Map<String, Object>> zlZqtjxx(String type) {
+        return ResponseResult.success(tbYjzltjService.zlZqtjxx(type));
+    }
+
+    @ApiOperation("指令中心--首页指令等级统计信息")
+    @GetMapping(value = "/zlDjtjxx")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1.今日 2.近7日 3.近30日 4.近90日", dataType = "String", required = true)
+    })
+    public ResponseResult<List<TbYzzlDjtjVo>> zlDjtjxx(String type) {
+        return ResponseResult.success(tbYjzltjService.zlDjtjxx(type));
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZxzbController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZxzbController.java
new file mode 100644
index 0000000..b57e6f5
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZxzbController.java
@@ -0,0 +1,53 @@
+package com.mosty.yjzl.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.yjzl.TbZxzb;
+import com.mosty.base.model.query.yjzl.TbZxzbQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbZxzbService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "中心坐标相关接口")
+@RestController
+@AllArgsConstructor
+@CrossOrigin
+@RequestMapping("/tbZxzb")
+public class TbZxzbController {
+
+    private final TbZxzbService tbZxzbService;
+
+    @ApiOperation("查询中心坐标列表-分页")
+    @GetMapping(value = "/getPageList")
+    @JwtSysUser
+    public ResponseResult<IPage<TbZxzb>> getPageList(@RequestBody TbZxzbQuery zxzbQuery) {
+        return ResponseResult.success(tbZxzbService.queryListPage(zxzbQuery));
+    }
+
+    @ApiOperation("查询中心坐标列表-不分页")
+    @GetMapping("/getList")
+    @JwtSysUser
+    public ResponseResult<List<TbZxzb>> getList(TbZxzbQuery zxzbQuery) {
+        return ResponseResult.success(tbZxzbService.queryList(zxzbQuery));
+    }
+
+    @ApiOperation("计算犯罪区域")
+    @GetMapping("/computeCenter")
+    @JwtSysUser
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "开始时间", dataType = "String", required = false),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", dataType = "String", required = false)
+    })
+    public ResponseResult computeCenter(String startTime, String endTime) {
+        tbZxzbService.computeCenter(startTime, endTime);
+        return ResponseResult.success();
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzlStatisticsController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzlStatisticsController.java
new file mode 100644
index 0000000..a730b34
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzlStatisticsController.java
@@ -0,0 +1,237 @@
+package com.mosty.yjzl.controller;
+
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.query.yjzl.TbYjqkQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.YjzlStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "预警信息相关统计接口，原magic旧接口--预警信息")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/yjxx")
+public class YjzlStatisticsController {
+
+    private YjzlStatisticsService yjzlStatisticsService;
+
+    @ApiOperation("车辆预警列表TOP")
+    @JwtSysUser
+    @GetMapping("/yjcl/clyjlb")
+    public ResponseResult<List<Map<String, Object>>> clyjlb(TbYjxxStatisticsDto vo) {
+        return ResponseResult.success(yjzlStatisticsService.clyjlb(vo));
+    }
+
+    @ApiOperation("根据车牌号查询")
+    @JwtSysUser
+    @GetMapping("/yjcl/queryBycCphm")
+    public ResponseResult<List<Map<String, Object>>> queryBycCphm(TbYjxxPageStatisticsDto vo) {
+        return ResponseResult.success(yjzlStatisticsService.queryBycCphm(vo));
+    }
+
+    @ApiOperation("根据车牌号查询预警列表-日")
+    @JwtSysUser
+    @GetMapping("/yjcl/queryBycCphmlb")
+    public ResponseResult<List<Map<String, Object>>> queryBycCphmlb(TbYjxxPageStatisticsDto vo) {
+        return ResponseResult.success(yjzlStatisticsService.queryBycCphmlb(vo));
+    }
+
+    @ApiOperation("根据车牌号查询预警列表-月")
+    @JwtSysUser
+    @GetMapping("/yjcl/yqueryBycCphmlb")
+    public ResponseResult<List<Map<String, Object>>> yqueryBycCphmlb(TbYjxxYStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yqueryBycCphmlb(dto));
+    }
+
+    @ApiOperation("根据车牌号查询预警列表-月")
+    @JwtSysUser
+    @GetMapping("/yjcl/zqueryBycCphmlb")
+    public ResponseResult<List<Map<String, Object>>> zqueryBycCphmlb(TbYjxxPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zqueryBycCphmlb(dto));
+    }
+
+    @ApiOperation("日预警车辆TOP20")
+    @JwtSysUser
+    @GetMapping("/yjcl/yjcltj")
+    public ResponseResult<List<Map<String, Object>>> yjcltj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjcltj(dto));
+    }
+
+    @ApiOperation("预警标签统计")
+    @JwtSysUser
+    @GetMapping("/yjcl/yjbqtj")
+    public ResponseResult<List<Map<String, Object>>> yjbqtj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjbqtj(dto));
+    }
+
+    @ApiOperation("预警级别统计")
+    @JwtSysUser
+    @GetMapping("/yjcl/yjjbtj")
+    public ResponseResult<List<Map<String, Object>>> yjjbtj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjjbtj(dto));
+    }
+
+    @ApiOperation("月预警车辆TOP20")
+    @JwtSysUser
+    @GetMapping("/yjcl/yyjcltj")
+    public ResponseResult<List<Map<String, Object>>> yyjcltj(TbYjxxYStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yyjcltj(dto));
+    }
+
+    @ApiOperation("周预警车辆TOP20")
+    @JwtSysUser
+    @GetMapping("/yjcl/zyjcltj")
+    public ResponseResult<List<Map<String, Object>>> zyjcltj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zyjcltj(dto));
+    }
+
+    @ApiOperation("根据身份证查询")
+    @JwtSysUser
+    @GetMapping("/yjry/queryBySfzh")
+    public ResponseResult<List<Map<String, Object>>> queryBySfzh(TbYjxxRyStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.queryBySfzh(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-日")
+    @JwtSysUser
+    @GetMapping("/yjry/queryBySfzhlb")
+    public ResponseResult<List<Map<String, Object>>> queryBySfzhlb(TbYjxxRyPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.queryBySfzhlb(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-日(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/queryBySfzhlbsc")
+    public ResponseResult<List<Map<String, Object>>> queryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.queryBySfzhlbsc(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-月")
+    @JwtSysUser
+    @GetMapping("/yjry/yqueryBySfzhlb")
+    public ResponseResult<List<Map<String, Object>>> yqueryBySfzhlb(TbYjxxRyNyStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yqueryBySfzhlb(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-月(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/yqueryBySfzhlbsc")
+    public ResponseResult<List<Map<String, Object>>> yqueryBySfzhlbsc(TbYjxxRyNyStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yqueryBySfzhlbsc(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-周")
+    @JwtSysUser
+    @GetMapping("/yjry/zqueryBySfzhlb")
+    public ResponseResult<List<Map<String, Object>>> zqueryBySfzhlb(TbYjxxRyPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zqueryBySfzhlb(dto));
+    }
+
+    @ApiOperation("根据身份证查询列表-周(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/zqueryBySfzhlbsc")
+    public ResponseResult<List<Map<String, Object>>> zqueryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zqueryBySfzhlbsc(dto));
+    }
+
+    @ApiOperation("人员预警列表TOP")
+    @JwtSysUser
+    @GetMapping("/yjry/ryyjlb")
+    public ResponseResult<List<Map<String, Object>>> ryyjlb(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.ryyjlb(dto));
+    }
+
+    @ApiOperation("预警级别统计-人员")
+    @JwtSysUser
+    @GetMapping("/yjry/yjjbtj")
+    public ResponseResult<List<Map<String, Object>>> yjjbtjRy(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjjbtjRy(dto));
+    }
+
+    @ApiOperation("预警人员级别统计-人员")
+    @JwtSysUser
+    @GetMapping("/yjry/jbtj")
+    public ResponseResult<List<Map<String, Object>>> jbtj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.jbtj(dto));
+    }
+
+    @ApiOperation("预警人员TOP20")
+    @JwtSysUser
+    @GetMapping("/yjry/yjrytj")
+    public ResponseResult<List<Map<String, Object>>> yjrytj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjrytj(dto));
+    }
+
+    @ApiOperation("预警人员TOP20(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/yjrytjsc")
+    public ResponseResult<List<Map<String, Object>>> yjrytjsc(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yjrytjsc(dto));
+    }
+
+    @ApiOperation("月预警人员TOP20")
+    @JwtSysUser
+    @GetMapping("/yjry/yyjrytj")
+    public ResponseResult<List<Map<String, Object>>> yyjrytj(TbYjxxYyjStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yyjrytj(dto));
+    }
+
+    @ApiOperation("月预警人员TOP20(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/yyjrytjsc")
+    public ResponseResult<List<Map<String, Object>>> yyjrytjsc(TbYjxxYyjStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.yyjrytjsc(dto));
+    }
+
+    @ApiOperation("周预警人员TOP20")
+    @JwtSysUser
+    @GetMapping("/yjry/zyjrytj")
+    public ResponseResult<List<Map<String, Object>>> zyjrytj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zyjrytj(dto));
+    }
+
+    @ApiOperation("周预警人员TOP20(三车前科人员)")
+    @JwtSysUser
+    @GetMapping("/yjry/zyjrytjsc")
+    public ResponseResult<List<Map<String, Object>>> zyjrytjsc(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zyjrytjsc(dto));
+    }
+
+    @ApiOperation("周边预警列表(不分页)")
+    @JwtSysUser
+    @GetMapping("/zbyj/zbyjbfylb")
+    public ResponseResult<List<Map<String, Object>>> zbyjbfylb(TbYjxxRyPageStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zbyjbfylb(dto));
+    }
+
+    @ApiOperation("周边预警列表(不分页)")
+    @JwtSysUser
+    @GetMapping("/zbyj/zbyjtj")
+    public ResponseResult<List<Map<String, Object>>> zbyjtj(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.zbyjtj(dto));
+    }
+
+    // 泸州态势统计-各区县预警情况
+    @ApiOperation("泸州态势统计-各区县预警情况")
+    @PostMapping("/getGqxyjqk")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getXfscAndLcTj(TbYjqkQuery dto) {
+        return ResponseResult.success(yjzlStatisticsService.getGqxyjqk(dto));
+    }
+
+    // 泸州态势统计-警情与预警指令执行对比分析
+    @ApiOperation("泸州态势统计-警情与预警指令执行对比分析")
+    @PostMapping("/getJqscAndZlTj")
+    @JwtSysUser
+    public ResponseResult<Map<String,Object>> getJqscAndZlTj(TbYjqkQuery dto) {
+        return ResponseResult.success(yjzlStatisticsService.getJqscAndZlTj(dto));
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzxStatisticsController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzxStatisticsController.java
new file mode 100644
index 0000000..7a85e3c
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/YjzxStatisticsController.java
@@ -0,0 +1,60 @@
+package com.mosty.yjzl.controller;
+
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.YjzlStatisticsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "预警信息相关统计接口，原magic旧接口--预警中心")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/yjzx")
+public class YjzxStatisticsController {
+
+    private YjzlStatisticsService yjzlStatisticsService;
+
+    @ApiOperation("感知源预警排名")
+    @JwtSysUser
+    @GetMapping("/gzyyjpm")
+    public ResponseResult<List<Map<String, Object>>> gzyyjpm(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.gzyyjpm(dto));
+    }
+
+    @ApiOperation("派出所预警排名")
+    @JwtSysUser
+    @GetMapping("/pcsyjpm")
+    public ResponseResult<List<Map<String, Object>>> pcsyjpm(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.pcsyjpm(dto));
+    }
+
+    @ApiOperation("人员预警排名")
+    @JwtSysUser
+    @GetMapping("/ryyjpm")
+    public ResponseResult<List<Map<String, Object>>> ryyjpm(TbYjxxStatisticsDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.ryyjpm(dto));
+    }
+
+    @ApiOperation("右侧预警统计")
+    @JwtSysUser
+    @GetMapping("/ycyjtj")
+    public ResponseResult<List<Map<String, Object>>> ycyjtj(TbYjxxStatisticsQueryDto dto) {
+        return ResponseResult.success(yjzlStatisticsService.ycyjtj(dto));
+    }
+
+    @ApiOperation("预警中心--预警统计")
+    @JwtSysUser
+    @GetMapping("/yjtj")
+    public ResponseResult<List<Map<String, Object>>> ycyjtj() {
+        return ResponseResult.success(yjzlStatisticsService.yjtj());
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycJsdxMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycJsdxMapper.java
new file mode 100644
index 0000000..7325b8f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycJsdxMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbFzycJsdx;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ * 犯罪预测 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbFzycJsdxMapper extends BaseMapper<TbFzycJsdx> {
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycMapper.java
new file mode 100644
index 0000000..6592b81
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycMapper.java
@@ -0,0 +1,25 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.yjzl.TbFzycDto;
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 犯罪预测 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbFzycMapper extends BaseMapper<TbFzyc> {
+
+
+    List<TbFzyc> selectListBm(TbFzycDto dto);
+
+
+    int getFzyjCount(TbFzycDto dto);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycPzMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycPzMapper.java
new file mode 100644
index 0000000..9be975e
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycPzMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbFzycPz;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ * 犯罪预测配置 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbFzycPzMapper extends BaseMapper<TbFzycPz> {
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXfxzMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXfxzMapper.java
new file mode 100644
index 0000000..f753051
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXfxzMapper.java
@@ -0,0 +1,23 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbFzycJsdx;
+import com.mosty.base.model.entity.yjzl.TbFzycXfxz;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 犯罪预测 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbFzycXfxzMapper extends BaseMapper<TbFzycXfxz> {
+
+    int updateSfqs(String zlid);
+
+    String selectQs(@Param("bbid")String bbid,@Param("fzycid")String fzycid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXljlMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXljlMapper.java
new file mode 100644
index 0000000..9998efb
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbFzycXljlMapper.java
@@ -0,0 +1,41 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.yjzl.TbFzycXljl;
+import com.mosty.base.model.vo.yjzl.TbFzycXljlVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 犯罪预测巡逻记录 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbFzycXljlMapper extends BaseMapper<TbFzycXljl> {
+
+    @ApiOperation("新增犯罪区域记录")
+    int insertEntity(TbFzycXljl xfbb);
+
+    @ApiOperation("修改犯罪区域记录")
+    int updateEntity(TbFzycXljl xfbb);
+
+    @ApiOperation("修改犯罪区域记录")
+    TbFzycXljl selectByFzBb(TbFzycXljlVo xljlVo);
+
+    @ApiOperation("查询犯罪预警预测指令巡逻记录列表")
+    List<TbFzycXljl> qfzxl(String fzyjyczlId);
+
+
+    @ApiOperation("盘查人员数")
+    int pcrys(String bbid);
+
+    @ApiOperation("盘查车辆数")
+    int pccls(String bbid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjDyyjxxMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjDyyjxxMapper.java
new file mode 100644
index 0000000..a8c85c0
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjDyyjxxMapper.java
@@ -0,0 +1,20 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjDyyjxx;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface TbYjDyyjxxMapper extends BaseMapper<TbYjDyyjxx> {
+
+    /**
+     * 根据ID删除
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxCsbMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxCsbMapper.java
new file mode 100644
index 0000000..3688e41
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxCsbMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjmxCsb;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbYjmxCsbMapper extends BaseMapper<TbYjmxCsb> {
+
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxMapper.java
new file mode 100644
index 0000000..caea46f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjmxMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjmx;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ * 预警模型 Mapper 接口
+ * </p>
+ */
+@Mapper
+public interface TbYjmxMapper  extends BaseMapper<TbYjmx> {
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClBqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClBqMapper.java
new file mode 100644
index 0000000..69e7715
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClBqMapper.java
@@ -0,0 +1,42 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxClBq;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-车辆-标签表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Mapper
+public interface TbYjxxClBqMapper extends BaseMapper<TbYjxxClBq> {
+
+    /**
+     * 根据ID删除
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+
+    /**
+     * 根据预警ID删除
+     * @param yjid
+     */
+    int deleteByYjId(@Param("yjid") String yjid);
+
+    /**
+     * 根据预警ID查询
+     * @param list
+     * @return
+     */
+    List<TbYjxxClBq> queryByYjid(@Param("list") List<String> list);
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClMapper.java
new file mode 100644
index 0000000..7977aec
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxClMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxCl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-车辆表 Mapper 接口
+ * </p>
+ *
+ * @author dw
+ * @since 2022-10-21
+ */
+@Mapper
+public interface TbYjxxClMapper extends BaseMapper<TbYjxxCl> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("添加预警车辆信息")
+    void insertEntity(TbYjxxCl clxx);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzClbqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzClbqMapper.java
new file mode 100644
index 0000000..cecb2df
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzClbqMapper.java
@@ -0,0 +1,22 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzClbq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TbYjxxDypzClbqMapper extends BaseMapper<TbYjxxDypzClbq> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID查询")
+    List<TbYjxxDypzClbq> queryByDyid(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID删除")
+    void deleteByDyid(@Param("dyid") String dyid);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzGzyMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzGzyMapper.java
new file mode 100644
index 0000000..1f55b6b
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzGzyMapper.java
@@ -0,0 +1,24 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzGzy;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+@Mapper
+public interface TbYjxxDypzGzyMapper extends BaseMapper<TbYjxxDypzGzy> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID查询")
+    List<TbYjxxDypzGzy> queryByDyid(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID删除")
+    void deleteByDyid(@Param("dyid") String dyid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzMapper.java
new file mode 100644
index 0000000..17ea095
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypz;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-订阅配置表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Mapper
+public interface TbYjxxDypzMapper extends BaseMapper<TbYjxxDypz> {
+
+    /**
+     * 根据ID删除
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzRybqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzRybqMapper.java
new file mode 100644
index 0000000..e969832
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzRybqMapper.java
@@ -0,0 +1,31 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzRybq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-订阅-人员标签表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Mapper
+public interface TbYjxxDypzRybqMapper extends BaseMapper<TbYjxxDypzRybq> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID查询")
+    List<TbYjxxDypzRybq> queryByDyid(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID删除")
+    void deleteByDyid(@Param("dyid") String dyid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzSjbqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzSjbqMapper.java
new file mode 100644
index 0000000..e1c0905
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzSjbqMapper.java
@@ -0,0 +1,31 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzSjbq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-订阅-事件标签表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Mapper
+public interface TbYjxxDypzSjbqMapper extends BaseMapper<TbYjxxDypzSjbq> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID查询")
+    List<TbYjxxDypzSjbq> queryByDyid(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID删除")
+    void deleteByDyid(@Param("dyid") String dyid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzYjjbMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzYjjbMapper.java
new file mode 100644
index 0000000..4d073a4
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxDypzYjjbMapper.java
@@ -0,0 +1,31 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxDypzYjjb;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-订阅-预警级别表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@Mapper
+public interface TbYjxxDypzYjjbMapper extends BaseMapper<TbYjxxDypzYjjb> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID查询")
+    List<TbYjxxDypzYjjb> queryByDyid(@Param("list") List<String> list);
+
+    @ApiOperation("根据订阅ID删除")
+    void deleteByDyid(@Param("dyid") String dyid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMapper.java
new file mode 100644
index 0000000..516ba71
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMapper.java
@@ -0,0 +1,71 @@
+package com.mosty.yjzl.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.yjzl.TbYjxxYjjbStatisticsQuery;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 预警信息表(TbYjxx)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-11 20:06:06
+ */
+@Mapper
+public interface TbYjxxMapper extends BaseMapper<TbYjxx> {
+
+    @ApiOperation("获取预警信息总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("分页获取预警信息")
+    List<TbYjxx> getListPage(Map<String, Object> map);
+
+    @ApiOperation("查询预警信息不分页")
+    List<TbYjxx> getList(Map<String, Object> map);
+
+    @ApiOperation("查询预警详情")
+    TbYjxx getInfoById(String id);
+
+    @ApiOperation("根据来源Id查询预警信息")
+    TbYjxx queryTbYjxx(String warningId);
+
+    @ApiOperation("根据身份证号和车牌号查询预警数量")
+    Integer countBySfzhOrCph(@Param("sfzh") String sfzh, @Param("cphm") String cphm);
+
+    @ApiOperation("根据身份证号和车牌号查询预警数量")
+    int countCurrentBySfzhOrCph(@Param("sfzh") String sfzh, @Param("cphm") String cphm);
+
+    @ApiOperation("新增预警数据")
+    void insertEntity(TbYjxx yjxx);
+
+    @ApiOperation("APP预警信息统计")
+    List<Map<String, Object>> getYjxxTj(Map<String, Object> map);
+
+    @ApiOperation("APP预警信息统计-预警类型")
+    List<Map<String, Object>> getYjxxTjYjlx(@Param("kssj") String kssj,
+                                            @Param("jssj") String jssj,
+                                            @Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("统计今日各时段预警")
+    List<Map<String, Object>> todayGsdyj(@Param("useSql") String useSql);
+
+    @ApiOperation("修改预警信息")
+    void updateEntity(TbYjxx tempYjxx);
+
+
+
+    @ApiOperation("查询警情信息（此处由于数据量太大没有走feign）")
+    List<TbJq> queryJq(@Param("kssj") String kssj,
+                       @Param("jssj") String jssj);
+
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMxyjMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMxyjMapper.java
new file mode 100644
index 0000000..511c2ff
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxMxyjMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxMxyj;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface TbYjxxMxyjMapper extends BaseMapper<TbYjxxMxyj> {
+
+    @ApiOperation("新增模型预警")
+    void insertEntity(TbYjxxMxyj mxyj);
+
+    @ApiOperation("修改模型预警")
+    void updateEntity(TbYjxxMxyj mxyj);
+
+    @ApiOperation("查询模型2的模型预警单条")
+    TbYjxxMxyj selectbyMxId(@Param("kssj") String kssj,
+                            @Param("jssj") String jssj,
+                            @Param("radius") int radius,
+                            @Param("jd") BigDecimal jd,
+                            @Param("wd") BigDecimal wd,
+                            @Param("mxid") String mxid);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyBqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyBqMapper.java
new file mode 100644
index 0000000..d33768b
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyBqMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxRyBq;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员-标签表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxRyBqMapper extends BaseMapper<TbYjxxRyBq> {
+
+    /**
+     * 根据ID删除
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+    /**
+     * 根据预警人员ID查询
+     * @param list
+     * @return
+     */
+    List<TbYjxxRyBq> queryByYjryId(@Param("list") List<String> list);
+
+    /**
+     * 根据业务ID删除
+     * @param ywid
+     */
+    void deleteByYwid(@Param("ywid") String ywid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyMapper.java
new file mode 100644
index 0000000..186c0b9
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRyMapper.java
@@ -0,0 +1,28 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxRy;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 预警信息-人员表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxRyMapper extends BaseMapper<TbYjxxRy> {
+
+    @ApiOperation("根据ID删除")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("新增人员信息")
+    void insertEntity(TbYjxxRy ryxx);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRySjajMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRySjajMapper.java
new file mode 100644
index 0000000..8134207
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxRySjajMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxRySjaj;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员-涉及案件表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxRySjajMapper extends BaseMapper<TbYjxxRySjaj> {
+
+    /**
+     * 根据ID删除
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+    /**
+     * 根据预警人员-涉及案件表
+     * @param list
+     * @return
+     */
+    List<TbYjxxRySjaj> queryByYjryId(@Param("list") List<String> list);
+
+    /**
+     * 根据业务ID删除
+     * @param ywid
+     */
+    void deleteByYwid(@Param("ywid") String ywid);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjGlryclMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjGlryclMapper.java
new file mode 100644
index 0000000..0c3e3a1
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjGlryclMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxSjGlrycl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警-事件-关联人员车辆表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxSjGlryclMapper extends BaseMapper<TbYjxxSjGlrycl> {
+
+    /**
+     * 删除事件-关联人员车辆表
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+    /**
+     * 根据预警ID删除
+     * @param yjid
+     */
+    int deleteByYjId(@Param("yjid") String yjid);
+
+    /**
+     * 根据预警ID查询
+     * @param list
+     * @return
+     */
+    List<TbYjxxSjGlrycl> queryByYjid(@Param("list") List<String> list);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjMapper.java
new file mode 100644
index 0000000..a711c8c
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxSjMapper.java
@@ -0,0 +1,30 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxSj;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-事件表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxSjMapper extends BaseMapper<TbYjxxSj> {
+
+    @ApiOperation("删除盘查人员车辆")
+    int deleteByIds(@Param("list") List<String> list);
+
+    @ApiOperation("根据预警ID删除")
+    int deleteByYjId(@Param("yjid") String yjid);
+
+    @ApiOperation("添加事件预警信息")
+    void insertEntity(TbYjxxSj sj);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxYjczjlMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxYjczjlMapper.java
new file mode 100644
index 0000000..e3782ff
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjxxYjczjlMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbYjxxYjczjl;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-操作记录表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbYjxxYjczjlMapper extends BaseMapper<TbYjxxYjczjl> {
+
+    /**
+     * 删除盘查人员车辆
+     * @param list
+     */
+    int deleteByIds(@Param("list") List<String> list);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjzltjMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjzltjMapper.java
new file mode 100644
index 0000000..7110252
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbYjzltjMapper.java
@@ -0,0 +1,32 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.vo.yjzl.TbYjzlZqtjVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjphVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjxxVo;
+import com.mosty.base.model.vo.yjzl.TbYzzlDjtjVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TbYjzltjMapper extends BaseMapper<TbZlxx> {
+
+    @ApiOperation("指令中心--首页指令状态统计信息")
+    List<TbYjzltjxxVo> rwzttjxx(Map<String, Object> map);
+
+    @ApiOperation("指令中心--首页指令排行统计信息")
+    List<TbYjzltjphVo> rwphtjxx(@Param("kssj") String kssj,
+                                @Param("jssj") String jssj);
+
+    @ApiOperation("指令中心--首页指令周期统计信息")
+    List<Map<String, Object>> zlZqtjxx(Map<String, Object> map);
+
+    @ApiOperation("指令中心--首页指令等级统计信息")
+    List<TbYzzlDjtjVo> zlDjtjxx(Map<String, Object> map);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlJqMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlJqMapper.java
new file mode 100644
index 0000000..cc2d1f8
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlJqMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlJq;
+import org.mapstruct.Mapper;
+
+@Mapper
+public interface TbZlJqMapper extends BaseMapper<TbZlJq> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlRgMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlRgMapper.java
new file mode 100644
index 0000000..60ed285
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlRgMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlRg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbZlRgMapper extends BaseMapper<TbZlRg> {
+
+    @ApiOperation("添加人工指令")
+    void insertEntity(TbZlRg rgzl);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdMapper.java
new file mode 100644
index 0000000..a835fb4
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlXlBxd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指令-巡逻指令-必巡点表 Mapper 接口
+ * </p>
+ *
+ * @author 鞠梦曦
+ * @since 2022-10-14
+ */
+@Mapper
+public interface TbZlXlBxdMapper extends BaseMapper<TbZlXlBxd> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdXljlMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdXljlMapper.java
new file mode 100644
index 0000000..08df0e3
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlBxdXljlMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlXlBxdXljl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指令-巡逻指令-必巡点巡逻记录表 Mapper 接口
+ * </p>
+ *
+ * @author 鞠梦曦
+ * @since 2022-10-14
+ */
+@Mapper
+public interface TbZlXlBxdXljlMapper extends BaseMapper<TbZlXlBxdXljl> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlMapper.java
new file mode 100644
index 0000000..3aca86d
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlXlMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlXl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指令-巡逻指令表 Mapper 接口
+ * </p>
+ *
+ * @author 鞠梦曦
+ * @since 2022-10-14
+ */
+@Mapper
+public interface TbZlXlMapper extends BaseMapper<TbZlXl> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClCnryMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClCnryMapper.java
new file mode 100644
index 0000000..8b32cee
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClCnryMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlYjClCnry;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 指令-车辆乘坐人员预警指令表 Mapper 接口
+ * </p>
+ *
+ * @author 鞠梦曦
+ * @since 2022-10-14
+ */
+@Mapper
+public interface TbZlYjClCnryMapper extends BaseMapper<TbZlYjClCnry> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClMapper.java
new file mode 100644
index 0000000..80925c9
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjClMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlYjCl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbZlYjClMapper extends BaseMapper<TbZlYjCl> {
+
+    @ApiOperation("添加指令信息")
+    void insertEntity(TbZlYjCl zlCl);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjRyMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjRyMapper.java
new file mode 100644
index 0000000..dde9969
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjRyMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlYjRy;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbZlYjRyMapper extends BaseMapper<TbZlYjRy> {
+
+    @ApiOperation("添加人员预警指令信息")
+    void insertEntity(TbZlYjRy zlRy);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjSjMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjSjMapper.java
new file mode 100644
index 0000000..52c0a80
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlYjSjMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.yjzl.mapper;
+
+import com.mosty.base.model.entity.yjzl.TbZlYjSj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbZlYjSjMapper extends BaseMapper<TbZlYjSj> {
+
+    @ApiOperation("添加指令预警事件实体")
+    void insertEntity(TbZlYjSj zlSj);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxMapper.java
new file mode 100644
index 0000000..5f96e0f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxMapper.java
@@ -0,0 +1,64 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxr;
+import com.mosty.base.model.vo.yjzl.TbZlxxZxrVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by 张海军 on 2022/7/11 17:20
+ *
+ * @ClassName TbZlMapper
+ */
+@Mapper
+public interface TbZlxxMapper extends BaseMapper<TbZlxx> {
+
+    @ApiOperation("根据时间查询指令执行情况")
+    Map<String, Object> selectInstructCount(@Param("startTime") String startTime,
+                                            @Param("endTime") String endTime,
+                                            @Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("查询指令列表")
+    List<TbZlxx> getListPage(Map<String, Object> map);
+
+    @ApiOperation("查询指令数量")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("添加指令数据")
+    void insertEntity(TbZlxx zl);
+
+    @ApiOperation("修改指令数据")
+    void updateEntity(TbZlxx zl);
+
+    @ApiOperation("根据条件查询我的指令信息")
+    List<Map<String, Object>> getMyZlCount(Map<String, Object> map);
+
+    @ApiOperation("根据条件查询我的指令信息列表")
+    List<TbZlxxZxrVo> getMyZlList(Map<String, Object> mp);
+
+    @ApiOperation("根据条件获取指令数量")
+    int getMyZlCountBy(Map<String, Object> mp);
+
+    @ApiOperation("查询当前指令的执行人")
+    TbZlxxZxr selectZxr(@Param("zlId") String zlId,
+                        @Param("ssbmid") String ssbmid,
+                        @Param("sfz") String sfz);
+
+    @ApiOperation("APP指令统计--指令类型")
+    List<Map<String, Object>> getTjOfZllx(@Param("kssj") String kssj,
+                                          @Param("jssj") String jssj,
+                                          @Param("ssbmdm") String ssbmdm);
+    @ApiOperation("根据完成情况统计指令数量")
+    int getStatisticsByStatus(@Param("sfz") String sfz,
+                              @Param("ssbmid") String ssbmid,
+                              @Param("type") String type);
+
+    @ApiOperation("根据身份证号查询指令统计--新稚")
+    List<Map<String, Object>> getStatistics(Map<String, Object> mp);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxPcryclMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxPcryclMapper.java
new file mode 100644
index 0000000..fb27b56
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxPcryclMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlxxPcrycl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbZlxxPcryclMapper extends BaseMapper<TbZlxxPcrycl> {
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxjlMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxjlMapper.java
new file mode 100644
index 0000000..e620b6f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxjlMapper.java
@@ -0,0 +1,30 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxjl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指令-执行过程表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@Mapper
+public interface TbZlxxZxjlMapper extends BaseMapper<TbZlxxZxjl> {
+
+    @ApiOperation("删除执行过程")
+    int deleteZxjl(@Param("list") List<String> list);
+
+    @ApiOperation("根据指令ID删除")
+    void deleteByZlid(@Param("zlid") String zlid);
+
+    @ApiOperation("添加实体")
+    void insertEntity(TbZlxxZxjl zxjl);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxrMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxrMapper.java
new file mode 100644
index 0000000..89f5cda
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZlxxZxrMapper.java
@@ -0,0 +1,22 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxr;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 指令-执行人或部门或巡组表 Mapper 接口
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-09-05
+ */
+@Mapper
+public interface TbZlxxZxrMapper extends BaseMapper<TbZlxxZxr> {
+
+    @ApiOperation("删除指令执行人信息")
+    void deleteByZlid(@Param("zlid") String zlid);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZxzbMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZxzbMapper.java
new file mode 100644
index 0000000..5e3c486
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/TbZxzbMapper.java
@@ -0,0 +1,16 @@
+package com.mosty.yjzl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yjzl.TbZxzb;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 中心坐标
+ */
+@Mapper
+public interface TbZxzbMapper extends BaseMapper<TbZxzb> {
+
+    void deleteAll(@Param("zblx") String zblx);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/YjzlStatisticsMapper.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/YjzlStatisticsMapper.java
new file mode 100644
index 0000000..ae94928
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mapper/YjzlStatisticsMapper.java
@@ -0,0 +1,145 @@
+package com.mosty.yjzl.mapper;
+
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.checkerframework.checker.signature.qual.FieldDescriptorForPrimitiveOrArrayInUnnamedPackage;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface YjzlStatisticsMapper {
+
+    @ApiOperation("车辆预警列表TOP")
+    List<Map<String, Object>> clyjlb(Map<String, Object> map);
+
+    @ApiOperation("根据车牌号查询")
+    List<Map<String, Object>> queryBycCphm(Map<String, Object> map);
+
+    @ApiOperation("根据车牌号查询预警列表-日")
+    List<Map<String, Object>> queryBycCphmlb(Map<String, Object> map);
+
+    @ApiOperation("根据车牌号查询预警列表-月")
+    List<Map<String, Object>> yqueryBycCphmlb(Map<String, Object> map);
+
+    @ApiOperation("根据车牌号查询预警列表-周")
+    List<Map<String, Object>> zqueryBycCphmlb(Map<String, Object> map);
+
+    @ApiOperation("日预警车辆TOP20")
+    List<Map<String, Object>> yjcltj(Map<String, Object> map);
+
+    @ApiOperation("预警标签统计")
+    List<Map<String, Object>> yjbqtj(Map<String, Object> map);
+
+    @ApiOperation("预警级别统计")
+    List<Map<String, Object>> yjjbtj(Map<String, Object> map);
+
+    @ApiOperation("月预警车辆TOP20")
+    List<Map<String, Object>> yyjcltj(Map<String, Object> map);
+
+    @ApiOperation("周预警车辆TOP20")
+    List<Map<String, Object>> zyjcltj(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询")
+    List<Map<String, Object>> queryBySfzh(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-日")
+    List<Map<String, Object>> queryBySfzhlb(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-日(三车前科人员)")
+    List<Map<String, Object>> queryBySfzhlbsc(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-月")
+    List<Map<String, Object>> yqueryBySfzhlb(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-月(三车前科人员)")
+    List<Map<String, Object>> yqueryBySfzhlbsc(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-周")
+    List<Map<String, Object>> zqueryBySfzhlb(Map<String, Object> map);
+
+    @ApiOperation("根据身份证查询列表-周(三车前科人员)")
+    List<Map<String, Object>> zqueryBySfzhlbsc(Map<String, Object> map);
+
+    @ApiOperation("人员预警列表TOP")
+    List<Map<String, Object>> ryyjlb(Map<String, Object> map);
+
+    @ApiOperation("预警级别统计--人员")
+    List<Map<String, Object>> yjjbtjRy(Map<String, Object> map);
+
+    @ApiOperation("预警人员级别统计")
+    List<Map<String, Object>> jbtj(Map<String, Object> map);
+
+    @ApiOperation("预警人员TOP20")
+    List<Map<String, Object>> yjrytj(Map<String, Object> map);
+
+    @ApiOperation("预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> yjrytjsc(Map<String, Object> map);
+
+    @ApiOperation("月预警人员TOP20")
+    List<Map<String, Object>> yyjrytj(Map<String, Object> map);
+
+    @ApiOperation("月预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> yyjrytjsc(Map<String, Object> map);
+
+    @ApiOperation("周预警人员TOP20")
+    List<Map<String, Object>> zyjrytj(Map<String, Object> map);
+
+    @ApiOperation("周预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> zyjrytjsc(Map<String, Object> map);
+
+    @ApiOperation("周边预警列表(不分页)")
+    List<Map<String, Object>> zbyjbfylb(Map<String, Object> map);
+
+    @ApiOperation("周边预警统计")
+    List<Map<String, Object>> zbyjtj(Map<String, Object> map);
+
+    @ApiOperation("感知源预警排名")
+    List<Map<String, Object>> gzyyjpm(Map<String, Object> map);
+
+    @ApiOperation("派出所预警排名")
+    List<Map<String, Object>> pcsyjpm(Map<String, Object> map);
+
+    @ApiOperation("人员预警排名")
+    List<Map<String, Object>> ryyjpm(Map<String, Object> map);
+
+    @ApiOperation("右侧预警统计")
+    List<Map<String, Object>> ycyjtj(Map<String, Object> map);
+
+    @ApiOperation("预警中心--预警统计")
+    List<Map<String, Object>> yjtj(@Param("ssbmdm") String ssbmdm);
+
+    @ApiOperation("预警数")
+    List<Map<String, Object>> getYjsl(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("指令数")
+    List<Map<String, Object>> getZls();
+
+    @ApiOperation("执行数量")
+    List<Map<String, Object>> getZxs(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("警情统计")
+    List<Map<String, Object>> getJqTj(@Param("kssj") String kssj);
+
+    @ApiOperation("预警数1")
+    List<Map<String, Object>> getYjsl1(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("指令数1")
+    List<Map<String, Object>> getZls1(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("执行数量")
+    List<Map<String, Object>> getZxs1(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("警情(按时间)")
+    List<Map<String, Object>> getJqTjByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("预警(按时间)")
+    List<Map<String, Object>> getYjslByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("指令数(按时间)")
+    List<Map<String, Object>> getZlsByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+
+    @ApiOperation("执行数(按时间)")
+    List<Map<String, Object>> getZxsByTime(@Param("kssj") String kssj, @Param("jssj") String jssj);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..6abf27a
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.yjzl.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/MybatisPlusConfig.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..f5ccb3f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.yjzl.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.yjzl.esmapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbBaseAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..efdef84
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,198 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.config.entity.vo.SysDictVO;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+    // 根据部门编码查询部门信息
+    public SysDeptDTO getDeptByOrgCode(String orgCode) {
+        if (StringUtils.isBlank(orgCode)) {
+            throw new BusinessException("远程调用部门编码查询部门信息异常");
+        }
+        ResponseResult<SysDeptDTO> responseResult = mostyBaseFeignService.getDeptByOrgCode(orgCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("远程调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门详细信息
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门详细信息
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("调用部门编码查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("调用部门编码查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据用户ID，获取用户部门信息
+    public DeptInfoVo getDeptInfoByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoByUserId(userId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询部门下的总人数（包含子部门）
+    public Integer getUserCount(String deptId) {
+        if (StringUtils.isBlank(deptId)) {
+            throw new BusinessException("查询部门下的总人数异常");
+        }
+        ResponseResult<Integer> responseResult = mostyBaseFeignService.getUserCount(deptId);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门下的总人数异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门下的总人数异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 通过key获取配置信息
+    public String getValue(String pzj) {
+        if (StringUtils.isBlank(pzj)) {
+            return null;
+        }
+        ResponseResult<String> responseResult = mostyBaseFeignService.getValue(pzj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询系统配置异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询系统配置异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 通过字典名称获取词条列表
+    public SysDictVO getSysDictByCode(String dictCode) {
+        if (StringUtils.isBlank(dictCode)) {
+            return null;
+        }
+        ResponseResult<SysDictVO> responseResult = mostyBaseFeignService.getSysDictByCode(dictCode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取字典信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取字典信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 通过身份证号获取用户信息
+    public SysUser getUserInfoBySfzh(String sfzh) {
+        if (StringUtils.isBlank(sfzh)) {
+            return null;
+        }
+        ResponseResult<SysUser> responseResult = mostyBaseFeignService.getUserInfoBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取部门信息
+    public List<SysDept> getOrg(SysDeptQuery deptQuery) {
+        ResponseResult<List<SysDept>> responseResult = mostyBaseFeignService.getOrg(deptQuery);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取用户信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取地址中文信息
+    public JSONObject getAddress(String jd, String wd) {
+        ResponseResult<JSONObject> responseResult = mostyBaseFeignService.getAddress(jd, wd);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取地址中文信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取地址中文信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询部门下的所有的子部门信息列表
+    public List<String> getChildDept(String ssbmid) {
+        ResponseResult<List<String>> responseResult = mostyBaseFeignService.getChildDept(ssbmid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询部门下的所有的子部门信息列表 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询部门下的所有的子部门信息列表 异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+
+
+    // 根据用户ID，获取用户部门信息
+    public DeptInfoVo getDeptInfoBySfzh(String sfzh) {
+        if (StringUtils.isBlank(sfzh)) {
+            throw new BusinessException("获取用户部门信息异常");
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getDeptInfoBySfzh(sfzh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取用户部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+//            throw new BusinessException("获取用户部门信息异常");
+            return null;
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbJcglAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbJcglAdaptRemoteService.java
new file mode 100644
index 0000000..559fa00
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbJcglAdaptRemoteService.java
@@ -0,0 +1,47 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 基础管理远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbJcglAdaptRemoteService {
+
+    private final MostyJcglFeignService mostyJcglFeignService;
+
+    // 获取部门下的巡防力量信息
+    public List<TbJcglXfllVo> getXfll(TbJcglXfllQueryAllDto dto) {
+        ResponseResult<List<TbJcglXfllVo>> responseResult = mostyJcglFeignService.getXfll(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取部门下的巡防力量信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取部门下的巡防力量信息失败");
+        }
+        return responseResult.getData();
+    }
+    // 查询所有巡防区数据
+    public List<TbJcglXfqyDto> getListXfqyAll() {
+        ResponseResult<List<TbJcglXfqyDto>> responseResult = mostyJcglFeignService.getListXfqyAll();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询所有巡防区数据失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询所有巡防区数据失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbQwzxAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbQwzxAdaptRemoteService.java
new file mode 100644
index 0000000..a84dfc4
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbQwzxAdaptRemoteService.java
@@ -0,0 +1,68 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.feign.service.MostyQwzxFeignService;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 勤务中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbQwzxAdaptRemoteService {
+
+    private final MostyQwzxFeignService mostyQwzxFeignService;
+
+    // 获取报备详情
+    public TbQwXfbbVo getBbInfo(String id) {
+        ResponseResult<TbQwXfbbVo> responseResult = mostyQwzxFeignService.getBbInfo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取报备详情失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return null;
+        }
+        return responseResult.getData();
+    }
+
+    // 根据报备ID查询巡组下的人员列表
+    public List<TbQwJlDto> getJlxxByBbid(String id) {
+        ResponseResult<List<TbQwJlDto>> responseResult = mostyQwzxFeignService.getJlxxByBbid(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取报备警力失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取报备警力列表异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询范围内的最近的巡组信息
+    public TbQwXfbb getBbxxByJi(TbQwXfbbQueryByJlDto dto) {
+        ResponseResult<TbQwXfbb> responseResult = mostyQwzxFeignService.getBbxxByJi(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询范围内的最近的巡组信息 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询范围内的最近的巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据巡区获取报备id
+    public List<TbQwXfbb> getBbidByXq(String xqid) {
+        ResponseResult<List<TbQwXfbb>> responseResult = mostyQwzxFeignService.getBbidByXq(xqid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询范围内的最近的巡组信息 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询范围内的最近的巡组信息异常！");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbRwzxAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbRwzxAdaptRemoteService.java
new file mode 100644
index 0000000..1805174
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbRwzxAdaptRemoteService.java
@@ -0,0 +1,67 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyRwzxFeignService;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/10/05
+ * 外部调用任务中心接口
+ **/
+@Service
+@Slf4j
+public class TbRwzxAdaptRemoteService {
+
+    @Resource
+    private MostyRwzxFeignService mostyRwzxFeignService;
+
+    /**
+     * 发送任务给各个用户
+     *
+     * @return
+     */
+    public Integer addRw(TbRwTaskDto dto) {
+        ResponseResult<Integer> responseResult = mostyRwzxFeignService.addRw(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("任务下发失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return 0;
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 发送任务给各个用户
+     *
+     * @return
+     */
+    public TbRwTask getRwByYwid(TbRwTaskByYwidQuery dto) {
+        ResponseResult<TbRwTask> responseResult = mostyRwzxFeignService.getRwByYwid(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("任务下发失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("任务查询报错！！");
+        }
+        return responseResult.getData();
+    }
+
+    /**
+     * 修改旧的指令任务状态为未读
+     * @return
+     */
+    public void changeTaskStateByZlid(TbZlxx zlxx) {
+        ResponseResult<Void> responseResult = mostyRwzxFeignService.changeTaskStateByZlid(zlxx);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改任务状态失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改任务状态失败！！");
+        }
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbSjzxAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbSjzxAdaptRemoteService.java
new file mode 100644
index 0000000..388ca34
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbSjzxAdaptRemoteService.java
@@ -0,0 +1,93 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostySjzxFeignService;
+import com.mosty.base.model.entity.lzother.VLz110Txj;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.sjzx.TbJqCjdb;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/10/31
+ * 外部调用事件中心接口
+ **/
+@Service
+@Slf4j
+public class TbSjzxAdaptRemoteService {
+
+    @Resource
+    private MostySjzxFeignService mostySjzxFeignService;
+
+    // 同步仁寿警情信息
+    public void addRsJq(TbJq dto) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.addRsJq(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("同步仁寿警情信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("同步仁寿警情信息异常");
+        }
+    }
+
+    // 获取警情的最新的一条信息
+    public TbJqVo getLastJq() {
+        ResponseResult<TbJqVo> responseResult = this.mostySjzxFeignService.getLastJq();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取警情的最新的一条信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取警情的最新的一条信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取最新一条处警单的数据
+    public TbJqCjdb getLastJqCjdb() {
+        ResponseResult<TbJqCjdb> responseResult = this.mostySjzxFeignService.getLastJqCjdb();
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取最新一条处警单的数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取最新一条处警单的数据异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加仁寿处警单数据
+    public void addRsCjdb(TbJqCjdb cjdb) {
+        ResponseResult<TbJqCjdb> responseResult = this.mostySjzxFeignService.addRsCjdb(cjdb);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加仁寿处警单数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加仁寿处警单数据异常");
+        }
+    }
+
+    // 添加泸州110警情数据
+    public void addLzJq(VLz110Txj lz110) {
+        ResponseResult<Void> responseResult = this.mostySjzxFeignService.addLzJq(lz110);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加泸州110警情数据 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加泸州110警情数据异常");
+        }
+    }
+
+    // 查询警情详情
+    public TbJqVo getJqInfo(String id) {
+        ResponseResult<TbJqVo> responseResult = this.mostySjzxFeignService.queryById(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("查询警情详情 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("查询警情详情 异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 修改警情处置状态
+    public void updateJqCzzt(String id, String czzt) {
+        ResponseResult<TbJq> responseResult = this.mostySjzxFeignService.updateJqCzzt(id, czzt);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改警情处置状态 异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改警情处置状态 异常");
+        }
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbWebSocketAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbWebSocketAdaptRemoteService.java
new file mode 100644
index 0000000..0ace9b5
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbWebSocketAdaptRemoteService.java
@@ -0,0 +1,34 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyWebSocketFeignService;
+import com.mosty.base.model.dto.websocket.WebSocketObject;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/7/23
+ * websocket外部调用基础管理接口
+ **/
+@Service
+@Slf4j
+public class TbWebSocketAdaptRemoteService {
+
+    @Resource
+    private MostyWebSocketFeignService mostyWebSocketFeignService;
+
+    // 发送websocket信息
+    public void sendMessage(WebSocketObject obj) {
+        ResponseResult<Void> responseResult = this.mostyWebSocketFeignService.sendMessage(obj);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("发送websocket信息异常 Result = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("发送websocket信息异常");
+        }
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbYszxAdaptRemoteService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbYszxAdaptRemoteService.java
new file mode 100644
index 0000000..2898282
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/remote/TbYszxAdaptRemoteService.java
@@ -0,0 +1,91 @@
+package com.mosty.yjzl.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyJcglFeignService;
+import com.mosty.base.feign.service.MostyYszxFeignService;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.dto.yszx.TbYsDlDTO;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.model.vo.yszx.TbYsDlDto;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 要素中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYszxAdaptRemoteService {
+
+    private final MostyYszxFeignService mostyYszxFeignService;
+
+    // 获取感知源详细信息
+    public TbYsSxtDto getSxtInfoVo(String id) {
+        ResponseResult<TbYsSxtDto> responseResult = mostyYszxFeignService.getSxtInfoVo(id);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取感知源详细信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取感知源详细信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据设备编号查询摄像头详情
+    public TbYsSxtDto getInfoBySbbh(String sbbh) {
+        ResponseResult<TbYsSxtDto> responseResult = mostyYszxFeignService.getInfoBySbbh(sbbh);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取感知源详细信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取感知源详细信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 查询摄像头信息
+    public TbYsSxtDto selectGzy(TbYsSxtPageOneQuery dto) {
+        ResponseResult<TbYsSxtDto> responseResult = mostyYszxFeignService.selectGzy(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取感知源信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取感知源信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加摄像头信息
+    public Integer addSxt(TbYsSxtDto dto) {
+        ResponseResult<Integer> responseResult = mostyYszxFeignService.addSxt(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加摄像头信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加摄像头信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 添加地理要素信息
+    public Integer addDlYs(TbYsDlDto dto) {
+        ResponseResult<Integer> responseResult = mostyYszxFeignService.addDlYs(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("添加地理要素信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("添加地理要素信息失败");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据名称查询地理要素
+    public TbYsDl selectDlys(String ysmc) {
+        ResponseResult<TbYsDl> responseResult = mostyYszxFeignService.selectDlys(ysmc);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据名称查询地理要素失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据名称查询地理要素失败");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycPzServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycPzServiceImpl.java
new file mode 100644
index 0000000..8019694
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycPzServiceImpl.java
@@ -0,0 +1,93 @@
+package com.mosty.yjzl.service.Impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.yjzl.TbFzycPz;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbFzycPzVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.yjzl.mapper.TbFzycPzMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbFzycPzService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+@AllArgsConstructor
+public class TbFzycPzServiceImpl extends ServiceImpl<TbFzycPzMapper, TbFzycPz>
+        implements TbFzycPzService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public int insert(TbFzycPzVo fzycPzVo) {
+        TbFzycPz pz = this.baseMapper.selectOne(new QueryWrapper<TbFzycPz>().eq("ssbmdm", fzycPzVo.getSsbmdm()));
+        if (null != pz) {
+            throw new BusinessException(fzycPzVo.getSsbm() + "部门已存在犯罪预测配置中！");
+        }
+        TbFzycPz fzycPz = new TbFzycPz();
+        BeanUtil.copyProperties(fzycPzVo, fzycPz);
+        fzycPz.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(fzycPzVo.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(fzycPzVo.getSsbmdm());
+            if (dept != null) {
+                fzycPz.setSsbm(dept.getDeptname());
+                fzycPz.setSsbmdm(dept.getDeptcode());
+                fzycPz.setSsbmid(dept.getDeptid());
+                fzycPz.setSsxgaj(dept.getFxjname());
+                fzycPz.setSsxgajid(String.valueOf(dept.getFxjid()));
+                fzycPz.setSsxgajdm(dept.getFxjcode());
+                fzycPz.setSssgaj(dept.getDszname());
+                fzycPz.setSssgajid(String.valueOf(dept.getDszid()));
+                fzycPz.setSssgajdm(dept.getDszcode());
+            }
+        }
+
+        return this.baseMapper.insert(fzycPz);
+    }
+
+    @Override
+    public int updateById(TbFzycPzVo fzycPzVo) {
+        TbFzycPz vo = this.baseMapper.selectById(fzycPzVo.getId());
+
+        TbFzycPz fzycPz = new TbFzycPz();
+        BeanUtil.copyProperties(fzycPzVo, fzycPz);
+        if (StringUtils.isNotEmpty(fzycPzVo.getSsbmdm()) && !fzycPzVo.getSsbmdm().equals(vo.getSsbmdm())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(fzycPzVo.getSsbmdm());
+            if (dept != null) {
+                fzycPz.setSsbm(dept.getDeptname());
+                fzycPz.setSsbmdm(dept.getDeptcode());
+                fzycPz.setSsbmid(dept.getDeptid());
+                fzycPz.setSsxgaj(dept.getFxjname());
+                fzycPz.setSsxgajid(String.valueOf(dept.getFxjid()));
+                fzycPz.setSsxgajdm(dept.getFxjcode());
+                fzycPz.setSssgaj(dept.getDszname());
+                fzycPz.setSssgajid(String.valueOf(dept.getDszid()));
+                fzycPz.setSssgajdm(dept.getDszcode());
+            }
+        }
+        return this.baseMapper.updateById(fzycPz);
+
+    }
+
+    @Override
+    public TbFzycPz queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int deleteById(String id) {
+        return this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public List<TbFzycPz> queryAll() {
+        return this.baseMapper.selectList(new QueryWrapper<>());
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycServiceImpl.java
new file mode 100644
index 0000000..1069355
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycServiceImpl.java
@@ -0,0 +1,158 @@
+package com.mosty.yjzl.service.Impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.model.dto.yjzl.TbFzycDto;
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import com.mosty.base.model.entity.yjzl.TbFzycPz;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.ForecastInterfaceVO;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.core.business.service.SysRoleService;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.common.token.DeptInfo;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.yjzl.mapper.TbFzycMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbFzycPzService;
+import com.mosty.yjzl.service.TbFzycService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+@AllArgsConstructor
+public class TbFzycServiceImpl extends ServiceImpl<TbFzycMapper, TbFzyc>
+        implements TbFzycService {
+
+    private final TbFzycPzService tbFzycPzService;
+    private final SysRoleService sysRoleService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final RedisService redisService;
+
+    @Override
+    public int insert(TbFzyc fzyc) {
+        fzyc.setId(UUIDGenerator.getUUID());
+        fzyc.setSfxl("0");
+        return this.baseMapper.insert(fzyc);
+    }
+
+    @Override
+    public int fzUpdateById(TbFzyc fzyc) {
+        return this.baseMapper.updateById(fzyc);
+    }
+
+    @Override
+    public TbFzyc queryById(String id) {
+
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int deleteById(String id) {
+        return this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public List<TbFzyc> queryList(TbFzycDto tbFzycDto) {
+        tbFzycDto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbFzycDto.getSsbmdm(), null));
+        if (StringUtils.isBlank(tbFzycDto.getKssj())) {
+            tbFzycDto.setKssj(DateUtils.getSystemDateString());
+        }
+//        if (CollectionUtils.isEmpty(tbFzycDto.getBcList())) {
+//            tbFzycDto.setBc(redisService.getCacheObject(Constant.FZYC_BC));
+//        }
+        return this.baseMapper.selectListBm(tbFzycDto);
+    }
+
+
+    @Override
+    public List<TbFzyc> queryListApp(TbFzycDto tbFzycDto) {
+        tbFzycDto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbFzycDto.getSsbmdm(), null));
+        if (StringUtils.isBlank(tbFzycDto.getKssj())) {
+            tbFzycDto.setKssj(DateUtils.getSystemDateString());
+        }
+        //app只查看当前
+        if (StringUtils.isEmpty(tbFzycDto.getBc())) {
+            tbFzycDto.setBc(redisService.getCacheObject(Constant.FZYC_BC));
+        }
+        return this.baseMapper.selectListBm(tbFzycDto);
+    }
+
+
+    @Override
+    public IPage<TbFzyc> queryListPage(TbFzycDto tbFzycDto) {
+        QueryWrapper<TbFzyc> tb = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(tbFzycDto.getSsbmdm())) {
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(tbFzycDto.getSsbmdm(), null);
+            tb.lambda().likeRight(StringUtils.isNotBlank(ssbm), TbFzyc::getSsbmdm, ssbm);
+        } else if (StringUtils.isNotBlank(tbFzycDto.getSsbmid())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(tbFzycDto.getSsbmid());
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dept.getDeptcode(), null);
+            tb.lambda().likeRight(StringUtils.isNotBlank(ssbm), TbFzyc::getSsbmdm, ssbm);
+        } else {
+            UserInfo user = UserInfoManager.getUser();
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(user.getDeptCode());
+            String ssbm = this.tbBaseAdaptRemoteService.getSsbm(dept.getDeptcode(), null);
+            tb.lambda().likeRight(StringUtils.isNotBlank(ssbm), TbFzyc::getSsbmdm, ssbm);
+        }
+        tb.lambda().eq(StringUtils.isNotBlank(tbFzycDto.getSfxl()), TbFzyc::getSfxl, tbFzycDto.getSfxl())
+                .eq(StringUtils.isNotBlank(tbFzycDto.getGridType()), TbFzyc::getGridType, tbFzycDto.getGridType())
+                .ge(StringUtils.isNotBlank(tbFzycDto.getKssj()), TbFzyc::getRealDate, tbFzycDto.getKssj())
+                .le(StringUtils.isNotBlank(tbFzycDto.getJssj()), TbFzyc::getRealDate, tbFzycDto.getJssj())
+                .gt(tbFzycDto.getProb() != null, TbFzyc::getProb, tbFzycDto.getProb())
+                .orderByDesc(TbFzyc::getRealDate);
+
+        return this.baseMapper.selectPage(new Page<>(tbFzycDto.getPageCurrent(), tbFzycDto.getPageSize()), tb);
+    }
+
+    @Override
+    public int updateBySfxl(String id) {
+        TbFzyc fzyc = this.baseMapper.selectById(id);
+        fzyc.setSfxl("1");
+        return this.baseMapper.updateById(fzyc);
+    }
+
+    @Override
+    public Integer getFzyjCount(String ssbmdm, String time, String sfxl) {
+        try {
+//            ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+//            time = time.replaceAll("-", "");
+//            return this.baseMapper.selectCount(
+//                    new LambdaQueryWrapper<TbFzyc>()
+//                            .likeRight(!StringUtils.isEmpty(ssbmdm), TbFzyc::getSsbmdm, ssbmdm)
+//                            .eq(StringUtils.isNotBlank(sfxl), TbFzyc::getSfxl, sfxl)
+//                            .eq(TbFzyc::getRealDate, time)
+//            );
+            TbFzycDto dto = new TbFzycDto();
+            dto.setSsbmdm(ssbmdm);
+            dto.setKssj(time);
+            dto.setJssj(time);
+            dto.setSfxl(sfxl);
+            return this.baseMapper.getFzyjCount(dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycXljlServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycXljlServiceImpl.java
new file mode 100644
index 0000000..8843c19
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbFzycXljlServiceImpl.java
@@ -0,0 +1,283 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.yjzl.TbFzycDto;
+import com.mosty.base.model.dto.yjzl.TbFzycXljlDto;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.wzzx.TbWzXfwz;
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import com.mosty.base.model.entity.yjzl.TbFzycXljl;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.wzzx.TbWzSblswzVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.model.vo.yjzl.TbFzycXljlVo;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.PositionUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.yjzl.mapper.TbFzycXfxzMapper;
+import com.mosty.yjzl.mapper.TbFzycXljlMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbFzycService;
+import com.mosty.yjzl.service.TbFzycXljlService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import sun.rmi.runtime.Log;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+@Service
+@AllArgsConstructor
+public class TbFzycXljlServiceImpl extends ServiceImpl<TbFzycXljlMapper, TbFzycXljl>
+        implements TbFzycXljlService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbFzycService tbFzycService;
+    private final TbFzycXfxzMapper tbFzycXfxzMapper;
+
+    @Override
+    public int insert(TbFzycXljlVo xljlVo) {
+        TbFzycXljl tbFzycXljl = new TbFzycXljl();
+        BeanUtils.copyProperties(xljlVo, tbFzycXljl);
+        tbFzycXljl.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotEmpty(xljlVo.getSsbmid())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(xljlVo.getSsbmdm());
+            if (dept != null) {
+                tbFzycXljl.setSsbm(dept.getDeptname());
+                tbFzycXljl.setSsbmdm(dept.getDeptcode());
+                tbFzycXljl.setSsxgaj(dept.getFxjname());
+                tbFzycXljl.setSsxgajid(String.valueOf(dept.getFxjid()));
+                tbFzycXljl.setSsxgajdm(dept.getFxjcode());
+                tbFzycXljl.setSssgaj(dept.getDszname());
+                tbFzycXljl.setSssgajid(String.valueOf(dept.getDszid()));
+                tbFzycXljl.setSssgajdm(dept.getDszcode());
+            }
+        }
+        return this.baseMapper.insertEntity(tbFzycXljl);
+    }
+
+    public int saveFzjl(TbFzycXljlVo xljlVo) {
+        //判断该巡组是否巡逻过该犯罪预警预测方格
+        TbFzycXljl fzycXlj = this.baseMapper.selectByFzBb(xljlVo);
+        if (null == fzycXlj) {//该巡组没有巡逻过该方格，直接保存
+            //修改犯罪预测状态 已巡逻
+            tbFzycService.updateBySfxl(xljlVo.getFzyjyczlId());
+            xljlVo.setXlkssj(new Date());
+            List<BigDecimal[]> list = new ArrayList<>();
+            BigDecimal[] decimals = new BigDecimal[2];
+            decimals[0] = xljlVo.getDqjd();
+            decimals[1] = xljlVo.getDqwd();
+            list.add(decimals);
+            list.add(decimals);
+            xljlVo.setZb(JtsUtils.createLine(list));
+            xljlVo.setXljssj(new Date());
+            this.insert(xljlVo);
+        } else {
+            List<BigDecimal[]> zbList = JtsUtils.decodeLineString(fzycXlj.getZb());
+            fzycXlj.setZbList(zbList);
+            fzycXlj.setXzmc(xljlVo.getXzmc());
+            //该巡组巡逻过该方格，进入下一个判断
+//            if (fzycXlj.getXljssj() == null) {
+//
+//                //该方格只被该巡组巡逻过一次，直接更新，不用判断 (有问题 第一次点位 然后跑出去了 再回来 巡逻时长要乱)
+//                fzycXlj.setZxJl(xljlVo.getZxJl());
+//
+//                int l =(int) (fzycXlj.getXljssj().getTime() - fzycXlj.getXlkssj().getTime())/1000;
+//                fzycXlj.setXfsc(l);
+//                int distance =(int) PositionUtil.getDistance(fzycXlj.getDqjd().doubleValue(), fzycXlj.getDqwd().doubleValue(),
+//                        xljlVo.getDqjd().doubleValue(), xljlVo.getDqwd().doubleValue());
+//                fzycXlj.setXflc(distance + fzycXlj.getXflc());
+//
+//                fzycXlj.setDqjd(xljlVo.getDqjd());
+//                fzycXlj.setDqwd(xljlVo.getDqwd());
+//
+//                List<BigDecimal[]> list = fzycXlj.getZbList();
+//                if (CollectionUtils.isEmpty(list)) {
+//                    list = new ArrayList<>();
+//                }
+//                BigDecimal[] decimals = new BigDecimal[2];
+//                decimals[0] = xljlVo.getDqjd();
+//                decimals[1] = xljlVo.getDqwd();
+//                list.add(decimals);
+//                if (list.size() == 1) {
+//                    list.add(decimals);
+//                }
+//                if (list.size() >= 3) {
+//                    BigDecimal[] decimal0 = list.get(0);
+//                    BigDecimal[] decimal1 = list.get(1);
+//                    if (decimal0 == decimal1) {
+//                        list.remove(0);
+//                    }
+//                }
+//                fzycXlj.setZb(JtsUtils.createLine(list));
+//
+//                this.baseMapper.updateEntity(fzycXlj);
+//            } else {
+            if (new Date().getTime() - fzycXlj.getXljssj().getTime() > 300000) {
+                //该巡组上次进入方格的结束时间距离当前时间已经超过五分钟分钟，所以保存一条新的数据
+                xljlVo.setXlkssj(new Date());
+                List<BigDecimal[]> list = new ArrayList<>();
+                BigDecimal[] decimals = new BigDecimal[2];
+                decimals[0] = xljlVo.getDqjd();
+                decimals[1] = xljlVo.getDqwd();
+                list.add(decimals);
+                list.add(decimals);
+                xljlVo.setZb(JtsUtils.createLine(list));
+                xljlVo.setXljssj(new Date());
+                this.insert(xljlVo);
+            } else {
+                //该巡组上次进入方格的结束时间距离当前时间没有超过五分钟分钟，所以更新本条数据
+                fzycXlj.setZxJl(xljlVo.getZxJl());
+                fzycXlj.setXljssj(new Date());
+                int l = (int) (fzycXlj.getXljssj().getTime() - fzycXlj.getXlkssj().getTime()) / 1000;
+                fzycXlj.setXfsc(l);
+                int distance = (int) PositionUtil.getDistance(fzycXlj.getDqjd().doubleValue(), fzycXlj.getDqwd().doubleValue(),
+                        xljlVo.getDqjd().doubleValue(), xljlVo.getDqwd().doubleValue());
+                fzycXlj.setXflc(distance + fzycXlj.getXflc());
+                fzycXlj.setDqjd(xljlVo.getDqjd());
+                fzycXlj.setDqwd(xljlVo.getDqwd());
+                List<BigDecimal[]> list = fzycXlj.getZbList();
+                if (CollectionUtils.isEmpty(list)) {
+                    list = new ArrayList<>();
+                }
+                BigDecimal[] decimals = new BigDecimal[2];
+                decimals[0] = xljlVo.getDqjd();
+                decimals[1] = xljlVo.getDqwd();
+                list.add(decimals);
+                if (list.size() == 1) {
+                    list.add(decimals);
+                }
+                if (list.size() >= 3) {
+                    BigDecimal[] decimal0 = list.get(0);
+                    BigDecimal[] decimal1 = list.get(1);
+                    if (decimal0 == decimal1) {
+                        list.remove(0);
+                    }
+                }
+                fzycXlj.setZb(JtsUtils.createLine(list));
+                this.baseMapper.updateEntity(fzycXlj);
+//                }
+            }
+        }
+
+        return 1;
+    }
+
+    @Override
+    public int updateById(TbFzycXljlVo xljlVo) {
+        TbFzycXljl tbFzycXljl = new TbFzycXljl();
+        BeanUtils.copyProperties(xljlVo, tbFzycXljl);
+        if (StringUtils.isNotEmpty(xljlVo.getSsbmid())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(xljlVo.getSsbmid());
+            if (dept != null) {
+                tbFzycXljl.setSsbm(dept.getDeptname());
+                tbFzycXljl.setSsbmdm(dept.getDeptcode());
+                tbFzycXljl.setSsxgaj(dept.getFxjname());
+                tbFzycXljl.setSsxgajid(String.valueOf(dept.getFxjid()));
+                tbFzycXljl.setSsxgajdm(dept.getFxjcode());
+                tbFzycXljl.setSssgaj(dept.getDszname());
+                tbFzycXljl.setSssgajid(String.valueOf(dept.getDszid()));
+                tbFzycXljl.setSssgajdm(dept.getDszcode());
+            }
+        }
+        return this.baseMapper.updateEntity(tbFzycXljl);
+    }
+
+    @Override
+    public TbFzycXljl queryById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public int deleteById(String id) {
+        return this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public List<TbFzycXljlDto> qfzxl(String fzyjyczlId) {
+        List<TbFzycXljl> qfzxl = this.baseMapper.qfzxl(fzyjyczlId);
+        if (!CollectionUtils.isEmpty(qfzxl)) {
+            List<TbFzycXljlDto> list = new ArrayList<>();
+            for (TbFzycXljl xljl : qfzxl) {
+                TbFzycXljlDto dto = new TbFzycXljlDto();
+                BeanUtils.copyProperties(xljl, dto);
+                List<BigDecimal[]> zbList = JtsUtils.decodeLineString(xljl.getZb());
+                dto.setZbList(zbList);
+                //查询有没指令
+                String qs = tbFzycXfxzMapper.selectQs(xljl.getXlbbId(), xljl.getFzyjyczlId());
+                if (StringUtils.isEmpty(qs)) {
+                    dto.setSfqsmc("无");
+                } else {
+                    if (qs.equals("1")) {
+                        dto.setSfqsmc("签收");
+                    } else {
+                        dto.setSfqsmc("未签收");
+                    }
+                }
+                dto.setSfqs(qs);
+                //查询核查人员数
+                dto.setPcry(this.baseMapper.pcrys(xljl.getXlbbId()));
+                //查询核查车数
+                dto.setPccl(this.baseMapper.pccls(xljl.getXlbbId()));
+                list.add(dto);
+            }
+            return list;
+        }
+        return null;
+    }
+
+    @Override
+    public int addBySbwz(TbFzJlVo fzJlVo) {
+        if (fzJlVo != null && StringUtils.isNotBlank(fzJlVo.getSsbmdm())) {
+            TbFzycDto tbFzycDto = new TbFzycDto();
+            tbFzycDto.setSsbmdm(fzJlVo.getSsbmdm());
+            List<TbFzyc> tbFzycs = tbFzycService.queryList(tbFzycDto);
+            if (!CollectionUtils.isEmpty(tbFzycs)) {
+                for (TbFzyc fzyc : tbFzycs) {
+                    //计算中心点位
+                    BigDecimal X = fzyc.getZxX();
+                    BigDecimal Y = fzyc.getZxY();
+                    //计算两个位置距离
+                    double distance = Kit.getDistance(X.doubleValue(), Y.doubleValue(),
+                            fzJlVo.getJd().doubleValue(), fzJlVo.getWd().doubleValue());
+                    //巡逻到犯罪预测区域，提示已巡逻 200米
+                    String gridType = fzyc.getGridType();
+                    Long aLong = ((Long.valueOf(gridType)) / 2) + 100;
+                    if (distance <= aLong) {
+                        //保存数据
+                        TbFzycXljlVo vo = new TbFzycXljlVo();
+                        vo.setXlbbId(fzJlVo.getBbid());
+                        vo.setFzyjyczlId(fzyc.getId());
+                        vo.setXlkssj(new Date());
+                        vo.setZxJl(new BigDecimal(distance));
+                        vo.setSsbm(fzJlVo.getSsbm());
+                        vo.setSsbmdm(fzJlVo.getSsbmdm());
+                        vo.setSsbmid(fzJlVo.getSsbmid());
+                        vo.setSsxgaj(fzJlVo.getSsxgaj());
+                        vo.setSsxgajdm(fzJlVo.getSsxgajdm());
+                        vo.setSsxgajid(fzJlVo.getSsxgajid());
+                        vo.setSssgaj(fzJlVo.getSssgaj());
+                        vo.setSssgajdm(fzJlVo.getSssgajdm());
+                        vo.setSssgajid(fzJlVo.getSssgaj());
+                        vo.setDqjd(fzJlVo.getJd());
+                        vo.setDqwd(fzJlVo.getWd());
+                        vo.setXzmc(fzJlVo.getXzmc());
+                        this.saveFzjl(vo);
+                    }
+
+                }
+            }
+
+        }
+        return 0;
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjDyyjxxServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjDyyjxxServiceImpl.java
new file mode 100644
index 0000000..9459fc9
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjDyyjxxServiceImpl.java
@@ -0,0 +1,69 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.base.model.entity.yjzl.TbYjDyyjxx;
+import com.mosty.base.model.query.yjzl.TbYjDyyjxxQuery;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.yjzl.mapper.TbYjDyyjxxMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjDyyjxxService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@AllArgsConstructor
+@Service
+public class TbYjDyyjxxServiceImpl implements TbYjDyyjxxService {
+
+    private TbYjDyyjxxMapper tbYjDyyjxxMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjDyyjxx> queryByPage(TbYjDyyjxxQuery dto) {
+        IPage<TbYjDyyjxx> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        QueryWrapper<TbYjDyyjxx> qw = new QueryWrapper<>();
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        qw.lambda().eq(StringUtils.isNotBlank(dto.getDyryId()), TbYjDyyjxx::getDyryId, dto.getDyryId())
+                .like(StringUtils.isNotBlank(dto.getDyryXm()), TbYjDyyjxx::getDyryXm, dto.getDyryXm())
+                .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjDyyjxx::getSsbmdm, dto.getSsbmdm())
+                .like(StringUtils.isNotBlank(dto.getDyrySfzh()), TbYjDyyjxx::getDyrySfzh, dto.getDyrySfzh())
+                .eq(StringUtils.isNotBlank(dto.getYjId()), TbYjDyyjxx::getYjId, dto.getYjId())
+                .eq(StringUtils.isNotBlank(dto.getDxjssjh()), TbYjDyyjxx::getDxjssjh, dto.getDxjssjh())
+                .ge(dto.getYjkssj() != null, TbYjDyyjxx::getYjsj, dto.getYjkssj())
+                .le(dto.getYjjssj() != null, TbYjDyyjxx::getYjsj, dto.getYjkssj());
+        return tbYjDyyjxxMapper.selectPage(page, qw);
+    }
+
+    @Override
+    public int insert(TbYjDyyjxx dyyjxx) {
+        dyyjxx.setId(UUIDGenerator.getUUID());
+        UserInfo user = UserInfoManager.get();
+        dyyjxx.setSsbm(user.getDeptName());
+        dyyjxx.setSsbmid(String.valueOf(user.getDeptId()));
+        dyyjxx.setSsbmdm(user.getDeptCode());
+        dyyjxx.setSsxgaj(user.getFxjDeptName());
+        dyyjxx.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        dyyjxx.setSsxgajdm(user.getFxjDeptCode());
+        dyyjxx.setSssgaj(user.getDszDeptName());
+        dyyjxx.setSssgajid(String.valueOf(user.getDszDeptId()));
+        dyyjxx.setSssgajdm(user.getDszDeptCode());
+        return tbYjDyyjxxMapper.insert(dyyjxx);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        return tbYjDyyjxxMapper.deleteByIds(list);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxCsbServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxCsbServiceImpl.java
new file mode 100644
index 0000000..afdca4b
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxCsbServiceImpl.java
@@ -0,0 +1,80 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.yjzl.TbYjmxCsb;
+import com.mosty.base.model.query.yjzl.TbYjmxCsbQuery;
+import com.mosty.base.model.vo.yjzl.TbYjmxCsbVo;
+import com.mosty.yjzl.mapper.TbYjmxCsbMapper;
+import com.mosty.yjzl.service.TbYjmxCsbService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class TbYjmxCsbServiceImpl extends ServiceImpl<TbYjmxCsbMapper, TbYjmxCsb>
+        implements TbYjmxCsbService {
+
+    @Override
+    public int insert(TbYjmxCsbVo csb) {
+        TbYjmxCsb vo = new TbYjmxCsb();
+        BeanUtils.copyProperties(csb, vo);
+        vo.setXtSjly("1");
+        return this.baseMapper.insert(vo);
+    }
+
+
+
+    @Override
+    public TbYjmxCsbVo queryById(String id) {
+        TbYjmxCsb tbYjmxCsb = baseMapper.selectById(id);
+        TbYjmxCsbVo vo = new TbYjmxCsbVo();
+        BeanUtils.copyProperties(tbYjmxCsb, vo);
+        return vo;
+    }
+
+    @Override
+    public int deleteById(String id) {
+        return baseMapper.deleteById(id);
+    }
+
+    @Override
+    public IPage<TbYjmxCsbVo> getPage(TbYjmxCsbQuery dto) {
+        IPage<TbYjmxCsb> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(),dto.getPageSize()),
+                new LambdaQueryWrapper<TbYjmxCsb>()
+                        .eq(StringUtils.isNotBlank(dto.getMxid()),TbYjmxCsb::getMxid,dto.getMxid())
+                        .like(StringUtils.isNotBlank(dto.getCsdm()),TbYjmxCsb::getCsdm,dto.getCsdm())
+                        .eq(StringUtils.isNotBlank(dto.getCsmc()),TbYjmxCsb::getCsmc,dto.getCsmc())
+                        .eq(StringUtils.isNotBlank(dto.getCsz()),TbYjmxCsb::getCsz,dto.getCsz())
+                        .eq(StringUtils.isNotBlank(dto.getCslx()),TbYjmxCsb::getCslx,dto.getCslx())
+        );
+
+        IPage<TbYjmxCsbVo> pageVo = new Page<>(dto.getPageCurrent(),dto.getPageSize());
+        List<TbYjmxCsbVo> voList = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(page.getRecords())){
+            page.getRecords().forEach(item->{
+                TbYjmxCsbVo vo = new TbYjmxCsbVo();
+                BeanUtils.copyProperties(item,vo);
+                voList.add(vo);
+            });
+        }
+        pageVo.setRecords(voList);
+        pageVo.setTotal(page.getTotal());
+        return pageVo;
+    }
+
+    @Override
+    public int updateById(TbYjmxCsbVo clVo) {
+        TbYjmxCsb csb = new TbYjmxCsb();
+        BeanUtils.copyProperties(clVo,csb);
+        csb.setXtSjly("1");
+        return this.baseMapper.updateById(csb);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxServiceImpl.java
new file mode 100644
index 0000000..b7258d9
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjmxServiceImpl.java
@@ -0,0 +1,149 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.yjzl.TbYjmx;
+import com.mosty.base.model.entity.yjzl.TbYjmxCsb;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.yjzl.TbYjmxQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxAllVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxCsbVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxVo;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.yjzl.mapper.TbYjmxCsbMapper;
+import com.mosty.yjzl.mapper.TbYjmxMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjmxService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Service
+@AllArgsConstructor
+public class TbYjmxServiceImpl extends ServiceImpl<TbYjmxMapper, TbYjmx>
+        implements TbYjmxService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYjmxCsbMapper tbYjmxCsbMapper;
+
+
+    @Override
+    public int insert(TbYjmxVo vo) {
+        TbYjmx mx = this.baseMapper.selectById(vo.getId());
+        if (mx != null) {
+            throw new BusinessException("模型ID已存在！");
+        }
+        TbYjmx yjmx1 = new TbYjmx();
+        BeanUtils.copyProperties(vo, yjmx1);
+        yjmx1.setMxzt("01");
+        yjmx1.setXtSjly("1");
+        if (StringUtils.isNotBlank(vo.getSsbmid())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(vo.getSsbmid());
+            if (dept != null) {
+                yjmx1.setSsbm(dept.getDeptname());
+                yjmx1.setSsbmdm(dept.getDeptcode());
+            }
+        }
+        return baseMapper.insert(yjmx1);
+    }
+
+    @Override
+    public int updateById(TbYjmxVo vo) {
+        TbYjmx yjmx1 = new TbYjmx();
+        BeanUtils.copyProperties(vo, yjmx1);
+        yjmx1.setXtSjly("1");
+        if (StringUtils.isNotBlank(vo.getSsbmid())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(vo.getSsbmid());
+            if (dept != null) {
+                yjmx1.setSsbm(dept.getDeptname());
+                yjmx1.setSsbmdm(dept.getDeptcode());
+            }
+        }
+        return baseMapper.updateById(yjmx1);
+    }
+
+    @Override
+    public TbYjmxVo queryById(String id) {
+        TbYjmx yjmx = baseMapper.selectById(id);
+        TbYjmxVo vo = new TbYjmxVo();
+        BeanUtils.copyProperties(yjmx, vo);
+        return vo;
+    }
+
+
+    @Override
+    public int deleteById(String id) {
+        return baseMapper.deleteById(id);
+    }
+
+    @Override
+    public IPage<TbYjmxVo> getPage(TbYjmxQuery dto) {
+        IPage<TbYjmx> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbYjmx>()
+                        .like(StringUtils.isNotBlank(dto.getMxmc()), TbYjmx::getMxmc, dto.getMxmc())
+                        .eq(StringUtils.isNotBlank(dto.getMxlx()), TbYjmx::getMxlx, dto.getMxlx())
+                        .like(StringUtils.isNotBlank(dto.getSsbm()), TbYjmx::getSsbm, dto.getSsbm())
+                        .eq(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjmx::getSsbmdm, dto.getSsbmdm())
+                        .eq(StringUtils.isNotBlank(dto.getSsbmid()), TbYjmx::getSsbmid, dto.getSsbmid())
+                        .eq(StringUtils.isNotBlank(dto.getMxzt()), TbYjmx::getMxzt, dto.getMxzt())
+        );
+        IPage<TbYjmxVo> pageVo = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbYjmxVo> voList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbYjmxVo vo = new TbYjmxVo();
+                BeanUtils.copyProperties(item, vo);
+                voList.add(vo);
+            });
+        }
+        pageVo.setRecords(voList);
+        pageVo.setTotal(page.getTotal());
+        return pageVo;
+    }
+
+    @Override
+    public int startMx(String id) {
+        TbYjmx yjmx = baseMapper.selectById(id);
+        TbYjmxVo vo = new TbYjmxVo();
+        BeanUtils.copyProperties(yjmx, vo);
+        if (yjmx.getMxzt().equals("01")) {
+            yjmx.setMxzt("02");
+        } else if (yjmx.getMxzt().equals("02")) {
+            yjmx.setMxzt("01");
+        }
+        return this.baseMapper.updateById(yjmx);
+    }
+
+    @Override
+    public TbYjmxAllVo getMxCs(String mxid) {
+        TbYjmx mx = this.baseMapper.selectById(mxid);
+        if (mx == null) return null;
+        TbYjmxAllVo vo = new TbYjmxAllVo();
+        BeanUtils.copyProperties(mx, vo);
+        List<TbYjmxCsb> csList = this.tbYjmxCsbMapper.selectList(
+                new LambdaQueryWrapper<TbYjmxCsb>()
+                        .eq(TbYjmxCsb::getMxid, mxid)
+                        .eq(TbYjmxCsb::getXtSjzt, "1")
+        );
+        List<TbYjmxCsbVo> voList = new ArrayList<>();
+        csList.forEach(item -> {
+            TbYjmxCsbVo csVo = new TbYjmxCsbVo();
+            BeanUtils.copyProperties(item, csVo);
+            voList.add(csVo);
+        });
+        vo.setCsList(voList);
+        return vo;
+    }
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxClServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxClServiceImpl.java
new file mode 100644
index 0000000..2404330
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxClServiceImpl.java
@@ -0,0 +1,199 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.entity.yjzl.TbYjxxCl;
+import com.mosty.base.model.entity.yjzl.TbYjxxClBq;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.yjzl.TbYjxxClQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxClVo;
+import com.mosty.yjzl.mapper.TbYjxxClBqMapper;
+import com.mosty.yjzl.mapper.TbYjxxClMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjxxClService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 预警信息-车辆表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+@AllArgsConstructor
+@Service
+public class TbYjxxClServiceImpl implements TbYjxxClService {
+
+    private final TbYjxxClMapper tbYjxxClMapper;
+    private final TbYjxxClBqMapper tbYjxxClBqMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjxxClVo> queryByPage(TbYjxxClQuery yjcl) {
+        IPage<TbYjxxClVo> voIPage = new Page<>(yjcl.getPageCurrent(), yjcl.getPageSize());
+        IPage<TbYjxxCl> pageQuery = new Page<>(yjcl.getPageCurrent(), yjcl.getPageSize());
+        QueryWrapper<TbYjxxCl> queryWrapper = getQueryWrapper(yjcl);
+        IPage<TbYjxxCl> page = tbYjxxClMapper.selectPage(pageQuery, queryWrapper);
+        voIPage.setTotal(page.getTotal());
+        List<TbYjxxCl> records = page.getRecords();
+        List<TbYjxxClVo> vos = dataPerfact(records);
+        voIPage.setRecords(vos);
+        return voIPage;
+    }
+
+    @Override
+    public List<TbYjxxClVo> queryList(TbYjxxClQuery tbYjxxClQuery) {
+        QueryWrapper<TbYjxxCl> queryWrapper = getQueryWrapper(tbYjxxClQuery);
+        List<TbYjxxCl> records = tbYjxxClMapper.selectList(queryWrapper);
+        List<TbYjxxClVo> vos = dataPerfact(records);
+        return vos;
+    }
+
+    @Override
+    public int insert(TbYjxxClVo clVo) {
+        TbYjxxCl cl = new TbYjxxCl();
+        BeanUtils.copyProperties(clVo, cl);
+        cl.setId(UUIDGenerator.getUUID());
+        perfectDept(cl);
+        saveRelevanceData(cl, clVo);
+        return tbYjxxClMapper.insert(cl);
+    }
+
+    @Override
+    public int update(TbYjxxClVo clVo) {
+        TbYjxxCl cl = new TbYjxxCl();
+        BeanUtils.copyProperties(clVo, cl);
+        cl.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        tbYjxxClBqMapper.deleteByYjId(cl.getId());
+        saveRelevanceData(cl, clVo);
+        return tbYjxxClMapper.updateById(cl);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        return tbYjxxClMapper.deleteByIds(list);
+    }
+
+    @Override
+    public TbYjxxClVo queryById(String id) {
+        TbYjxxCl cl = tbYjxxClMapper.selectById(id);
+        TbYjxxClVo vo = new TbYjxxClVo();
+        BeanUtils.copyProperties(cl, vo);
+        List<TbYjxxClBq> bqList = tbYjxxClBqMapper.queryByYjid(Arrays.asList(id));
+        vo.setClbqList(bqList);
+        return vo;
+    }
+
+    /**
+     * 获取查询条件
+     *
+     * @param yjcl
+     * @return
+     */
+    public QueryWrapper<TbYjxxCl> getQueryWrapper(TbYjxxClQuery yjcl) {
+        QueryWrapper<TbYjxxCl> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+
+        yjcl.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(yjcl.getSsbmdm(), null));
+        queryWrapper.lambda().eq(TbYjxxCl::getXtScbz, "0")
+                .eq(StringUtils.isNotBlank(yjcl.getYjId()), TbYjxxCl::getYjId, yjcl.getYjId())
+                .eq(StringUtils.isNotBlank(yjcl.getSjId()), TbYjxxCl::getSjId, yjcl.getSjId())
+                .eq(StringUtils.isNotBlank(yjcl.getYjClbq()), TbYjxxCl::getYjClbq, yjcl.getYjClbq())
+                .eq(StringUtils.isNotBlank(yjcl.getYjJb()), TbYjxxCl::getYjJb, yjcl.getYjJb())
+                .like(StringUtils.isNotBlank(yjcl.getYjClcph()), TbYjxxCl::getYjClcph, yjcl.getYjClcph())
+                .likeRight(StringUtils.isNotBlank(yjcl.getSsbmdm()), TbYjxxCl::getSsbmdm, yjcl.getSsbmdm());
+        if (yjcl.getYjsksj() != null && yjcl.getYjsksj() == null) {
+            queryWrapper.lambda().ge(TbYjxxCl::getYjSj, yjcl.getYjsksj());
+        }
+        if (yjcl.getYjsksj() == null && yjcl.getYjsksj() != null) {
+            queryWrapper.lambda().le(TbYjxxCl::getYjSj, yjcl.getYjsksj());
+        }
+        if (yjcl.getYjsksj() != null && yjcl.getYjsksj() != null) {
+            queryWrapper.lambda().between(TbYjxxCl::getYjSj, yjcl.getYjsksj(), yjcl.getYjsksj());
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * 预警人员数据完善
+     *
+     * @param records
+     * @return
+     */
+    public List<TbYjxxClVo> dataPerfact(List<TbYjxxCl> records) {
+        List<TbYjxxClVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> ids = records.stream().map(TbYjxxCl::getId).collect(Collectors.toList());
+            List<TbYjxxClBq> bqList = tbYjxxClBqMapper.queryByYjid(ids);
+            for (TbYjxxCl record : records) {
+                TbYjxxClVo vo = new TbYjxxClVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbYjxxClBq> clBqList =
+                        bqList.stream().filter(item -> item.getYjclId().equals(record.getId())).collect(Collectors.toList());
+                vo.setClbqList(clBqList);
+                vos.add(vo);
+            }
+        }
+        return vos;
+    }
+
+    /**
+     * 保存关联数据
+     *
+     * @param cl
+     * @param vo
+     */
+    public void saveRelevanceData(TbYjxxCl cl, TbYjxxClVo vo) {
+        if (vo != null) {
+            List<TbYjxxClBq> clList = vo.getClbqList();
+            if (!CollectionUtils.isEmpty(clList)) {
+                for (TbYjxxClBq bq : clList) {
+                    bq.setId(UUIDGenerator.getUUID());
+                    bq.setYjclId(cl.getId());
+                    bq.setXtSjzt("1");
+                    bq.setXtSjly("1");
+                    bq.setXtScbz("0");
+                    tbYjxxClBqMapper.insert(bq);
+                }
+            }
+        }
+    }
+
+    /**
+     * 部门赋值
+     *
+     * @param zfpb
+     */
+    public void perfectDept(TbYjxxCl zfpb) {
+        zfpb.setXtSjly("1");
+        zfpb.setXtSjzt("1");
+        zfpb.setXtScbz("0");
+        UserInfo user = UserInfoManager.get();
+        zfpb.setSsbm(user.getDeptName());
+        zfpb.setSsbmid(String.valueOf(user.getDeptId()));
+        zfpb.setSsbmdm(user.getDeptCode());
+        zfpb.setSsxgaj(user.getFxjDeptName());
+        zfpb.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        zfpb.setSsxgajdm(user.getFxjDeptCode());
+        zfpb.setSssgaj(user.getDszDeptName());
+        zfpb.setSssgajid(String.valueOf(user.getDszDeptId()));
+        zfpb.setSssgajdm(user.getDszDeptCode());
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxDypzServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxDypzServiceImpl.java
new file mode 100644
index 0000000..46e4d7f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxDypzServiceImpl.java
@@ -0,0 +1,222 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.entity.yjzl.*;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.yjzl.TbYjxxDypzQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxDypzVo;
+import com.mosty.yjzl.mapper.*;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjxxDypzService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 预警信息订阅配置
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-22
+ */
+@AllArgsConstructor
+@Service
+public class TbYjxxDypzServiceImpl implements TbYjxxDypzService {
+
+    private TbYjxxDypzMapper tbYjxxDypzMapper;
+
+    private TbYjxxDypzClbqMapper tbYjxxDypzClbqMapper;
+
+    private TbYjxxDypzGzyMapper tbYjxxDypzGzyMapper;
+
+    private TbYjxxDypzRybqMapper tbYjxxDypzRybqMapper;
+
+    private TbYjxxDypzSjbqMapper tbYjxxDypzSjbqMapper;
+
+    private TbYjxxDypzYjjbMapper tbYjxxDypzYjjbMapper;
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjxxDypzVo> queryList(TbYjxxDypzQuery dypz) {
+        IPage<TbYjxxDypz> xfpbIPage = queryDypz(dypz);
+        IPage<TbYjxxDypzVo> voIPage = new Page<>(dypz.getPageCurrent(), dypz.getPageSize());
+        List<TbYjxxDypz> records = xfpbIPage.getRecords();
+        List<TbYjxxDypzVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> ids = records.stream().map(TbYjxxDypz::getId).collect(Collectors.toList());
+            List<TbYjxxDypzClbq> clbqList = tbYjxxDypzClbqMapper.queryByDyid(ids);
+            List<TbYjxxDypzGzy> gzyList = tbYjxxDypzGzyMapper.queryByDyid(ids);
+            List<TbYjxxDypzRybq> rybqList = tbYjxxDypzRybqMapper.queryByDyid(ids);
+            List<TbYjxxDypzSjbq> sjbqList = tbYjxxDypzSjbqMapper.queryByDyid(ids);
+            List<TbYjxxDypzYjjb> yjjbList = tbYjxxDypzYjjbMapper.queryByDyid(ids);
+            for (TbYjxxDypz record : records) {
+                TbYjxxDypzVo vo = new TbYjxxDypzVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbYjxxDypzClbq> clbq = clbqList.stream().filter(item -> item.getDyId().equals(record.getId())).collect(Collectors.toList());
+                List<TbYjxxDypzGzy> gzy = gzyList.stream().filter(item -> item.getDyId().equals(record.getId())).collect(Collectors.toList());
+                List<TbYjxxDypzRybq> rybq = rybqList.stream().filter(item -> item.getDyId().equals(record.getId())).collect(Collectors.toList());
+                List<TbYjxxDypzSjbq> sjbq = sjbqList.stream().filter(item -> item.getDyId().equals(record.getId())).collect(Collectors.toList());
+                List<TbYjxxDypzYjjb> yjjb = yjjbList.stream().filter(item -> item.getDyId().equals(record.getId())).collect(Collectors.toList());
+                vo.setClbqList(clbq);
+                vo.setGzyList(gzy);
+                vo.setRybqList(rybq);
+                vo.setSjbqList(sjbq);
+                vo.setYjjbList(yjjb);
+                vos.add(vo);
+            }
+        }
+        voIPage.setRecords(vos);
+        voIPage.setTotal(xfpbIPage.getTotal());
+        return voIPage;
+    }
+
+    @Override
+    public int insert(TbYjxxDypzVo dypzVo) {
+        TbYjxxDypz dypz = new TbYjxxDypz();
+        BeanUtils.copyProperties(dypzVo, dypz);
+        dypz.setId(UUIDGenerator.getUUID());
+        UserInfo user = UserInfoManager.get();
+        dypz.setSsbm(user.getDeptName());
+        dypz.setSsbmid(String.valueOf(user.getDeptId()));
+        dypz.setSsbmdm(user.getDeptCode());
+        dypz.setSsxgaj(user.getFxjDeptName());
+        dypz.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        dypz.setSsxgajdm(user.getFxjDeptCode());
+        dypz.setSssgaj(user.getDszDeptName());
+        dypz.setSssgajid(String.valueOf(user.getDszDeptId()));
+        dypz.setSssgajdm(user.getDszDeptCode());
+        saveRelevanceData(dypzVo, dypz.getId());
+        return tbYjxxDypzMapper.insert(dypz);
+    }
+
+    @Override
+    public int updateById(TbYjxxDypzVo dypzVo) {
+        TbYjxxDypz dypz = new TbYjxxDypz();
+        BeanUtils.copyProperties(dypzVo, dypz);
+        dypz.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        deleteRelevanceData(dypz.getId());
+        saveRelevanceData(dypzVo, dypz.getId());
+        return tbYjxxDypzMapper.updateById(dypz);
+    }
+
+    @Override
+    public TbYjxxDypzVo queryById(String id) {
+        TbYjxxDypz dypz = tbYjxxDypzMapper.selectById(id);
+        TbYjxxDypzVo vo = new TbYjxxDypzVo();
+        BeanUtils.copyProperties(dypz, vo);
+        List<TbYjxxDypzClbq> clbqList = tbYjxxDypzClbqMapper.queryByDyid(Collections.singletonList(id));
+        List<TbYjxxDypzGzy> gzyList = tbYjxxDypzGzyMapper.queryByDyid(Collections.singletonList(id));
+        List<TbYjxxDypzRybq> rybqList = tbYjxxDypzRybqMapper.queryByDyid(Collections.singletonList(id));
+        List<TbYjxxDypzSjbq> sjbqList = tbYjxxDypzSjbqMapper.queryByDyid(Collections.singletonList(id));
+        List<TbYjxxDypzYjjb> yjjbList = tbYjxxDypzYjjbMapper.queryByDyid(Collections.singletonList(id));
+        vo.setClbqList(clbqList);
+        vo.setGzyList(gzyList);
+        vo.setRybqList(rybqList);
+        vo.setSjbqList(sjbqList);
+        vo.setYjjbList(yjjbList);
+        return vo;
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        if (list.size() > 0) {
+            for (String id : list) {
+                deleteRelevanceData(id);
+            }
+        }
+        return tbYjxxDypzMapper.deleteByIds(list);
+    }
+
+    public IPage<TbYjxxDypz> queryDypz(TbYjxxDypzQuery dypz) {
+        IPage<TbYjxxDypz> page = new Page<>(dypz.getPageCurrent(), dypz.getPageSize());
+        QueryWrapper<TbYjxxDypz> qw = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, userInfo);
+        dypz.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dypz.getSsbmdm(), null));
+        qw.lambda().eq(StringUtils.isNotBlank(dypz.getDyryId()), TbYjxxDypz::getDyryId, dypz.getDyryId())
+                .like(StringUtils.isNotBlank(dypz.getDyryXm()), TbYjxxDypz::getDyryXm, dypz.getDyryXm())
+                .eq(StringUtils.isNotBlank(dypz.getDyYjjb()), TbYjxxDypz::getDyYjjb, dypz.getDyYjjb())
+                .eq(StringUtils.isNotBlank(dypz.getDyYjrybq()), TbYjxxDypz::getDyYjrybq, dypz.getDyYjrybq())
+                .like(StringUtils.isNotBlank(dypz.getDyYjclbq()), TbYjxxDypz::getDyYjclbq, dypz.getDyYjclbq())
+                .like(StringUtils.isNotBlank(dypz.getSsbmdm()), TbYjxxDypz::getSsbmdm, dypz.getSsbmdm())
+                .likeRight(StringUtils.isNotBlank(dypz.getSsbmdm()), TbYjxxDypz::getSsbmdm, dypz.getSsbmdm())
+                .like(StringUtils.isNotBlank(dypz.getSsbmid()), TbYjxxDypz::getSsbmid, dypz.getSsbmid());
+        return tbYjxxDypzMapper.selectPage(page, qw);
+    }
+
+    // 保存关联数据
+    public void saveRelevanceData(TbYjxxDypzVo vo, String ywid) {
+        if (vo != null) {
+            List<TbYjxxDypzClbq> clbqList = vo.getClbqList();
+            List<TbYjxxDypzGzy> gzyList = vo.getGzyList();
+            List<TbYjxxDypzRybq> rybqList = vo.getRybqList();
+            List<TbYjxxDypzSjbq> sjbqList = vo.getSjbqList();
+            List<TbYjxxDypzYjjb> yjjbList = vo.getYjjbList();
+            if (!CollectionUtils.isEmpty(clbqList)) {
+                for (TbYjxxDypzClbq clbq : clbqList) {
+                    clbq.setId(UUIDGenerator.getUUID());
+                    clbq.setDyId(ywid);
+                    clbq.setXtSjly("1");
+                    tbYjxxDypzClbqMapper.insert(clbq);
+                }
+            }
+            if (!CollectionUtils.isEmpty(gzyList)) {
+                for (TbYjxxDypzGzy gzy : gzyList) {
+                    gzy.setId(UUIDGenerator.getUUID());
+                    gzy.setDyId(ywid);
+                    gzy.setXtSjly("1");
+                    tbYjxxDypzGzyMapper.insert(gzy);
+                }
+            }
+            if (!CollectionUtils.isEmpty(rybqList)) {
+                for (TbYjxxDypzRybq rybq : rybqList) {
+                    rybq.setId(UUIDGenerator.getUUID());
+                    rybq.setDyId(ywid);
+                    rybq.setXtSjly("1");
+                    tbYjxxDypzRybqMapper.insert(rybq);
+                }
+            }
+            if (!CollectionUtils.isEmpty(sjbqList)) {
+                for (TbYjxxDypzSjbq sjbq : sjbqList) {
+                    sjbq.setId(UUIDGenerator.getUUID());
+                    sjbq.setDyId(ywid);
+                    sjbq.setXtSjly("1");
+                    tbYjxxDypzSjbqMapper.insert(sjbq);
+                }
+            }
+            if (!CollectionUtils.isEmpty(yjjbList)) {
+                for (TbYjxxDypzYjjb yjjb : yjjbList) {
+                    yjjb.setId(UUIDGenerator.getUUID());
+                    yjjb.setDyId(ywid);
+                    yjjb.setXtSjly("1");
+                    tbYjxxDypzYjjbMapper.insert(yjjb);
+                }
+            }
+        }
+    }
+
+    // 删除关联数据
+    public void deleteRelevanceData(String id) {
+        tbYjxxDypzClbqMapper.deleteByDyid(id);
+        tbYjxxDypzGzyMapper.deleteByDyid(id);
+        tbYjxxDypzRybqMapper.deleteByDyid(id);
+        tbYjxxDypzSjbqMapper.deleteByDyid(id);
+        tbYjxxDypzYjjbMapper.deleteByDyid(id);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxLzServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxLzServiceImpl.java
new file mode 100644
index 0000000..5b5cc75
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxLzServiceImpl.java
@@ -0,0 +1,1142 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.BasePage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.yjzl.*;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import com.mosty.base.model.query.base.SysDeptQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxAllVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxCsbVo;
+import com.mosty.base.model.vo.yszx.TbYsDlDto;
+import com.mosty.base.utils.*;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.yjzl.mapper.*;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.remote.TbQwzxAdaptRemoteService;
+import com.mosty.yjzl.remote.TbRwzxAdaptRemoteService;
+import com.mosty.yjzl.remote.TbYszxAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjmxService;
+import com.mosty.yjzl.service.TbYjxxLzService;
+import com.mosty.yjzl.service.TbZlxxService;
+import io.lettuce.core.GeoCoordinates;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbYjxxLzServiceImpl extends ServiceImpl<TbYjxxMapper, TbYjxx>
+        implements TbYjxxLzService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYszxAdaptRemoteService tbYszxAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbRwzxAdaptRemoteService tbRwzxAdaptRemoteService;
+    private final TbYjxxRyMapper tbYjxxRyMapper;
+    private final TbYjxxRyBqMapper tbYjxxRyBqMapper;
+    private final TbYjxxMxyjMapper tbYjxxMxyjMapper;
+    private final RedisService redisService;
+    private final TbYjmxService tbYjmxService;
+    private final TbYjmxMapper tbYjmxMapper;
+    private final TbZlxxService tbZlxxService;
+    private final TbZlxxMapper tbZlxxMapper;
+    private final TbZlxxZxjlMapper tbZlxxZxjlMapper;
+    private final TbZlxxZxrMapper tbZlxxZxrMapper;
+
+
+    // 网吧
+    private final String[] wbList = new String[]{"网吧上网人员", "本地网吧上网人员"};
+    // 网吧
+    private final String[] ldList = new String[]{"国内旅客"};
+    // 感知源
+    private final String[] gayyjlxList = new String[]{"依图人脸", "依图人像",
+            "海康卡口", "以萨卡口", "交警卡口", "铁路进站卡口", "云城围栏", "先创超级围栏", "先创电子围栏", "电子围栏",
+            "泸州先创电子围栏", "电围", "WIFI探针", "WIFI审计", "WIFI安全审计", "泸州云蝠WIFI", "先创IMEIIMSI",
+            "中电IMSI", "电围"};
+    // 客运
+    private final String[] kyList = new String[]{"客运汽车订票", "新东盛泸州客运汽车检票",
+            "新东盛泸州客运汽车订票", "本地客运汽车订票", "新东盛客运汽车检票", "新东盛客运汽车订票"};
+    // 客运
+    private final String[] mhList = new String[]{"民航进港", "民航机场安检1", "民航订票", "民航机场安检2"};
+    // 火车
+    private final String[] hcList = new String[]{"火车订票"};
+
+    @Override
+    public void addYjxx(TAlarmYjgj gl) {
+        try {
+            long time = new Date().getTime();
+            TbYjxx item = this.baseMapper.selectById(gl.getId());
+            if (item != null) return;
+            item = this.baseMapper.selectOne(
+                    new LambdaQueryWrapper<TbYjxx>()
+                            .eq(TbYjxx::getXtSjzt, "1")
+                            .eq(TbYjxx::getYjRysfzh, gl.getGlsfzh())
+                            .eq(TbYjxx::getYjFssj, gl.getYjsj())
+                            .last(" limit 1")
+            );
+            // 如果人员细类不存在，则添加新得人员细类
+            if (item != null) {
+                if (StringUtils.isNotBlank(item.getYjbqmc()) && item.getYjbqmc().equals(gl.getRyxl())) {
+                    item.setYjbqmc(item.getYjbqmc() + "、" + gl.getRyxl());
+                    this.baseMapper.updateEntity(item);
+                }
+                return;
+            }
+            // 需要添加感知源到要素中
+            this.addGzyToYs(gl);
+            item = new TbYjxx();
+            item.setId(gl.getId());
+            item.setYjLylx("01");
+            item.setYjLx("1");
+            item.setYjFsnf(Integer.valueOf(DateUtils.getQueryDateString(gl.getYjsj(), "13")));
+            item.setYjFsyf(Integer.valueOf(DateUtils.getQueryDateString(gl.getYjsj(), "14")));
+            item.setYjFsny(Integer.valueOf(DateUtils.getQueryDateString(gl.getYjsj(), "15")));
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(gl.getYjsj());
+            int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+            item.setYjFszs(yjfszs);
+            item.setYjGzymc(gl.getHdfsdd());
+            item.setYjFsxs(Integer.valueOf(DateUtils.getQueryDateString(gl.getYjsj(), "16")));
+            item.setYjFsrq(gl.getYjsj());
+            item.setYjFssj(gl.getYjsj());
+            item.setYjSj(gl.getYjsj());
+            item.setSfFszl("0");
+            item.setBz(gl.getId());
+            String yjdj;
+            switch (gl.getYjlyjb()) {
+                case "10":
+                    yjdj = "10";
+                    break;
+                case "20":
+                    yjdj = "30";
+                    break;
+                case "30":
+                    yjdj = "40";
+                    break;
+                case "15":
+                    yjdj = "20";
+                    break;
+                default:
+                    yjdj = "40";
+                    break;
+            }
+            item.setYjJb(yjdj);
+            item.setYjBt((StringUtils.isNotBlank(gl.getRyxl()) ? gl.getRyxl() : "")
+                    + ((StringUtils.isNotBlank(gl.getRyxl()) && gl.getRyxl().contains("人员")) ? "" : "人员") +
+                    gl.getGlxm() + "（" + gl.getGlsfzh() + "）预警");
+            item.setYjNr(gl.getHdxq());
+            int yjcs = 0;
+            yjcs = this.baseMapper.countBySfzhOrCph(gl.getGlsfzh(), null);
+            int yjjrcs = 0;
+            yjjrcs = this.baseMapper.countCurrentBySfzhOrCph(gl.getGlsfzh(), null);
+            yjcs = yjcs + 1;
+            yjjrcs = yjjrcs + 1;
+            item.setYjCs(yjcs);
+            item.setYjJrcs(yjjrcs);
+            item.setJd(gl.getHdjd());
+            item.setWd(gl.getHdwd());
+            if (!Kit.checkJwd(item.getJd(), item.getWd())) return;
+            item.setYjDzXzqh(StringUtils.isNotBlank(gl.getSqrdwdh()) ? gl.getSqrdwdh().substring(0, 6) : null);
+            item.setYjDz(gl.getHdfsdd());
+            item.setYjRyxm(gl.getGlxm());
+            item.setYjRysfzh(gl.getGlsfzh());
+            if (gl.getYjly() == 2) {
+                item.setYjClcph(gl.getGlqthm());
+            }
+            this.saveYjbq(item, gl.getRyxl());
+            String picUrls = gl.getPicurls();
+            if (StringUtils.isNotBlank(picUrls)) {
+                String[] urls = picUrls.split(",");
+                item.setYjTp(urls[0]);
+                if (urls.length == 2) {
+                    item.setYjXtp(urls[1]);
+                }
+            }
+            // 从预警内容中读取相似度
+            this.setXsd(item);
+            item.setYjlyid("01");
+            item.setYjlyBqmc("拓尔思重点人员库");
+            // 查询所属辖区信息
+            String orgcode = this.getOrgcode(gl);
+            if (StringUtils.isBlank(orgcode)) {
+                orgcode = "510500000000";
+            }
+            if (StringUtils.isNotBlank(orgcode)) {
+                DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(orgcode);
+                if (dept != null) {
+                    item.setSsbm(dept.getDeptname());
+                    item.setSsbmid(dept.getDeptid());
+                    item.setSsbmdm(dept.getDeptcode());
+                    item.setSsxgajdm(dept.getFxjcode());
+                    item.setSsxgajid(dept.getFxjid());
+                    item.setSsxgaj(dept.getFxjname());
+                    item.setSssgaj(dept.getDszname());
+                    item.setSssgajdm(dept.getDszcode());
+                    item.setSssgajid(dept.getDszid());
+                }
+            }
+            item.setXtSjly("1");
+            // 判断是否发送指令(所有感知源感知的在逃人员，发送给就近1公里的巡组（感知源所属分局）和感知源管辖分局巡警大队)
+            this.sendZl(item);
+            this.baseMapper.insertEntity(item);
+
+            // 添加预警人员
+            this.addYjxxRy(item);
+            if (StringUtils.isNotBlank(item.getYjbqmc()) && item.getYjbqmc().contains("窃")) {
+                // 计算扒窃人员模型预警，同一感知源设置时间段内出现多个扒窃人员
+                this.checkMxyj(item);
+                // 计算感知源设置距离范围内的扒窃人员预警次数超过多少次
+                this.checkMxyj2(item);
+            }
+            if (StringUtils.isNotBlank(item.getYjbqmc()) && (item.getYjbqmc().contains("稳") || item.getYjbqmc().contains("访"))) {
+                // 同一感知源设置时间内涩稳人员超过设置次数（至少为设置人次及以上）
+                this.checkMxyj3(item);
+            }
+            // 旅店、网吧、依图人脸（人像）感知的前科，
+            // 涉赌人员（人员细类代码为03,04,05开头的）
+            // 放入redis中，方便巡组获取数据发送指令
+            // 须经纬度合法
+            // 预警地址为酒店、网吧、依图的
+            String[] bq = new String[]{"国内旅客", "本地网吧上网人员", "依图人脸", "依图人像", "国内旅客"};
+            if (item.getJd() != null && item.getWd() != null && item.getJd().doubleValue() != 0.0 && item.getWd().doubleValue() != 0.0
+                    && StringUtils.isNotBlank(gl.getRyxlDm()) && ("03".equals(gl.getRyxlDm().substring(0, 2))
+                    || "04".equals(gl.getRyxlDm().substring(0, 2)) || "05".equals(gl.getRyxlDm().substring(0, 2))) &&
+                    StringUtils.isNotBlank(gl.getHdlybcn()) && Arrays.asList(bq).contains(gl.getHdlybcn())) {
+                String key = Constant.LZYJ_DATA_QKSD;
+                this.setYjxxToRedis(item, key);
+            }
+            long time1 = new Date().getTime();
+//            System.out.println("计算模型时间结束---->" + (time1 - time));
+        } catch (Exception e) {
+            log.error("添加泸州拓尔思预警信息失败ServerImpl---> responseResult = {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public IPage<TbYjxxMxyj> querYjmx(BasePage basePage, String ssbmdm) {
+        IPage<TbYjxxMxyj> voIPage = new Page<>(basePage.getPageCurrent(), basePage.getPageSize());
+        return this.tbYjxxMxyjMapper.selectPage(voIPage, new LambdaQueryWrapper<TbYjxxMxyj>()
+                .likeRight(StringUtils.isNotBlank(ssbmdm), TbYjxxMxyj::getSsbmdm, ssbmdm)
+                .orderByDesc(TbYjxxMxyj::getYjSj));
+    }
+
+    // 从预警内容中读取相似度
+    private void setXsd(TbYjxx item) {
+        if (StringUtils.isNotBlank(item.getYjNr()) && item.getYjNr().contains("相似度:")) {
+            String xsd = item.getYjNr().substring(item.getYjNr().indexOf("相似度:") + 4, item.getYjNr().indexOf("相似度:") + 10);
+            if (Kit.isNumber(xsd)) {
+                item.setXsd(new BigDecimal(xsd));
+            }
+        }
+    }
+
+    // 发送模型预警指令
+    private void sendMxZl(TbYjxxMxyj mxyj, TbYjxx mxYjxx, TbYjxx currentYj) {
+        // 经纬度合法
+        if (mxyj.getJd() != null && mxyj.getWd() != null && mxyj.getJd().doubleValue() != 0.0
+                && mxyj.getWd().doubleValue() != 0.0 && !Kit.checkJwd(mxyj.getJd(), mxyj.getWd())) {
+            // 查询是否有该预警已经生成的指令信息
+            TbZlxx zlxx = this.checkMxyjZl(mxYjxx, currentYj);
+            if (zlxx != null) return;
+            // 查询周边最近巡组
+            TbQwXfbbQueryByJlDto dto = new TbQwXfbbQueryByJlDto();
+            dto.setJd(mxyj.getJd());
+            dto.setWd(mxyj.getWd());
+            dto.setRadius(new BigDecimal("500"));
+            dto.setSsbmid(mxyj.getSsxgajid());
+            TbQwXfbb bb = this.tbQwzxAdaptRemoteService.getBbxxByJi(dto);
+            TbZlxxInsertDto zl = new TbZlxxInsertDto();
+            zl.setId(UUIDGenerator.getUUID()).setYwId(mxyj.getId()).setZllx("02").setZlly("02").setZlzxlx("1")
+                    .setZlbt("请核查" + mxyj.getYjBt()).setZlnr(mxyj.getYjNr() + "请核查！")
+                    .setZldj(mxyj.getYjJb()).setJd(mxyj.getJd()).setWd(mxyj.getWd()).setZlfsddxzqh(mxyj.getYjDzXzqh())
+                    .setZlfsdd(mxyj.getYjDz());
+            if (bb != null) {
+                mxyj.setSfFszl("1");
+                mxYjxx.setSfFszl("1");
+                zl.setZljsdx("03");
+                zl.setSsbmid(bb.getSsbmid());
+                List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                zxr.setZlId(zl.getId()).setZxrLx("03").setZxrXzid(bb.getId());
+                zxrDtoList.add(zxr);
+                mxyj.setBz("范围内500米查询到巡组《" + bb.getJzMc() + "》，已下发");
+                zl.setZxrDtoList(zxrDtoList);
+                this.tbZlxxService.addZl(zl);
+                mxyj.setSfFszl("1");
+            }
+            // 下发所属县局巡警大队、特警支队
+            if (StringUtils.isNotBlank(mxyj.getSsxgajdm())) {
+                SysDeptQuery deptQuery = new SysDeptQuery();
+                deptQuery.setOrgBizTypes("03");
+                deptQuery.setOrgLevels("21,31");
+                List<SysDept> xjdd = this.tbBaseAdaptRemoteService.getOrg(deptQuery);
+                if (!CollectionUtils.isEmpty(xjdd)) {
+                    zl.setZljsdx("02");
+                    zl.setSsbmid(String.valueOf(xjdd.get(0).getId()));
+                    List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                    xjdd.forEach(xj -> {
+                        TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                        zxr.setZlId(zl.getId()).setZxrLx("02").setSsbmid(String.valueOf(xj.getId()));
+                        zxrDtoList.add(zxr);
+                    });
+                    zl.setZxrDtoList(zxrDtoList);
+                    this.tbZlxxService.addZl(zl);
+                    mxyj.setSfFszl("1");
+                    mxYjxx.setSfFszl("1");
+                }
+            }
+        }
+    }
+
+    // 查询该模型预警的指令信息
+    private TbZlxx checkMxyjZl(TbYjxx yjxx, TbYjxx currentYj) {
+        TbZlxx zlxx = this.tbZlxxMapper.selectOne(
+                new LambdaQueryWrapper<TbZlxx>()
+                        .eq(TbZlxx::getYwId, yjxx.getId())
+                        .eq(TbZlxx::getXtSjzt, "1")
+                        .last(" limit 1")
+        );
+        if (zlxx != null) {
+            // 添加指令执行记录
+            this.addZxjl(zlxx, currentYj);
+            // 修改旧的执行人的任务内容
+            this.tbRwzxAdaptRemoteService.changeTaskStateByZlid(zlxx);
+            // 修改指令内容
+            zlxx.setZlbt(yjxx.getYjBt() + " 请核查！");
+            zlxx.setZlnr(yjxx.getYjNr() + " 请核查！");
+            this.tbZlxxMapper.updateEntity(zlxx);
+            // 修改指令接收人内容
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zlxx.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlbt(yjxx.getYjBt() + " 请核查！");
+                item.setZlnr(yjxx.getYjNr() + " 请核查！");
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        }
+        return zlxx;
+    }
+
+    // 给旧的指令信息推送新消息
+    private void addZxjl(TbZlxx zl, TbYjxx currentYj) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZlzxddXzqhdm(zl.getZlfsddxzqh());
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt("05");
+        zxjl.setZxnr(String.format("%s,%s《%s》已到达《%s》，请知晓！！",
+                DateUtils.getQueryDateString(currentYj.getYjSj(), "02"),
+                currentYj.getYjbqmc(), currentYj.getYjRyxm(), currentYj.getYjDz()));
+        if (currentYj.getJd() != null && currentYj.getWd() != null) {
+            zxjl.setJd(currentYj.getJd());
+            zxjl.setWd(currentYj.getWd());
+            zxjl.setZb(JtsUtils.getPoint(currentYj.getJd(), currentYj.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(currentYj.getJd(), currentYj.getWd()));
+        }
+        zxjl.setZlzxrId("-1");
+        zxjl.setZlzxrSfz("000000");
+        zxjl.setZlzxrXm("系统");
+        zxjl.setZlzxdd(currentYj.getYjDz());
+        zxjl.setXtSjly("1");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    // 所有感知源感知的在逃人员，发送给就近1公里的巡组（感知源所属分局）和感知源管辖分局巡警大队
+    private void sendZl(TbYjxx yjxx) {
+        // 在逃人员
+        if (StringUtils.isNotBlank(yjxx.getYjbqmc()) && yjxx.getYjbqmc().contains("逃")) {
+            // 经纬度合法
+            if (yjxx.getJd() != null && yjxx.getWd() != null && yjxx.getJd().doubleValue() != 0.0
+                    && yjxx.getWd().doubleValue() != 0.0 && !Kit.checkJwd(yjxx.getJd(), yjxx.getWd())) {
+                // 下发巡组
+                TbQwXfbbQueryByJlDto dto = new TbQwXfbbQueryByJlDto();
+                dto.setJd(yjxx.getJd());
+                dto.setWd(yjxx.getWd());
+                dto.setRadius(new BigDecimal("500"));
+                dto.setSsbmid(yjxx.getSsxgajid());
+                TbQwXfbb bb = this.tbQwzxAdaptRemoteService.getBbxxByJi(dto);
+                TbZlxxInsertDto zl = new TbZlxxInsertDto();
+                zl.setId(UUIDGenerator.getUUID()).setYwId(yjxx.getId()).setZllx("02").setZlly("02").setZlzxlx("1")
+                        .setZlbt("请核查" + yjxx.getYjBt()).setZlnr(yjxx.getYjNr() + "请核查！")
+                        .setZldj(yjxx.getYjJb()).setJd(yjxx.getJd()).setWd(yjxx.getWd()).setZlfsddxzqh(yjxx.getYjDzXzqh())
+                        .setZlfsdd(yjxx.getYjDz()).setZltp(yjxx.getYjTp());
+                if (bb != null) {
+                    yjxx.setSfFszl("1");
+                    zl.setZljsdx("03");
+                    zl.setSsbmid(bb.getSsbmid());
+                    List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                    TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                    zxr.setZlId(zl.getId()).setZxrLx("03").setZxrXzid(bb.getId());
+                    zxrDtoList.add(zxr);
+                    yjxx.setBz("范围内1000米查询到巡组《" + bb.getJzMc() + "》，已下发");
+                    zl.setZxrDtoList(zxrDtoList);
+                    this.tbZlxxService.addZl(zl);
+                }
+                // 下发所属县局巡警大队、特警支队
+                if (StringUtils.isNotBlank(yjxx.getSsxgajdm())) {
+                    SysDeptQuery deptQuery = new SysDeptQuery();
+                    deptQuery.setOrgBizTypes("03");
+                    deptQuery.setOrgLevels("21,31");
+                    List<SysDept> xjdd = this.tbBaseAdaptRemoteService.getOrg(deptQuery);
+                    if (!CollectionUtils.isEmpty(xjdd)) {
+                        zl.setZljsdx("02");
+                        zl.setSsbmid(String.valueOf(xjdd.get(0).getId()));
+                        List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                        xjdd.forEach(xj -> {
+                            TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                            zxr.setZlId(zl.getId()).setZxrLx("02").setSsbmid(String.valueOf(xj.getId()));
+                            zxrDtoList.add(zxr);
+                        });
+                        zl.setZxrDtoList(zxrDtoList);
+                        this.tbZlxxService.addZl(zl);
+                        yjxx.setSfFszl("1");
+                    }
+                }
+            }
+        }
+    }
+
+    // 查询预警所属辖区
+    private String getOrgcode(TAlarmYjgj gl) {
+        if (StringUtils.isNotBlank(gl.getLocalunitcode())) {
+            return gl.getLocalunitcode();
+        } else if (StringUtils.isEmpty(gl.getHdfsdd()) && Arrays.asList(this.gayyjlxList).contains(gl.getHdlybcn())) {
+            TbYsSxtPageOneQuery dto = new TbYsSxtPageOneQuery();
+            dto.setSbmc(gl.getHdfsdd());
+            TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.selectGzy(dto);
+            if (sxt != null) return sxt.getSsbmdm();
+            // 摄像头要素表
+        } else if (Arrays.asList(this.wbList).contains(gl.getHdlybcn()) ||
+                Arrays.asList(this.ldList).contains(gl.getHdlybcn()) ||
+                Arrays.asList(this.kyList).contains(gl.getHdlybcn()) ||
+                Arrays.asList(this.hcList).contains(gl.getHdlybcn()) ||
+                Arrays.asList(this.mhList).contains(gl.getHdlybcn())
+        ) {
+            TbYsDl dl = this.tbYszxAdaptRemoteService.selectDlys(gl.getHdfsdd());
+            if (dl != null) return dl.getSsbmdm();
+        } else if (StringUtils.isNotBlank(gl.getSqrdwdh())) {
+            return gl.getSqrdwdh();
+        }
+        return null;
+    }
+
+    // 需要添加感知源到要素中
+    private void addGzyToYs(TAlarmYjgj gl) {
+        String ysdl, yszl, ysxl;
+        if (Arrays.asList(this.gayyjlxList).contains(gl.getHdlybcn())) {
+//            this.addGzy(gl);
+        } else if (Arrays.asList(this.wbList).contains(gl.getHdlybcn())) {
+            ysdl = "002";
+            yszl = "002001";
+            ysxl = "002001001";
+            this.addDlys(gl, ysdl, yszl, ysxl);
+        } else if (Arrays.asList(this.ldList).contains(gl.getHdlybcn())) {
+            ysdl = "002";
+            yszl = "002001";
+            ysxl = "002001003";
+            if (gl.getHdlybcn().contains("洗") || gl.getHdlybcn().contains("浴") || gl.getHdlybcn().contains("足")) {
+                ysxl = "002001002";
+            }
+            this.addDlys(gl, ysdl, yszl, ysxl);
+        } else if (Arrays.asList(this.kyList).contains(gl.getHdlybcn())) {
+            ysdl = "002";
+            yszl = "002002";
+            ysxl = "002002001";
+            this.addDlys(gl, ysdl, yszl, ysxl);
+        } else if (Arrays.asList(this.hcList).contains(gl.getHdlybcn())) {
+            ysdl = "002";
+            yszl = "002002";
+            ysxl = "002002003";
+            this.addDlys(gl, ysdl, yszl, ysxl);
+        } else if (Arrays.asList(this.mhList).contains(gl.getHdlybcn())) {
+            ysdl = "002";
+            yszl = "002002";
+            ysxl = "002002002";
+            this.addDlys(gl, ysdl, yszl, ysxl);
+        }
+    }
+
+    private void checkMxyj3(TbYjxx item) {
+        if (item.getJd() != null && item.getWd() != null && StringUtils.isNotBlank(item.getYjbqmc()) &&
+                (item.getYjbqmc().contains("稳") || item.getYjbqmc().contains("访"))
+                && StringUtils.isNotBlank(item.getYjGzymc()) && !"不详".equals(item.getYjGzymc())
+                && !"未知".equals(item.getYjGzymc())
+                && item.getJd().doubleValue() != 0.0 && item.getWd().doubleValue() != 0.0) {
+            // 查询预警模型
+            TbYjmxAllVo mx = this.tbYjmxService.getMxCs("mx003");
+            if (mx == null || "02".equals(mx.getMxzt())) return;
+            TbYjmx mxItem = this.tbYjmxMapper.selectById(mx.getId());
+            mxItem.setYxcs(mxItem.getYxcs() + 1);
+            // TODO 详细判断一下预警辖区
+            // if (mx.getSsbmdm().equals("")) return;
+            // 查询同一感知源5分钟内的涉稳人员预警超过两个的
+            // 时间范围
+            List<TbYjmxCsbVo> csVo = mx.getCsList().stream().filter(cs -> "TIME".equals(cs.getCsdm())).collect(Collectors.toList());
+            int M = 0;
+            if (csVo.size() == 1) {
+                M = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (M == 0) return;
+            // 次数
+            csVo = mx.getCsList().stream().filter(cs -> "YJCS".equals(cs.getCsdm())).collect(Collectors.toList());
+            int yjcs = 0;
+            if (csVo.size() == 1) {
+                yjcs = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (yjcs == 0) return;
+            // 人数
+            csVo = mx.getCsList().stream().filter(cs -> "YJRS".equals(cs.getCsdm())).collect(Collectors.toList());
+            int yjrs = 0;
+            if (csVo.size() == 1) {
+                yjrs = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (yjrs == 0) return;
+            // 同一感知源设置时间内涩稳人员超过设置次数（至少为设置人次及以上）
+            String key = Constant.LZYJ_DATA_SWRY;
+            List<TbYjxx> yjxxList = redisService.getCacheList(key);
+            if (!CollectionUtils.isEmpty(yjxxList)) {
+                // 查询同一感知源得预警信息
+                yjxxList = yjxxList.stream().filter(it -> {
+                    if (StringUtils.isNotBlank(item.getYjGzyid())) {
+                        return item.getYjGzyid().equals(it.getYjGzyid());
+                    } else if (StringUtils.isNotBlank(item.getYjGzymc())) {
+                        return item.getYjGzymc().equals(it.getYjGzymc());
+                    }
+                    return false;
+                }).collect(Collectors.toList());
+                // 查询设定时间内的预警信息
+                int finalM = M;
+                yjxxList = yjxxList.stream().filter(yj ->
+                        item.getYjSj().getTime() - yj.getYjSj().getTime() <= finalM * 60 * 1000)
+                        .collect(Collectors.toList());
+                // 次数大于5次
+                if (yjxxList.size() >= yjcs) {
+                    // 判断人次，至少有2人
+                    Set<String> set = yjxxList.stream().map(TbYjxx::getYjRysfzh).collect(Collectors.toSet());
+                    if (set.size() >= yjrs) {
+                        // 查询现有模型预警信息
+                        // 先查询是否有相同人员的模型预警（预警时间之内的）
+                        TbYjxxMxyj mxyj = this.tbYjxxMxyjMapper.selectOne(
+                                new LambdaQueryWrapper<TbYjxxMxyj>()
+                                        .eq(StringUtils.isNotBlank(item.getYjGzyid()), TbYjxxMxyj::getYjGzyid, item.getYjGzyid())
+                                        .eq(StringUtils.isNotBlank(item.getYjGzymc()), TbYjxxMxyj::getYjGzymc, item.getYjGzymc())
+                                        .eq(TbYjxxMxyj::getMxid, mx.getId())
+                                        .ge(TbYjxxMxyj::getYjSj, DateUtils.getQueryDateString(
+                                                DateUtils.getNextDate(item.getYjSj(), "m", -M), "02"))
+                                        .le(TbYjxxMxyj::getYjSj, DateUtils.getQueryDateString(item.getYjSj(), "02"))
+                                        .last(" limit 1")
+                        );
+                        TbYjxx yj;
+                        if (mxyj == null) {
+                            mxyj = new TbYjxxMxyj();
+                            mxyj.setMxid(mx.getId());
+                            yj = new TbYjxx();
+                        } else {
+                            yj = this.baseMapper.selectById(mxyj.getYjid());
+                            if (yj == null) {
+                                yj = new TbYjxx();
+                            }
+                        }
+                        String oldYjid = yj.getId();
+                        String oldMxyjId = mxyj.getId();
+                        List<String> usernames = yjxxList.stream().map(it -> it.getYjRyxm() + "(" + it.getYjRysfzh() + ")")
+                                .collect(Collectors.toList());
+                        usernames.add(item.getYjRyxm() + "(" + item.getYjRysfzh() + ")");
+                        String username = String.join("、", new HashSet<>(usernames));
+                        String yjnr = yjxxList.stream().map(it -> String.format("涉稳人员%s于%s在%s出现",
+                                it.getYjRyxm() + "(" + it.getYjRysfzh() + ")",
+                                DateUtils.getQueryDateString(it.getYjFssj(), "02"),
+                                it.getYjDz())).collect(Collectors.joining("、"));
+                        yjnr += "、" + String.format("涉稳人员%s于%s在%s出现", item.getYjRyxm() + "(" + item.getYjRysfzh() + ")",
+                                DateUtils.getQueryDateString(item.getYjFssj(), "02"),
+                                item.getYjDz());
+                        String yjid = yjxxList.stream().map(TbYjxx::getId).collect(Collectors.joining(","));
+                        yjid += "," + item.getId();
+                        // 生成新的模型预警
+                        BeanUtils.copyProperties(item, yj);
+                        yj.setId(oldYjid);
+                        yj.setYjLylx("03");
+                        yj.setYjLx("7");
+                        Date time = item.getYjSj();
+                        yj.setYjSj(time);
+                        yj.setYjFsnf(Integer.valueOf(DateUtils.getQueryDateString(time, "13")));
+                        yj.setYjFsyf(Integer.valueOf(DateUtils.getQueryDateString(time, "14")));
+                        yj.setYjFsny(Integer.valueOf(DateUtils.getQueryDateString(time, "15")));
+                        Calendar ca = Calendar.getInstance();
+                        ca.setTime(time);
+                        int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+                        yj.setYjFszs(yjfszs);
+                        yj.setYjFsxs(Integer.valueOf(DateUtils.getQueryDateString(time, "16")));
+                        yj.setYjFsrq(time);
+                        yj.setYjFssj(time);
+                        yj.setYjJb("10");
+                        yj.setYjBt(String.format("涉稳人员%s于%s分钟内在%s依次出现。", username, M, yj.getYjGzymc()));
+                        yj.setYjNr(yjnr);
+                        yj.setYjCs(1);
+                        yj.setYjJrcs(1);
+                        yj.setYjRysfzh(null);
+                        yj.setYjRyxm(null);
+                        yj.setYjClcph(null);
+                        yj.setYjbq("8");
+                        yj.setYjbqmc("涉稳人员");
+                        yj.setYjlyid("06");
+                        yj.setYjlyBqmc("综合模型预警");
+                        // 计算多个坐标的中心点
+                        GeoCoordinates geo = this.getZxd(yjxxList);
+                        yj.setJd(new BigDecimal(String.valueOf(geo.getX())));
+                        yj.setWd(new BigDecimal(String.valueOf(geo.getY())));
+
+                        if (StringUtils.isBlank(yj.getId())) {
+                            yj.setId(UUIDGenerator.getUUID());
+
+                            this.baseMapper.insertEntity(yj);
+                        } else {
+
+
+                            this.baseMapper.updateEntity(yj);
+                        }
+                        BeanUtils.copyProperties(yj, mxyj);
+                        mxyj.setYjid(yj.getId());
+                        mxyj.setYjids(yjid);
+                        mxyj.setYjsl(yjxxList.size() + 1);
+                        mxyj.setId(oldMxyjId);
+                        // 添加模型预警子表
+                        if (StringUtils.isBlank(mxyj.getId())) {
+                            mxyj.setId(UUIDGenerator.getUUID());
+                            this.tbYjxxMxyjMapper.insertEntity(mxyj);
+                        } else {
+                            this.tbYjxxMxyjMapper.updateEntity(mxyj);
+                        }
+                        mxItem.setYjcs(mxItem.getYjcs() + 1);
+                        this.tbYjmxMapper.updateById(mxItem);
+                        // 暂时不发送指令
+                    }
+                }
+            }
+            // 将有坐标的数据丢入redis中，方便计算预警模型
+            this.setYjxxToRedis(item, Constant.LZYJ_DATA_SWRY);
+            // 存入redis中的时候，坐标置空了，重新赋值
+//            if (item.getJd() != null && item.getWd() != null) {
+//                item.setZb(JtsUtils.getPoint(item.getJd(), item.getWd()));
+//                item.setZbhash(GeoHashKit.encode(item.getJd(), item.getWd()));
+//            }
+        }
+    }
+
+    // 将数据放入redis中
+    private void setYjxxToRedis(TbYjxx item, String key) {
+        List<TbYjxx> redisYjxxList = redisService.getCacheList(key);
+        if (redisYjxxList == null) {
+            redisYjxxList = new ArrayList<>();
+        }
+        List<TbYjxx> tempList = redisYjxxList.stream().filter(it -> item.getId().equals(it.getId())).collect(Collectors.toList());
+        if (tempList.size() > 0) return;
+//        item.setZb(null);
+        if (redisYjxxList.size() == 0) {
+            redisYjxxList.add(item);
+            redisService.setCacheList(key, redisYjxxList);
+        } else {
+            redisService.setCacheList(key, new ArrayList<TbYjxx>() {{
+                this.add(item);
+            }});
+        }
+    }
+
+    private void checkMxyj2(TbYjxx item) {
+        if (item.getJd() != null && item.getWd() != null && StringUtils.isNotBlank(item.getYjbqmc()) &&
+                item.getYjbqmc().contains("窃") && StringUtils.isNotBlank(item.getYjGzymc()) && !"不详".equals(item.getYjGzymc())
+                && !"未知".equals(item.getYjGzymc())
+                && item.getJd().doubleValue() != 0.0 && item.getWd().doubleValue() != 0.0) {
+            // 查询预警模型
+            TbYjmxAllVo mx = this.tbYjmxService.getMxCs("mx002");
+            if (mx == null || "02".equals(mx.getMxzt())) return;
+            TbYjmx mxItem = this.tbYjmxMapper.selectById(mx.getId());
+            mxItem.setYxcs(mxItem.getYxcs() + 1);
+            // TODO 详细判断一下预警辖区
+            // if (mx.getSsbmdm().equals("")) return;
+            // 查询同一感知源5分钟内的扒窃人员预警超过两个的
+            // 时间范围
+            List<TbYjmxCsbVo> csVo = mx.getCsList().stream().filter(cs -> "TIME".equals(cs.getCsdm())).collect(Collectors.toList());
+            int M = 0;
+            if (csVo.size() == 1) {
+                M = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (M == 0) return;
+            // 距离
+            csVo = mx.getCsList().stream().filter(cs -> "JL".equals(cs.getCsdm())).collect(Collectors.toList());
+            int jlfw = 0;
+            if (csVo.size() == 1) {
+                jlfw = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (jlfw == 0) return;
+            // 次数
+            csVo = mx.getCsList().stream().filter(cs -> "YJCS".equals(cs.getCsdm())).collect(Collectors.toList());
+            int yjcs = 0;
+            if (csVo.size() == 1) {
+                yjcs = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (yjcs == 0) return;
+            // 人数
+            csVo = mx.getCsList().stream().filter(cs -> "YJRS".equals(cs.getCsdm())).collect(Collectors.toList());
+            int yjrs = 0;
+            if (csVo.size() == 1) {
+                yjrs = Integer.parseInt(csVo.get(0).getCsz());
+            }
+            if (yjrs == 0) return;
+            // 查询范围500米内出现的扒窃人员的数量超过5个，至少2人及以上
+            String key = Constant.LZYJ_DATA_PQRY;
+            List<TbYjxx> yjxxList = redisService.getCacheList(key);
+            if (!CollectionUtils.isEmpty(yjxxList)) {
+                // 查询设定时间内的预警信息
+                int finalM = M;
+                yjxxList = yjxxList.stream().filter(yj ->
+                        item.getYjSj().getTime() - yj.getYjSj().getTime() <= finalM * 60 * 1000)
+                        .collect(Collectors.toList());
+                // 计算范围
+                int finalJlfw = jlfw;
+                yjxxList = yjxxList.stream().filter(yj -> {
+                    double jl = Kit.getDistance(yj.getJd().doubleValue(), yj.getWd().doubleValue(),
+                            item.getJd().doubleValue(), item.getWd().doubleValue());
+                    if (jl < finalJlfw) {
+                        yj.setDistance(new BigDecimal(String.valueOf(jl)));
+                        return true;
+                    }
+                    return false;
+                }).collect(Collectors.toList());
+                // 次数大于5次
+                if (yjxxList.size() >= yjcs) {
+                    // 判断人次，至少有2人
+                    Set<String> set = yjxxList.stream().map(TbYjxx::getYjRysfzh).collect(Collectors.toSet());
+                    if (set.size() >= yjrs) {
+                        // 查询现有模型预警信息
+                        TbYjxxMxyj mxyj = this.tbYjxxMxyjMapper.selectbyMxId(DateUtils.getQueryDateString(
+                                DateUtils.getNextDate(item.getYjSj(), "m", -M), "02"),
+                                DateUtils.getQueryDateString(item.getYjSj(), "02"), jlfw, item.getJd(),
+                                item.getWd(), mx.getId());
+                        TbYjxx yj;
+                        if (mxyj == null) {
+                            mxyj = new TbYjxxMxyj();
+                            mxyj.setMxid(mx.getId());
+                            yj = new TbYjxx();
+                        } else {
+                            yj = this.baseMapper.selectById(mxyj.getYjid());
+                            if (yj == null) {
+                                yj = new TbYjxx();
+                            }
+                        }
+                        String oldYjid = yj.getId();
+                        String oldMxyjId = mxyj.getId();
+                        List<String> usernames = yjxxList.stream().map(it -> it.getYjRyxm() + "(" + it.getYjRysfzh() + ")")
+                                .collect(Collectors.toList());
+                        usernames.add(item.getYjRyxm() + "(" + item.getYjRysfzh() + ")");
+                        String username = String.join("、", new HashSet<>(usernames));
+                        String yjnr = yjxxList.stream().map(it -> String.format("扒窃人员%s于%s在%s出现",
+                                it.getYjRyxm() + "(" + it.getYjRysfzh() + ")",
+                                DateUtils.getQueryDateString(it.getYjFssj(), "02"),
+                                it.getYjDz())).collect(Collectors.joining("、"));
+                        yjnr += "、" + String.format("扒窃人员%s于%s在%s出现", item.getYjRyxm() + "(" + item.getYjRysfzh() + ")",
+                                DateUtils.getQueryDateString(item.getYjFssj(), "02"),
+                                item.getYjDz());
+                        String yjid = yjxxList.stream().map(TbYjxx::getId).collect(Collectors.joining(","));
+                        yjid += "," + item.getId();
+                        // 生成新的模型预警
+                        BeanUtils.copyProperties(item, yj);
+                        yj.setId(oldYjid);
+                        yj.setYjLylx("03");
+                        yj.setYjLx("7");
+                        Date time = item.getYjSj();
+                        yj.setYjSj(time);
+                        yj.setYjFsnf(Integer.valueOf(DateUtils.getQueryDateString(time, "13")));
+                        yj.setYjFsyf(Integer.valueOf(DateUtils.getQueryDateString(time, "14")));
+                        yj.setYjFsny(Integer.valueOf(DateUtils.getQueryDateString(time, "15")));
+                        Calendar ca = Calendar.getInstance();
+                        ca.setTime(time);
+                        int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+                        yj.setYjFszs(yjfszs);
+                        yj.setYjFsxs(Integer.valueOf(DateUtils.getQueryDateString(time, "16")));
+                        yj.setYjFsrq(time);
+                        yj.setYjFssj(time);
+                        yj.setYjJb("10");
+                        yj.setYjBt(String.format("扒窃人员%s于%s分钟内在范围%s米区域内依次出现。", username, M, jlfw));
+                        yj.setYjNr(yjnr);
+                        yj.setYjCs(1);
+                        yj.setYjJrcs(1);
+                        yj.setYjRysfzh(null);
+                        yj.setYjRyxm(null);
+                        yj.setYjClcph(null);
+                        yj.setYjbq("4");
+                        yj.setYjbqmc("扒窃人员");
+                        yj.setYjlyid("06");
+                        yj.setYjlyBqmc("综合模型预警");
+                        // 计算多个坐标的中心点
+                        GeoCoordinates geo = this.getZxd(yjxxList);
+                        yj.setJd(new BigDecimal(String.valueOf(geo.getX())));
+                        yj.setWd(new BigDecimal(String.valueOf(geo.getY())));
+
+                        // 发送指令或修改指令信息
+                        this.sendMxZl(mxyj, yj, item);
+                        BeanUtils.copyProperties(yj, mxyj);
+                        mxyj.setYjid(yj.getId());
+                        mxyj.setYjids(yjid);
+                        mxyj.setYjsl(yjxxList.size() + 1);
+                        mxyj.setId(oldMxyjId);
+                        mxyj.setJl(jlfw);
+                        if (StringUtils.isBlank(yj.getId())) {
+                            yj.setId(UUIDGenerator.getUUID());
+
+                            this.baseMapper.insertEntity(yj);
+                        } else {
+
+                            this.baseMapper.updateEntity(yj);
+                        }
+                        // 添加模型预警子表
+                        if (StringUtils.isBlank(mxyj.getId())) {
+                            mxyj.setId(UUIDGenerator.getUUID());
+                            this.tbYjxxMxyjMapper.insertEntity(mxyj);
+                        } else {
+                            this.tbYjxxMxyjMapper.updateEntity(mxyj);
+                        }
+                        mxItem.setYjcs(mxItem.getYjcs() + 1);
+                        this.tbYjmxMapper.updateById(mxItem);
+                    }
+                }
+            }
+            // 将有坐标的数据丢入redis中，方便计算预警模型
+            this.setYjxxToRedis(item, Constant.LZYJ_DATA_PQRY);
+            // 存入redis中的时候，坐标置空了，重新赋值
+//            if (item.getJd() != null && item.getWd() != null) {
+//                item.setZb(JtsUtils.getPoint(item.getJd(), item.getWd()));
+//                item.setZbhash(GeoHashKit.encode(item.getJd(), item.getWd()));
+//            }
+        }
+    }
+
+    private GeoCoordinates getZxd(List<TbYjxx> yjxxList) {
+        int total = yjxxList.size();
+        double X = 0, Y = 0, Z = 0;
+        for (TbYjxx yjxx : yjxxList) {
+            double jd, wd, x, y, z;
+            jd = yjxx.getJd().doubleValue() * Math.PI / 180;
+            wd = yjxx.getWd().doubleValue() * Math.PI / 180;
+            x = Math.cos(wd) * Math.cos(jd);
+            y = Math.cos(wd) * Math.sin(jd);
+            z = Math.sin(wd);
+            X += x;
+            Y += y;
+            Z += z;
+        }
+        X = X / total;
+        Y = Y / total;
+        Z = Z / total;
+        double jd = Math.atan2(Y, X);
+        double Hyp = Math.sqrt(X * X + Y * Y);
+        double wd = Math.atan2(Z, Hyp);
+        return GeoCoordinates.create(jd * 180 / Math.PI, wd * 180 / Math.PI);
+    }
+
+    // 计算模型预警
+    private void checkMxyj(TbYjxx item) {
+        if (StringUtils.isBlank(item.getYjGzymc()) || "不详".equals(item.getYjGzymc())
+                || "未知".equals(item.getYjGzymc())) return;
+        TbYjmxAllVo mx = this.tbYjmxService.getMxCs("mx001");
+        if (mx == null || "02".equals(mx.getMxzt())) return;
+        TbYjmx mxItem = this.tbYjmxMapper.selectById(mx.getId());
+        mxItem.setYxcs(mx.getYxcs() + 1);
+        // TODO 详细判断一下预警辖区
+        // if (mx.getSsbmdm().equals("")) return;
+        // 查询同一感知源5分钟内的扒窃人员预警超过两个的
+        List<TbYjmxCsbVo> csVo = mx.getCsList().stream().filter(cs -> "TIME".equals(cs.getCsdm())).collect(Collectors.toList());
+        int M = 0;
+        if (csVo.size() == 1) {
+            M = Integer.parseInt(csVo.get(0).getCsz());
+        }
+        if (M == 0) return;
+        // 预警人次获取
+        int num = 0;
+        csVo = mx.getCsList().stream().filter(cs -> "PERSON".equals(cs.getCsdm())).collect(Collectors.toList());
+        if (csVo.size() == 1) {
+            num = Integer.parseInt(csVo.get(0).getCsz());
+        }
+        if (num == 0) return;
+        List<TbYjxx> yjxxList = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbYjxx>()
+                        .eq(StringUtils.isNotBlank(item.getYjGzyid()), TbYjxx::getYjGzyid, item.getYjGzyid())
+                        .eq(TbYjxx::getYjGzymc, item.getYjGzymc())
+                        .like(TbYjxx::getYjbqmc, "窃")
+                        .ne(TbYjxx::getYjRysfzh, item.getYjRysfzh())
+                        .le(TbYjxx::getYjSj, DateUtils.getQueryDateString(item.getYjSj(), "02"))
+                        .ge(TbYjxx::getYjSj, DateUtils.getQueryDateString(
+                                DateUtils.getNextDate(item.getYjSj(), "m", -M), "02"))
+        );
+        if (yjxxList != null && yjxxList.size() > 0) {
+            // 先查询是否有相同人员的模型预警（预警时间之内的）
+            TbYjxxMxyj mxyj = this.tbYjxxMxyjMapper.selectOne(
+                    new LambdaQueryWrapper<TbYjxxMxyj>()
+                            .eq(StringUtils.isNotBlank(item.getYjGzyid()), TbYjxxMxyj::getYjGzyid, item.getYjGzyid())
+                            .eq(StringUtils.isNotBlank(item.getYjGzymc()), TbYjxxMxyj::getYjGzymc, item.getYjGzymc())
+                            .eq(TbYjxxMxyj::getMxid, mx.getId())
+                            .ge(TbYjxxMxyj::getYjSj, DateUtils.getQueryDateString(
+                                    DateUtils.getNextDate(item.getYjSj(), "m", -M), "02"))
+                            .le(TbYjxxMxyj::getYjSj, DateUtils.getQueryDateString(item.getYjSj(), "02"))
+                            .last(" limit 1")
+            );
+            TbYjxx yj;
+            if (mxyj == null) {
+                mxyj = new TbYjxxMxyj();
+                mxyj.setMxid(mx.getId());
+                yj = new TbYjxx();
+            } else {
+                yj = this.baseMapper.selectById(mxyj.getYjid());
+                if (yj == null) {
+                    yj = new TbYjxx();
+                }
+            }
+            String oldYjid = yj.getId();
+            String oldMxyjId = mxyj.getId();
+            String username = yjxxList.stream().map(it -> it.getYjRyxm() + "(" + it.getYjRysfzh() + ")")
+                    .collect(Collectors.joining("、"));
+            username += "、" + (item.getYjRyxm() + "(" + item.getYjRysfzh() + ")");
+            String yjnr = yjxxList.stream().map(it -> String.format("扒窃人员%s于%s在%s出现", it.getYjRyxm() + "(" + it.getYjRysfzh() + ")",
+                    DateUtils.getQueryDateString(it.getYjFssj(), "02"),
+                    it.getYjDz())).collect(Collectors.joining("、"));
+            yjnr += "、" + String.format("扒窃人员%s于%s在%s出现", item.getYjRyxm() + "(" + item.getYjRysfzh() + ")",
+                    DateUtils.getQueryDateString(item.getYjFssj(), "02"),
+                    item.getYjDz());
+            String yjid = yjxxList.stream().map(TbYjxx::getId).collect(Collectors.joining(","));
+            yjid += "," + item.getId();
+            // 生成新的模型预警
+            BeanUtils.copyProperties(item, yj);
+            yj.setId(oldYjid);
+            yj.setYjLylx("03");
+            yj.setYjLx("7");
+            Date time = item.getYjSj();
+            yj.setYjSj(time);
+            yj.setYjFsnf(Integer.valueOf(DateUtils.getQueryDateString(time, "13")));
+            yj.setYjFsyf(Integer.valueOf(DateUtils.getQueryDateString(time, "14")));
+            yj.setYjFsny(Integer.valueOf(DateUtils.getQueryDateString(time, "15")));
+            Calendar ca = Calendar.getInstance();
+            ca.setTime(time);
+            int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+            yj.setYjFszs(yjfszs);
+            yj.setYjFsxs(Integer.valueOf(DateUtils.getQueryDateString(time, "16")));
+            yj.setYjFsrq(time);
+            yj.setYjFssj(time);
+            yj.setYjJb("10");
+            yj.setYjBt(String.format("扒窃人员%s于%s在%s分钟内同时出现。", username, yj.getYjDz(), M));
+            yj.setYjNr(yjnr);
+            yj.setYjCs(1);
+            yj.setYjJrcs(1);
+            yj.setYjRysfzh(null);
+            yj.setYjRyxm(null);
+            yj.setYjClcph(null);
+            yj.setYjbq("4");
+            yj.setYjbqmc("扒窃人员");
+            yj.setYjlyid("06");
+            yj.setYjlyBqmc("综合模型预警");
+            BeanUtils.copyProperties(yj, mxyj);
+            mxyj.setYjid(yj.getId());
+            mxyj.setYjids(yjid);
+            mxyj.setYjsl(yjxxList.size() + 1);
+            mxyj.setId(oldMxyjId);
+            // 发送指令或修改指令信息
+            this.sendMxZl(mxyj, yj, item);
+
+            if (StringUtils.isBlank(yj.getId())) {
+                yj.setId(UUIDGenerator.getUUID());
+
+                this.baseMapper.insertEntity(yj);
+            } else {
+
+                this.baseMapper.updateEntity(yj);
+            }
+            // 添加模型预警子表
+            if (StringUtils.isBlank(mxyj.getId())) {
+                mxyj.setId(UUIDGenerator.getUUID());
+                this.tbYjxxMxyjMapper.insertEntity(mxyj);
+            } else {
+                this.tbYjxxMxyjMapper.updateEntity(mxyj);
+            }
+            mxItem.setYjcs(mxItem.getYjcs() + 1);
+            this.tbYjmxMapper.updateById(mxItem);
+        }
+    }
+
+    // 添加网吧
+    private void addDlys(TAlarmYjgj gl, String ysdl, String yszl, String ysxl) {
+        if (StringUtils.isEmpty(gl.getHdfsdd())) return;
+        // 查询网吧是否存在
+        TbYsDl dl = this.tbYszxAdaptRemoteService.selectDlys(gl.getHdfsdd());
+        if (dl != null) return;
+        // 不存在就新增
+        TbYsDlDto dto = new TbYsDlDto();
+        if (!Kit.checkJwd(gl.getHdjd(), gl.getHdwd())) {
+            dto.setJd(null);
+            dto.setWd(null);
+        } else {
+            dto.setJd(gl.getHdjd());
+            dto.setWd(gl.getHdwd());
+        }
+        dto.setYsdl(ysdl);
+        dto.setYszl(yszl);
+        dto.setYsxl(ysxl);
+        dto.setYsmc(gl.getHdfsdd());
+        dto.setYsjc(gl.getHdfsdd());
+        dto.setYswzXzqh(StringUtils.isNotBlank(gl.getHdfsdqh()) ? gl.getHdfsdqh() : (
+                StringUtils.isNotBlank(gl.getSqrdwdh()) ? gl.getSqrdwdh().substring(0, 6) : ""
+        ));
+        dto.setYswzBc(StringUtils.isEmpty(gl.getHdfsdxz()) ? gl.getHdfsdd() : gl.getHdfsdxz());
+        dto.setYswzXz(StringUtils.isEmpty(gl.getHdfsdxz()) ? gl.getHdfsdd() : gl.getHdfsdxz());
+
+        this.tbYszxAdaptRemoteService.addDlYs(dto);
+    }
+
+    // 添加到感知源表中
+    private void addGzy(TAlarmYjgj gl) {
+        if (StringUtils.isEmpty(gl.getHdfsdxz()) || gl.getHdjd() == null || gl.getHdwd() == null) return;
+        TbYsSxtPageOneQuery dto = new TbYsSxtPageOneQuery();
+        dto.setSbmc(gl.getHdfsdxz());
+        dto.setJd(gl.getHdjd());
+        dto.setWd(gl.getHdwd());
+        TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.selectGzy(dto);
+        if (sxt == null) {
+            sxt = new TbYsSxtDto();
+            sxt.setSbmc(gl.getHdfsdxz());
+            sxt.setJd(gl.getHdjd());
+            sxt.setWd(gl.getHdwd());
+            sxt.setDzmc(gl.getHdfsdxz());
+            sxt.setSblx(this.setSblx(gl.getHdlybcn()));
+            sxt.setXzqhdm(gl.getHdfsdqh());
+            sxt.setSbzt("1");
+            int a = this.tbYszxAdaptRemoteService.addSxt(sxt);
+            System.err.println(String.format("添加成功%s个摄像头", a));
+        }
+    }
+
+    // 计算设备类型
+    private String setSblx(String ly) {
+        if ("依图人脸".equals(ly) || "依图人像".equals(ly)) {
+            return "03";
+        } else if ("海康卡口".equals(ly) || "以萨卡口".equals(ly) || "交警卡口".equals(ly) || "铁路进站卡口".equals(ly)) {
+            return "02";
+        } else if ("云城围栏".equals(ly) || "先创超级围栏".equals(ly) || "先创电子围栏".equals(ly) || "电子围栏".equals(ly) ||
+                "泸州先创电子围栏".equals(ly) || "电围".equals(ly)) {
+            return "05";
+        } else if ("WIFI探针".equals(ly) || "WIFI审计".equals(ly) || "WIFI安全审计".equals(ly) || "泸州云蝠WIFI".equals(ly)) {
+            return "06";
+        } else if ("先创IMEIIMSI".equals(ly) || "中电IMSI".equals(ly)) {
+            return "07";
+        }
+        return null;
+    }
+
+    // 添加预警信息人员
+    private void addYjxxRy(TbYjxx yjxx) {
+        TbYjxxRy ryxx = new TbYjxxRy();
+        ryxx.setId(UUIDGenerator.getUUID());
+        ryxx.setYjId(yjxx.getId());
+        ryxx.setYjGzyid(yjxx.getYjGzyid());
+        ryxx.setYjGzymc(yjxx.getYjGzymc());
+        ryxx.setYjFssj(yjxx.getYjFssj());
+        ryxx.setYjSj(yjxx.getYjSj());
+        ryxx.setYjJb(yjxx.getYjJb());
+        ryxx.setYjBt(yjxx.getYjBt());
+        ryxx.setYjNr(yjxx.getYjNr());
+        ryxx.setYjDzxzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjlyBqmc(yjxx.getYjlyBqmc());
+        ryxx.setYjZjlx("1");
+        ryxx.setYjZjhm(yjxx.getYjRysfzh());
+        ryxx.setYjRyxm(yjxx.getYjRyxm());
+        ryxx.setYjRyxb(IDCardUtil.getSex(yjxx.getYjRysfzh()));
+        ryxx.setYjRynl(IDCardUtil.getAge(yjxx.getYjRysfzh()));
+        ryxx.setYjRyjg(yjxx.getYjDzXzqh());
+        ryxx.setYjRyhjdXzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjDz(yjxx.getYjDz());
+        ryxx.setTpId(yjxx.getYjTp());
+        ryxx.setJd(yjxx.getJd());
+        ryxx.setWd(yjxx.getWd());
+//        if (ryxx.getJd() != null && ryxx.getWd() != null) {
+//            ryxx.setZb(yjxx.getZb());
+//            ryxx.setZbhash(yjxx.getZbhash());
+//        }
+        ryxx.setYjRybq(yjxx.getYjbq());
+        ryxx.setYjRybqmc(yjxx.getYjbqmc());
+        ryxx.setSsbm(yjxx.getSsbm());
+        ryxx.setSsbmid(yjxx.getSsbmid());
+        ryxx.setSsxgajid(yjxx.getSsxgajid());
+        ryxx.setSssgajid(yjxx.getSssgajid());
+        ryxx.setSsbmdm(yjxx.getSsbmdm());
+        ryxx.setSsxgaj(yjxx.getSsxgaj());
+        ryxx.setSsxgajdm(yjxx.getSsxgajdm());
+        ryxx.setSssgaj(yjxx.getSssgaj());
+        ryxx.setSssgajdm(yjxx.getSssgajdm());
+        ryxx.setXtSjly("1");
+        this.tbYjxxRyMapper.insertEntity(ryxx);
+        saveTbYjxxRyBq(ryxx);
+    }
+
+    // 添加人员信息标签
+    private void saveTbYjxxRyBq(TbYjxxRy ryxx) {
+        TbYjxxRyBq rybq = new TbYjxxRyBq();
+        rybq.setId(UUIDGenerator.getUUID());
+        rybq.setYjryId(ryxx.getId());
+        rybq.setRybqdm(ryxx.getYjRybq());
+        rybq.setRybqmc(ryxx.getYjRybqmc());
+        rybq.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+        rybq.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        rybq.setXtScbz("0");
+        rybq.setXtSjzt("1");
+        rybq.setXtSjly("1");
+        this.tbYjxxRyBqMapper.insert(rybq);
+    }
+
+    private void saveYjbq(TbYjxx yjxx, String name) {
+        yjxx.setYjbqmc(name);
+        if (StringUtils.isEmpty(name)) return;
+        if (name.contains("控")) {
+            yjxx.setYjbq("1");
+        } else if (name.contains("在逃")) {
+            yjxx.setYjbq("2");
+        } else if (name.contains("毒")) {
+            yjxx.setYjbq("3");
+        } else if (name.contains("前科") || name.contains("盗") || name.contains("抢")) {
+            yjxx.setYjbq("4");
+        } else if (name.contains("精神") || name.contains("肇事") || name.contains("肇祸")) {
+            yjxx.setYjbq("5");
+        } else if (name.contains("涉恐")) {
+            yjxx.setYjbq("6");
+        } else if (name.contains("信访") || name.contains("上访")) {
+            yjxx.setYjbq("7");
+        } else if (name.contains("稳")) {
+            yjxx.setYjbq("8");
+        } else {
+            yjxx.setYjbq("9");
+        }
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxRyServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxRyServiceImpl.java
new file mode 100644
index 0000000..9272e90
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxRyServiceImpl.java
@@ -0,0 +1,225 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.model.entity.yjzl.TbYjxxRy;
+import com.mosty.base.model.entity.yjzl.TbYjxxRyBq;
+import com.mosty.base.model.entity.yjzl.TbYjxxRySjaj;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.yjzl.TbYjxxRyQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxRyVo;
+import com.mosty.yjzl.mapper.TbYjxxRyBqMapper;
+import com.mosty.yjzl.mapper.TbYjxxRyMapper;
+import com.mosty.yjzl.mapper.TbYjxxRySjajMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjxxRyService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 预警信息-人员表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@AllArgsConstructor
+@Service
+public class TbYjxxRyServiceImpl implements TbYjxxRyService {
+
+    private final TbYjxxRyMapper tbYjxxRyMapper;
+    private final TbYjxxRyBqMapper tbYjxxRyBqMapper;
+    private final TbYjxxRySjajMapper tbYjxxRySjajMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjxxRyVo> queryByPage(TbYjxxRyQuery yjry) {
+        IPage<TbYjxxRyVo> voIPage = new Page<>(yjry.getPageCurrent(), yjry.getPageSize());
+        IPage<TbYjxxRy> pageQuery = new Page<>(yjry.getPageCurrent(), yjry.getPageSize());
+        QueryWrapper<TbYjxxRy> queryWrapper = getQueryWrapper(yjry);
+        IPage<TbYjxxRy> page = tbYjxxRyMapper.selectPage(pageQuery, queryWrapper);
+        voIPage.setTotal(page.getTotal());
+        List<TbYjxxRy> records = page.getRecords();
+        List<TbYjxxRyVo> vos = dataPerfact(records);
+        voIPage.setRecords(vos);
+        return voIPage;
+    }
+
+    @Override
+    public List<TbYjxxRyVo> queryList(TbYjxxRyQuery tbYjxxRyQuery) {
+        QueryWrapper<TbYjxxRy> queryWrapper = getQueryWrapper(tbYjxxRyQuery);
+        List<TbYjxxRy> records = tbYjxxRyMapper.selectList(queryWrapper);
+        return dataPerfact(records);
+    }
+
+    @Override
+    public int insert(TbYjxxRyVo ryVo) {
+        TbYjxxRy ry = new TbYjxxRy();
+        BeanUtils.copyProperties(ryVo, ry);
+        ry.setId(UUIDGenerator.getUUID());
+        perfectDept(ry);
+        saveRelevanceData(ry, ryVo, ry.getId());
+        return tbYjxxRyMapper.insert(ry);
+    }
+
+    @Override
+    public int update(TbYjxxRyVo ryVo) {
+        TbYjxxRy ry = new TbYjxxRy();
+        BeanUtils.copyProperties(ryVo, ry);
+        ry.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        deleteRelevanceData(ry.getId());
+        saveRelevanceData(ry, ryVo, ry.getId());
+        return tbYjxxRyMapper.updateById(ry);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        if (list.size() > 0) {
+            for (String id : list) {
+                deleteRelevanceData(id);
+            }
+        }
+        return tbYjxxRyMapper.deleteByIds(list);
+    }
+
+    @Override
+    public TbYjxxRyVo queryById(String id) {
+        TbYjxxRyVo ryVo = new TbYjxxRyVo();
+        TbYjxxRy ry = tbYjxxRyMapper.selectById(id);
+        BeanUtils.copyProperties(ry, ryVo);
+        List<TbYjxxRyBq> bqList = tbYjxxRyBqMapper.queryByYjryId(Arrays.asList(id));
+        List<TbYjxxRySjaj> sjajList = tbYjxxRySjajMapper.queryByYjryId(Arrays.asList((id)));
+        ryVo.setRybqList(bqList);
+        ryVo.setSjajList(sjajList);
+        return ryVo;
+    }
+
+    /**
+     * 获取查询条件
+     *
+     * @param yjry
+     * @return
+     */
+    public QueryWrapper<TbYjxxRy> getQueryWrapper(TbYjxxRyQuery yjry) {
+        QueryWrapper<TbYjxxRy> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        yjry.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(yjry.getSsbmdm(), null));
+        queryWrapper.lambda()
+                .eq(TbYjxxRy::getXtScbz, "0")
+                .eq(StringUtils.isNotBlank(yjry.getYjId()), TbYjxxRy::getYjId, yjry.getYjId())
+                .like(StringUtils.isNotBlank(yjry.getYjClid()), TbYjxxRy::getYjClid, yjry.getYjClid())
+                .likeRight(StringUtils.isNotBlank(yjry.getSsbmdm()), TbYjxxRy::getSsbmdm, yjry.getSsbmdm())
+                .eq(StringUtils.isNotBlank(yjry.getSjId()), TbYjxxRy::getSjId, yjry.getSjId())
+                .eq(StringUtils.isNotBlank(yjry.getYjSjly()), TbYjxxRy::getYjSjly, yjry.getYjSjly())
+                .like(StringUtils.isNotBlank(yjry.getYjGzyid()), TbYjxxRy::getYjGzyid, yjry.getYjGzyid())
+                .like(StringUtils.isNotBlank(yjry.getYjJb()), TbYjxxRy::getYjJb, yjry.getYjJb());
+        return queryWrapper;
+    }
+
+    /**
+     * 预警人员数据完善
+     *
+     * @param records
+     * @return
+     */
+    public List<TbYjxxRyVo> dataPerfact(List<TbYjxxRy> records) {
+        List<TbYjxxRyVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> ids = records.stream().map(TbYjxxRy::getId).collect(Collectors.toList());
+            List<TbYjxxRyBq> bqList = tbYjxxRyBqMapper.queryByYjryId(ids);
+            List<TbYjxxRySjaj> sjajList = tbYjxxRySjajMapper.queryByYjryId(ids);
+            for (TbYjxxRy record : records) {
+                TbYjxxRyVo vo = new TbYjxxRyVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbYjxxRyBq> bq =
+                        bqList.stream().filter(item -> item.getYjryId().equals(record.getId())).collect(Collectors.toList());
+                List<TbYjxxRySjaj> sjaj =
+                        sjajList.stream().filter(item -> item.getYjryId().equals(record.getId())).collect(Collectors.toList());
+                vo.setRybqList(bq);
+                vo.setSjajList(sjaj);
+                vos.add(vo);
+            }
+        }
+        return vos;
+    }
+
+    /**
+     * 保存关联数据
+     *
+     * @param vo
+     * @param ywid
+     */
+    public void saveRelevanceData(TbYjxxRy ry, TbYjxxRyVo vo, String ywid) {
+        if (vo != null) {
+            List<TbYjxxRyBq> bqList = vo.getRybqList();
+            List<TbYjxxRySjaj> sjajList = vo.getSjajList();
+            if (!CollectionUtils.isEmpty(bqList)) {
+                for (TbYjxxRyBq bq : bqList) {
+                    bq.setId(UUIDGenerator.getUUID());
+                    bq.setYjryId(ywid);
+                    bq.setXtSjzt("1");
+                    bq.setXtSjly("1");
+                    bq.setXtScbz("0");
+                    tbYjxxRyBqMapper.insert(bq);
+                }
+            }
+            if (!CollectionUtils.isEmpty(sjajList)) {
+                for (TbYjxxRySjaj sjaj : sjajList) {
+                    sjaj.setId(UUIDGenerator.getUUID());
+                    sjaj.setYjryId(ywid);
+                    sjaj.setXtSjzt("1");
+                    sjaj.setXtSjly("1");
+                    sjaj.setXtScbz("0");
+                    tbYjxxRySjajMapper.insert(sjaj);
+                }
+            }
+        }
+    }
+
+    /**
+     * 删除关联数据
+     *
+     * @param id
+     */
+    public void deleteRelevanceData(String id) {
+        tbYjxxRyBqMapper.deleteByYwid(id);
+        tbYjxxRySjajMapper.deleteByYwid(id);
+    }
+
+    /**
+     * 部门赋值
+     *
+     * @param zfpb
+     */
+    public void perfectDept(TbYjxxRy zfpb) {
+        zfpb.setXtSjly("1");
+        zfpb.setXtSjzt("1");
+        zfpb.setXtScbz("0");
+        UserInfo user = UserInfoManager.get();
+        zfpb.setSsbm(user.getDeptName());
+        zfpb.setSsbmid(String.valueOf(user.getDeptId()));
+        zfpb.setSsbmdm(user.getDeptCode());
+        zfpb.setSsxgaj(user.getFxjDeptName());
+        zfpb.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        zfpb.setSsxgajdm(user.getFxjDeptCode());
+        zfpb.setSssgaj(user.getDszDeptName());
+        zfpb.setSssgajid(String.valueOf(user.getDszDeptId()));
+        zfpb.setSssgajdm(user.getDszDeptCode());
+    }
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxServiceImpl.java
new file mode 100644
index 0000000..204bb4e
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxServiceImpl.java
@@ -0,0 +1,1040 @@
+package com.mosty.yjzl.service.Impl;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.entity.yjzl.*;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.yjzl.*;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.IDCardUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.yjzl.mapper.*;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.remote.TbQwzxAdaptRemoteService;
+import com.mosty.yjzl.remote.TbYszxAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjxxService;
+import com.mosty.yjzl.service.TbZlxxService;
+import com.mosty.yjzl.utils.OkHttpUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author dw
+ * @since 2022-10-21
+ */
+@Service
+@AllArgsConstructor
+public class TbYjxxServiceImpl extends ServiceImpl<TbYjxxMapper, TbYjxx> implements TbYjxxService {
+
+    private final TbYjxxClMapper tbYjxxClMapper;
+    private final TbYjxxClBqMapper tbYjxxClBqMapper;
+    private final TbYjxxRyMapper tbYjxxRyMapper;
+    private final TbYjxxRyBqMapper tbYjxxRyBqMapper;
+    private final TbYszxAdaptRemoteService tbYszxAdaptRemoteService;
+    private final TbZlxxService tbZlxxService;
+    private final TbZlxxMapper tbZlxxMapper;
+    private final TbYjxxMapper tbYjxxMapper;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjxx> getPageList(TbYjxxQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        List<String> yjlxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getYjLx())) {
+            yjlxList = Arrays.asList(dto.getYjLx().split(","));
+        }
+        //预警来源
+        List<String> yjlyList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getYjlyids())) {
+            yjlyList = Arrays.asList(dto.getYjlyids().split(","));
+        }
+
+
+        map.put("dto", dto);
+        map.put("yjlxList", yjlxList);
+        map.put("yjlyList", yjlyList);
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        IPage<TbYjxx> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        int count = this.baseMapper.getCount(map);
+        List<TbYjxx> list = this.baseMapper.getListPage(map);
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<TbYjxx> getList(TbYjxxNoPageQuery dto) {
+        if (com.mosty.common.base.util.StringUtils.isNotBlank(dto.getStartTime()) && dto.getStartTime().length() < 19) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (com.mosty.common.base.util.StringUtils.isNotBlank(dto.getEndTime()) && dto.getEndTime().length() < 19) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+
+
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        List<String> yjlxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getYjLx())) {
+            yjlxList = Arrays.asList(dto.getYjLx().split(","));
+        }
+        map.put("yjlxList", yjlxList);
+        List<TbYjxx> list = this.baseMapper.getList(map);
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> getListHotMapEs(TbYjxxNoPageQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        List<Map<String, Object>> rList = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        List<TbYjxx> list = this.baseMapper.getList(map);
+        if (!CollectionUtils.isEmpty(list)) {
+            list.forEach(item -> {
+                Map<String, Object> mp = new HashMap<>();
+                mp.put("lng", item.getJd());
+                mp.put("lat", item.getWd());
+                mp.put("count", 1);
+                rList.add(mp);
+            });
+        }
+        return rList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getListHotMap(TbYjxxNoPageQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        UserInfo user = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", user);
+//        map.put("useSql", useSql);
+        List<TbYjxx> list = this.baseMapper.getList(map);
+        List<Map<String, Object>> rList = new ArrayList<>();
+        list.forEach(item -> {
+            Map<String, Object> mp = new HashMap<>();
+            mp.put("lng", item.getJd());
+            mp.put("lat", item.getWd());
+            mp.put("count", 1);
+            rList.add(mp);
+        });
+        return rList;
+    }
+
+    @Override
+    public TbYjxx getInfo(String id) {
+        return this.baseMapper.getInfoById(id);
+    }
+
+    @Override
+    public int insert(TbYjxx yjxx) {
+        UserInfo user = UserInfoManager.get();
+        if (user != null) {
+            yjxx.setSsbm(user.getDeptName());
+            yjxx.setSsbmid(String.valueOf(user.getDeptId()));
+            yjxx.setSsbmdm(user.getDeptCode());
+            yjxx.setSsxgaj(user.getFxjDeptName());
+            yjxx.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            yjxx.setSsxgajdm(user.getFxjDeptCode());
+            yjxx.setSssgaj(user.getDszDeptName());
+            yjxx.setSssgajid(String.valueOf(user.getDszDeptId()));
+            yjxx.setSssgajdm(user.getDszDeptCode());
+        }
+        return this.baseMapper.insert(yjxx);
+    }
+
+    @Override
+    public TbYjxx queryYjxx(TbYjxx yjxx) {
+        try {
+            QueryWrapper<TbYjxx> qw = new QueryWrapper<>();
+//            UserInfo user = UserInfoManager.get();
+//
+//            PermissionsUtil.queryWrapperUtil(qw, user);
+
+            yjxx.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(yjxx.getSsbmdm(), null));
+
+            List<TbYjxx> list = baseMapper.selectList(
+                    qw.lambda()
+                            .eq(StringUtils.isNotBlank(yjxx.getYjGzyid()), TbYjxx::getYjGzyid, yjxx.getYjGzyid())
+                            .likeRight(StringUtils.isNotBlank(yjxx.getSsbmdm()), TbYjxx::getSsbmdm, yjxx.getSsbmdm())
+                            .eq(yjxx.getYjSj() != null, TbYjxx::getYjSj, yjxx.getYjSj())
+                            .eq(TbYjxx::getXtScbz, "0")
+            );
+            if (list != null && list.size() > 0) {
+                return list.get(0);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public List<TbYjxxDTO> selectYjByNr(String yjNr) {
+        TbYjxxNoPageQuery dto = new TbYjxxNoPageQuery();
+        dto.setYjNr(yjNr);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        UserInfo user = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", user);
+//        map.put("useSql", useSql);
+        List<TbYjxx> list = this.baseMapper.getList(map);
+        List<TbYjxxDTO> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbYjxxDTO dto1 = new TbYjxxDTO();
+            BeanUtils.copyProperties(item, dto1);
+            rList.add(dto1);
+        });
+        return rList;
+    }
+
+    @Override
+    public IPage<TbYjxx> selectTrack(TbYjxxYjgjQuery dto) {
+        IPage<TbYjxx> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        QueryWrapper<TbYjxx> qw = new QueryWrapper();
+        return this.baseMapper.selectPage(
+                page,
+                qw.eq(StringUtils.isNotBlank(dto.getYjRysfzh()), "yj_rysfzh", dto.getYjRysfzh())
+//                        .eq(StringUtils.isNotBlank(dto.getYjClcph()), "yj_clcph", dto.getYjClcph())
+//                            .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), "ssbmdm", dto.getSsbmdm())
+//                        .eq(StringUtils.isNotBlank(dto.getYjHplx()), "yj_hplx", dto.getYjHplx())
+                        .orderByDesc("yj_sj")
+        );
+
+
+    }
+
+    // 解析kafka推送的预警消息
+    @Override
+    @Transactional
+    public void setYjxxByKafka(String message) {
+        JSONObject json = JSONObject.parseObject(message);
+        if (json.containsKey("type")) {
+            if ("0".equals(json.getString("type"))) {// 预警人员
+                parseYjry(json);
+            } else if ("1".equals(json.getString("type"))) {// 预警车辆
+                parseYjcl(json);
+            }
+        }
+    }
+
+    @Override
+    public IPage<TbYjxx> getYjgj(VwSyrkJzgjGxListQuery dto) {
+        String tempSfz = StringUtils.isNotBlank(dto.getZjhm()) ? (dto.getZjhm().substring(0, 6) + "********"
+                + dto.getZjhm().substring(16)) : null;
+        QueryWrapper<TbYjxx> qw = new QueryWrapper<>();
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        IPage<TbYjxx> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjxx::getSsbmdm, dto.getSsbmdm())
+                        .and((StringUtils.isNotBlank(tempSfz) && StringUtils.isNotBlank(dto.getZjhm())
+                                        || StringUtils.isNotBlank(dto.getCph())),
+                                it -> it.eq(TbYjxx::getYjRysfzh, dto.getZjhm()).or()
+                                        .eq(TbYjxx::getYjRysfzh, tempSfz).or()
+                                        .eq(TbYjxx::getYjClcph, dto.getCph())
+                        )
+                        .last(StringUtils.isNotBlank(dto.getKssj()) && StringUtils.isNotBlank(dto.getJssj()),
+                                " and date_format(yj_fsrq,'%Y-%m-%d') between '" + dto.getKssj() + "' and '" + dto.getJssj() + "' order by yj_fssj desc"
+                        )
+                        .orderByDesc(StringUtils.isBlank(dto.getKssj()) && StringUtils.isNotBlank(dto.getJssj()), TbYjxx::getYjFssj)
+        );
+//        if (!CollectionUtils.isEmpty(page.getRecords())) {
+//            page.getRecords().forEach(item -> {
+//                item.setZb(null);
+//            });
+//        }
+        return page;
+    }
+
+    @Override
+    public List<Map<String, Object>> getYjxxTj(TbYjxxYjjbStatisticsQuery dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+//        UserInfo user = UserInfoManager.get();
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        map.put("dto", dto);
+        return this.baseMapper.getYjxxTj(map);
+    }
+
+    @Override
+    public Map<String, Object> getStatistics(TbYjxxStatisticsQuery dto) {
+        String tempSfz = StringUtils.isNotBlank(dto.getYjRysfzh()) ? (dto.getYjRysfzh().substring(0, 6) +
+                "********" + dto.getYjRysfzh().substring(16)) : null;
+        Map<String, Object> map = new HashMap<>();
+        String jssj = DateUtils.getQueryDateString(new Date(), "01");
+        String kssj = DateUtils.getQueryDateString(new Date(), "01");
+//        UserInfo user = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        QueryWrapper<TbYjxx> qw = new QueryWrapper<>();
+        map.put("today", this.baseMapper.selectCount(
+                qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjxx::getSsbmdm, dto.getSsbmdm())
+
+                        .and((StringUtils.isNotBlank(tempSfz) && StringUtils.isNotBlank(dto.getYjRysfzh())
+                                        || StringUtils.isNotBlank(dto.getYjClcph())),
+                                it -> it.eq(TbYjxx::getYjRysfzh, dto.getYjRysfzh()).or()
+                                        .eq(TbYjxx::getYjRysfzh, tempSfz).or()
+                                        .eq(StringUtils.isNotBlank(dto.getYjClcph()), TbYjxx::getYjClcph, dto.getYjClcph())
+                        )
+                        .last(" and date_format(yj_fsrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+        ));
+        kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+        qw = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        map.put("data7", this.baseMapper.selectCount(
+                qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjxx::getSsbmdm, dto.getSsbmdm())
+                        .and((StringUtils.isNotBlank(tempSfz) && StringUtils.isNotBlank(dto.getYjRysfzh())
+                                        || StringUtils.isNotBlank(dto.getYjClcph())),
+                                it -> it.eq(TbYjxx::getYjRysfzh, dto.getYjRysfzh()).or()
+                                        .eq(TbYjxx::getYjRysfzh, tempSfz).or()
+                                        .eq(StringUtils.isNotBlank(dto.getYjClcph()), TbYjxx::getYjClcph, dto.getYjClcph())
+                        )
+                        .last(" and date_format(yj_fsrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+        ));
+        kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "M", -1), "01");
+        qw = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        map.put("data30", this.baseMapper.selectCount(
+                qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjxx::getSsbmdm, dto.getSsbmdm())
+                        .and((StringUtils.isNotBlank(tempSfz) && StringUtils.isNotBlank(dto.getYjRysfzh())
+                                        || StringUtils.isNotBlank(dto.getYjClcph())),
+                                it -> it.eq(TbYjxx::getYjRysfzh, dto.getYjRysfzh()).or()
+                                        .eq(TbYjxx::getYjRysfzh, tempSfz).or()
+                                        .eq(StringUtils.isNotBlank(dto.getYjClcph()), TbYjxx::getYjClcph, dto.getYjClcph())
+                        )
+                        .last(" and date_format(yj_fsrq,'%Y-%m-%d') between '" + kssj + "' and '" + jssj + "'")
+        ));
+        qw = new QueryWrapper<>();
+//        PermissionsUtil.queryWrapperUtil(qw, user);
+        map.put("all", this.baseMapper.selectCount(
+                qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                        .likeRight(StringUtils.isNotBlank(dto.getSsbmdm()), TbYjxx::getSsbmdm, dto.getSsbmdm())
+                        .and((StringUtils.isNotBlank(tempSfz) && StringUtils.isNotBlank(dto.getYjRysfzh())
+                                        || StringUtils.isNotBlank(dto.getYjClcph())),
+                                it -> it.eq(TbYjxx::getYjRysfzh, dto.getYjRysfzh()).or()
+                                        .eq(TbYjxx::getYjRysfzh, tempSfz).or()
+                                        .eq(StringUtils.isNotBlank(dto.getYjClcph()), TbYjxx::getYjClcph, dto.getYjClcph())
+                        )
+        ));
+        return map;
+    }
+
+    @Override
+    public List<Map<String, Object>> getYjxxTjYjlx(String kssj, String jssj) {
+        UserInfo user = UserInfoManager.get();
+
+        return this.baseMapper.getYjxxTjYjlx(kssj, jssj, this.tbBaseAdaptRemoteService.getSsbm(null, null));
+    }
+
+    @Override
+    public Object gsdyj(String type) {
+//        UserInfo user = UserInfoManager.get();
+//        String useSql = PermissionsUtil.createSql("", user);
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        List<String> timeList = new ArrayList<>();
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        if ("1".equals(type)) {
+            return this.baseMapper.todayGsdyj(null);
+        } else if ("2".equals(type)) {
+            for (int i = 0; i < 8; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i), "02"));
+            }
+        } else if ("3".equals(type)) {
+            for (int i = 0; i < 7; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 6), "02"));
+            }
+        } else if ("4".equals(type)) {
+            for (int i = 0; i < 8; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 9), "02"));
+            }
+        }
+        Collections.reverse(timeList);
+        for (int i = 0; i < timeList.size() - 1; i++) {
+            Map<String, Object> mp = new HashMap<>();
+            mp.put("h", DateUtils.getQueryDateString(DateUtils.strToDate(timeList.get(i), "02"), "18"));
+            mp.put("type", "1");
+            QueryWrapper<TbYjxx> qw = new QueryWrapper<>();
+//            PermissionsUtil.queryWrapperUtil(qw, user);
+            mp.put("total", this.baseMapper.selectCount(
+                    qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                            .in(TbYjxx::getYjLx, "1", "3", "4")
+                            .likeRight(StringUtils.isNotBlank(ssbm), TbYjxx::getSsbmdm, ssbm)
+                            .last(" and yj_fsrq between '" +
+                                    timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+            ));
+            dataList.add(mp);
+            mp = new HashMap<>();
+            mp.put("h", DateUtils.getQueryDateString(DateUtils.strToDate(timeList.get(i), "02"), "18"));
+            mp.put("type", "2");
+            qw = new QueryWrapper<>();
+//            PermissionsUtil.queryWrapperUtil(qw, user);
+            mp.put("total", this.baseMapper.selectCount(
+                    qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                            .in(TbYjxx::getYjLx, "2", "4")
+                            .likeRight(StringUtils.isNotBlank(ssbm), TbYjxx::getSsbmdm, ssbm)
+                            .last(" and yj_fsrq between '" +
+                                    timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+            ));
+            dataList.add(mp);
+            mp = new HashMap<>();
+            mp.put("h", DateUtils.getQueryDateString(DateUtils.strToDate(timeList.get(i), "02"), "18"));
+            mp.put("type", "3");
+            qw = new QueryWrapper<>();
+//            PermissionsUtil.queryWrapperUtil(qw, user);
+            mp.put("total", this.baseMapper.selectCount(
+                    qw.lambda().eq(TbYjxx::getXtSjzt, "1")
+                            .eq(TbYjxx::getYjLx, "5")
+                            .likeRight(StringUtils.isNotBlank(ssbm), TbYjxx::getSsbmdm, ssbm)
+                            .last(" and yj_fsrq between '" +
+                                    timeList.get(i) + "' and '" + timeList.get(i + 1) + "'")
+            ));
+            dataList.add(mp);
+        }
+        return dataList;
+    }
+
+    @Override
+    @Transactional
+    public void yjConvertZl(YjConvertZlDto dto) {
+        TbYjxx yjxx = this.tbYjxxMapper.selectById(dto.getYjid());
+        if (yjxx == null) {
+            throw new BusinessException("未查询到预警信息");
+        }
+        if ("1".equals(yjxx.getYjLx()) || "3".equals(yjxx.getYjLx()) ||
+                "4".equals(yjxx.getYjLx()) || "6".equals(yjxx.getYjLx())) {
+            this.convertZl(yjxx, "02", dto.getZxrList());
+        } else if ("5".equals(yjxx.getYjLx())) {
+            this.convertZl(yjxx, "04", dto.getZxrList());
+        } else if ("2".equals(yjxx.getYjLx())) {
+            this.convertZl(yjxx, "03", dto.getZxrList());
+        }
+        yjxx.setSfFszl("1");
+        yjxx.setBz("已手动转为指令");
+        this.tbYjxxMapper.updateById(yjxx);
+    }
+
+    @Override
+    public TbYjxx getLastYj(GetLastYjDto dto) {
+        TbYjxx yj = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYjxx>()
+                        .eq(StringUtils.isNotBlank(dto.getYjlyid()), TbYjxx::getYjlyid, dto.getYjlyid())
+                        .orderByDesc(TbYjxx::getYjSj)
+                        .last(" limit 1")
+        );
+//        if (yj != null) yj.setZb(null);
+        return yj;
+    }
+
+    @Override
+    public void updateYjxxSffszl(String id) {
+        TbYjxx yjxx = this.baseMapper.selectById(id);
+        if (yjxx != null && "0".equals(yjxx.getSfFszl())) {
+            yjxx.setSfFszl("0");
+            this.baseMapper.updateEntity(yjxx);
+        }
+    }
+
+    @Override
+    public List<TbYjxx> getYjxx30Day(TbYjxxQuery dto) {
+        return this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbYjxx>()
+                        .ge(StringUtils.isNotBlank(dto.getStartTime()), TbYjxx::getYjFsrq, dto.getStartTime())
+                        .le(StringUtils.isNotBlank(dto.getEndTime()), TbYjxx::getYjFsrq, dto.getEndTime())
+                        .last("  and jd is not null and wd is not null and yjbqmc is not null")
+        );
+    }
+
+
+    // 预警转指令
+    private void convertZl(TbYjxx yjxx, String zllx, List<TbZlxxZxrDtoInsertDto> zxrList) {
+        TbZlxxInsertDto zl = new TbZlxxInsertDto();
+        zl.setId(UUIDGenerator.getUUID()).setYwId(yjxx.getId()).setZllx(zllx).setZlly(zllx).setZlzxlx("1")
+                .setZlbt(yjxx.getYjBt()).setZlnr(yjxx.getYjNr())
+                .setZldj(yjxx.getYjJb()).setJd(yjxx.getJd()).setWd(yjxx.getWd()).setZlfsddxzqh(yjxx.getYjDzXzqh())
+                .setZlfsdd(yjxx.getYjDz()).setZltp(yjxx.getYjTp()).setSsbmid(yjxx.getSsbmid());
+        zl.setZxrDtoList(zxrList);
+        this.tbZlxxService.addZl(zl);
+    }
+
+    // 获取预警信息
+    public TbYjxx getClYjxx(JSONObject obj, String yjlx) {
+        JSONObject person = obj.getJSONObject("person");
+        TbYjxx oldYjxx = this.baseMapper.queryTbYjxx(obj.getString("warningId"));
+        if (oldYjxx != null) {
+            return null;
+        }
+        String srcIndex = obj.getString("srcIndex");
+        // String srcIndex = "51010944001320188550";
+        TbYjxx yjxx = new TbYjxx();
+        yjxx.setYjLx(yjlx);
+        //预警时间(预警推送时间)
+        String alertTime = obj.getString("date");
+        Date captureTime = DateUtils.strToDate(alertTime, "02");
+        //预警发生时间
+        String waringTime = obj.getString("warningStartTime");
+        Date yjfssj = DateUtils.strToDate(waringTime, "02");
+        String yjFsnf = waringTime.substring(0, 4);
+        String yjfsyf = waringTime.substring(5, 7);
+        String yjFsxs = waringTime.substring(11, 13);
+        String yjFsny = yjFsnf + yjfsyf;
+        Calendar ca = Calendar.getInstance();//创建一个日期实例
+        ca.setTime(yjfssj);//实例化一个日期
+        Integer yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+        yjxx.setId(UUIDGenerator.getUUID());
+        yjxx.setYjGzyid(srcIndex);
+        yjxx.setYjGzymc("");
+        TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.getInfoBySbbh(srcIndex);
+        if (sxt != null) {
+            yjxx.setYjGzyid(sxt.getSbbh());
+            yjxx.setYjGzymc(sxt.getSbmc());
+            yjxx.setYjDzXzqh(sxt.getXzqhdm());
+            yjxx.setSsbm(sxt.getSsbm());
+            yjxx.setSsbmid(sxt.getSsbmid());
+            yjxx.setSsbmdm(sxt.getSsbmdm());
+        }
+        yjxx.setYjFsnf(Integer.valueOf(yjFsnf));
+        yjxx.setYjFsyf(Integer.valueOf(yjfsyf));
+        yjxx.setYjFsny(Integer.valueOf(yjFsny));
+        yjxx.setYjFszs(yjfszs);
+        yjxx.setYjFsxs(Integer.valueOf(yjFsxs));
+        yjxx.setYjFsrq(yjfssj);
+        yjxx.setYjFssj(yjfssj);
+        yjxx.setYjSj(captureTime);
+        yjxx.setYjJb("40");
+        yjxx.setYjlyid(obj.getString("warningId"));
+        String yjbt = "车辆(" + obj.getString("carNumber") + ")预警";
+        String yjnr = "(" + obj.getString("carNumber") + ")于" + waringTime
+                + "在经过感知源《" + (StringUtils.isBlank(yjxx.getYjGzymc()) ? "未知感知源" : yjxx.getYjGzymc()) +
+                "》位置时发生预警！！";
+        yjxx.setYjBt(yjbt);
+        yjxx.setYjNr(yjnr);
+        if (StringUtils.isNotBlank(obj.getString("lng"))) {
+            yjxx.setJd(new BigDecimal(obj.getString("lng")));
+        }
+        if (StringUtils.isNotBlank(obj.getString("lat"))) {
+            yjxx.setWd(new BigDecimal(obj.getString("lat")));
+        }
+//        if (yjxx.getJd() != null && yjxx.getWd() != null) {
+//            // 计算hash值和经纬度坐标
+//            yjxx.setZb(JtsUtils.getPoint(yjxx.getJd(), yjxx.getWd()));
+//            yjxx.setZbhash(GeoHashKit.encode(yjxx.getJd(), yjxx.getWd()));
+//        }
+
+        yjxx.setYjClcph(obj.getString("carNumber"));
+        yjxx.setYjTp(obj.getString("img"));
+        yjxx.setYjXtp(obj.getString("compareImg"));
+        String yjjb = getYjjb(person.getString("levelName"));
+        yjxx.setYjJb(yjjb);
+        int yjcs = this.baseMapper.countBySfzhOrCph(null, yjxx.getYjClcph());
+        int yjjrcs = this.baseMapper.countCurrentBySfzhOrCph(null, yjxx.getYjClcph());
+        yjcs = yjcs + 1;
+        yjjrcs = yjjrcs + 1;
+        yjxx.setYjCs(yjcs);
+        yjxx.setYjJrcs(yjjrcs);
+        yjxx.setYjDzXzqh("511421");
+        yjxx.setSsxgaj("仁寿县公安局");
+        yjxx.setSsxgajid("7");
+        yjxx.setSsxgajdm("511421000000");
+        yjxx.setSssgaj("眉山市公安局");
+        yjxx.setSssgajdm("511400000000");
+        yjxx.setSssgajid("2");
+        yjxx.setXtSjly("1");
+        yjxx.setSfFszl("0");
+        return yjxx;
+    }
+
+    // 获取预警级别
+    public String getYjjb(String yjjb) {
+        if (StringUtils.isBlank(yjjb)) {
+            return "";
+        }
+        switch (yjjb) {
+            case "一级":
+            case "红":
+                return "10";
+            case "二级":
+            case "橙":
+                return "20";
+            case "三级":
+            case "黄":
+                return "30";
+            default:
+                return "40";
+        }
+    }
+
+    // 解析预警车辆
+    public void parseYjcl(JSONObject yjcl) {
+        TbYjxx yjxx = getClYjxx(yjcl, "2");
+        if (yjxx != null) {
+            getYjxxCl(yjxx, yjcl);
+            createZl(yjxx, "03");
+        }
+        this.baseMapper.insertEntity(yjxx);
+    }
+
+    // 获取车辆信息
+    public void getYjxxCl(TbYjxx yjxx, JSONObject obj) {
+        JSONObject person = obj.getJSONObject("person");
+        TbYjxxCl clxx = new TbYjxxCl();
+        clxx.setId(UUIDGenerator.getUUID());
+        clxx.setYjId(yjxx.getId());
+        clxx.setYjClbq(yjxx.getYjbq());
+        clxx.setYjFssj(yjxx.getYjFssj());
+        clxx.setYjSj(yjxx.getYjSj());
+        clxx.setYjJb(yjxx.getYjJb());
+        clxx.setYjBt(yjxx.getYjBt());
+        clxx.setYjNr(yjxx.getYjNr());
+        clxx.setYjClcph(yjxx.getYjClcph());
+        clxx.setClCxsj(yjxx.getYjFssj());
+        clxx.setYjGzyid(yjxx.getYjGzyid());
+        clxx.setYjDz(yjxx.getYjDz());
+        clxx.setTpId(yjxx.getYjXtp());
+        clxx.setYjDzXzqh(yjxx.getYjDzXzqh());
+        if (person != null) {
+            clxx.setYjCljdcsyrhm(person.getString("idcard"));
+            clxx.setYjCljdcsyr(person.getString("name"));
+        }
+        if (yjxx.getJd() != null) {
+            clxx.setJd(yjxx.getJd());
+        }
+        if (yjxx.getWd() != null) {
+            clxx.setWd(yjxx.getWd());
+        }
+//        if (clxx.getJd() != null && clxx.getWd() != null) {
+//            clxx.setZbhash(yjxx.getZbhash());
+//            clxx.setZb(yjxx.getZb());
+//        }
+        clxx.setSsbm(yjxx.getSsbm());
+        clxx.setSsbmid(yjxx.getSsbmid());
+        clxx.setSsbmdm(yjxx.getSsbmdm());
+        clxx.setSsxgaj(yjxx.getSsxgaj());
+        clxx.setSsxgajid(yjxx.getSsxgajid());
+        clxx.setSsxgajdm(yjxx.getSsxgajdm());
+        clxx.setSssgaj(yjxx.getSssgaj());
+        clxx.setSssgajid(yjxx.getSssgajid());
+        clxx.setSssgajdm(yjxx.getSssgajdm());
+        clxx.setXtSjly("1");
+        this.tbYjxxClMapper.insertEntity(clxx);
+        saveTbYjxxClBq(clxx, obj);
+    }
+
+    // 保存车辆预警标签
+    public void saveTbYjxxClBq(TbYjxxCl clxx, JSONObject obj) {
+        JSONArray array = obj.getJSONArray("waring_tag");
+        if (array != null) {
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject json = array.getJSONObject(i);
+                TbYjxxClBq clbq = new TbYjxxClBq();
+                clbq.setId(UUIDGenerator.getUUID());
+                clbq.setYjclId(clxx.getId());
+                String bq = json.getString("text");
+                clbq.setClbqdm(getYjclbqdm(bq));
+                clbq.setXtSjly("1");
+                this.tbYjxxClBqMapper.insert(clbq);
+            }
+        }
+    }
+
+    // 获取标签代码
+    public static String getYjclbqdm(String bqmc) {
+        if (bqmc.contains("临控")) {
+            return "1";
+        } else if (bqmc.contains("抢盗")) {
+            return "2";
+        } else if (bqmc.contains("套牌")) {
+            return "3";
+        } else if (bqmc.contains("假牌")) {
+            return "4";
+        }
+        return "";
+    }
+
+    // 解析预警人员
+    public void parseYjry(JSONObject yjry) {
+        TbYjxx yjxx = getYjxxRy(yjry, "1");
+        if (yjxx != null) {
+            saveYjxxRy(yjxx, yjry);
+            createZl(yjxx, "02");
+        }
+        this.baseMapper.insertEntity(yjxx);
+    }
+
+    // 创建指令
+    public void createZl(TbYjxx yjxx, String zllx) {
+        try {
+            // 查询500米范围内的最近的巡组信息
+            TbQwXfbbQueryByJlDto queryByJlDto = new TbQwXfbbQueryByJlDto();
+            queryByJlDto.setJd(yjxx.getJd());
+            queryByJlDto.setWd(yjxx.getWd());
+            queryByJlDto.setRadius(new BigDecimal("500"));
+            TbQwXfbb xfbb = this.tbQwzxAdaptRemoteService.getBbxxByJi(queryByJlDto);
+            TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.getInfoBySbbh(yjxx.getYjGzyid());
+            // 新增
+            TbZlxxInsertDto zl = new TbZlxxInsertDto();
+            zl.setId(UUIDGenerator.getUUID()).setYwId(yjxx.getId()).setZllx(zllx).setZlly(zllx).setZlzxlx("1")
+                    .setZlbt(yjxx.getYjBt() + "，请协助核查！！").setZlnr(yjxx.getYjNr() + "，请协助核查！！")
+                    .setZldj(yjxx.getYjJb()).setJd(yjxx.getJd()).setWd(yjxx.getWd()).setZlfsddxzqh(yjxx.getYjDzXzqh())
+                    .setZlfsdd(yjxx.getYjDz()).setZltp(yjxx.getYjTp());
+            if (xfbb != null) {
+                zl.setZljsdx("03");
+                zl.setSsbmid(xfbb.getSsbmid());
+                List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                zxr.setZlId(zl.getId()).setZxrLx("03").setZxrJllx(xfbb.getId()).setZxrXzid(xfbb.getId());
+                zxrDtoList.add(zxr);
+                yjxx.setBz("范围内500米查询到巡组《" + xfbb.getJzMc() + "》，已下发");
+                zl.setZxrDtoList(zxrDtoList);
+                this.tbZlxxService.addZl(zl);
+                yjxx.setSfFszl("1");
+            } else if (sxt != null && StringUtils.isNotBlank(sxt.getSsbmid())) {
+                zl.setZljsdx("02");
+                zl.setSsbmid(sxt.getSsbmid());
+                List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                zxr.setZlId(zl.getId()).setZxrLx("02").setSsbmid(sxt.getSsbmid());
+                zxrDtoList.add(zxr);
+                zl.setZxrDtoList(zxrDtoList);
+                this.tbZlxxService.addZl(zl);
+                yjxx.setSfFszl("1");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    // 保存预警人员信息
+    public void saveYjxxRy(TbYjxx yjxx, JSONObject obj) {
+        TbYjxxRy ryxx = new TbYjxxRy();
+        ryxx.setId(UUIDGenerator.getUUID());
+        ryxx.setYjId(yjxx.getId());
+        ryxx.setYjClid("");
+        ryxx.setYjGzyid(yjxx.getYjGzyid());
+        ryxx.setYjGzymc(yjxx.getYjGzymc());
+        ryxx.setYjFssj(yjxx.getYjFssj());
+        ryxx.setYjSj(yjxx.getYjSj());
+        ryxx.setYjJb(yjxx.getYjJb());
+        ryxx.setYjBt(yjxx.getYjBt());
+        ryxx.setYjNr(yjxx.getYjNr());
+        ryxx.setYjDzxzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjlyBqmc(yjxx.getYjlyBqmc());
+        ryxx.setYjZjlx("1");
+        ryxx.setYjZjhm(yjxx.getYjRysfzh());
+        ryxx.setYjRyxm(yjxx.getYjRyxm());
+        ryxx.setYjRyxb(IDCardUtil.getSex(yjxx.getYjRysfzh()));
+        ryxx.setYjRynl(IDCardUtil.getAge(yjxx.getYjRysfzh()));
+        ryxx.setYjRymz("");
+        ryxx.setYjRyjg(yjxx.getYjDzXzqh());
+        ryxx.setYjRyhjdXzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjRyhjd("");
+        String similarity = obj.getString("similarity");
+        if (StringUtils.isNotBlank(similarity)) {
+            ryxx.setYjXsd(new BigDecimal(similarity));
+        }
+        ryxx.setYjDz(yjxx.getYjDz());
+        ryxx.setJd(yjxx.getJd());
+        ryxx.setWd(yjxx.getWd());
+//        if (ryxx.getJd() != null && ryxx.getWd() != null) {
+//            ryxx.setZb(yjxx.getZb());
+//            ryxx.setZbhash(yjxx.getZbhash());
+//        }
+
+        ryxx.setCoverImage(obj.getString("img"));
+        ryxx.setYjRybq(yjxx.getYjbq());
+        ryxx.setYjRybqmc(yjxx.getYjbqmc());
+        ryxx.setSsbm(yjxx.getSsbm());
+        ryxx.setSsbmid(yjxx.getSsbmid());
+        ryxx.setSsbmdm(yjxx.getSsbmdm());
+        ryxx.setSsxgaj(yjxx.getSsxgaj());
+        ryxx.setSsxgajid(yjxx.getSsxgajid());
+        ryxx.setSsxgajdm(yjxx.getSsxgajdm());
+        ryxx.setSssgaj(yjxx.getSssgaj());
+        ryxx.setSssgajid(yjxx.getSssgajid());
+        ryxx.setSssgajdm(yjxx.getSssgajdm());
+        ryxx.setXtSjly("1");
+        this.tbYjxxRyMapper.insertEntity(ryxx);
+        saveTbYjxxRyBq(ryxx, obj);
+    }
+
+    // 保存预警人员标签
+    public void saveTbYjxxRyBq(TbYjxxRy ryxx, JSONObject obj) {
+        JSONObject person = obj.getJSONObject("person");
+        JSONArray tags = person.getJSONArray("tag");
+        if (tags != null && tags.size() > 0) {
+            for (int i = 0; i < tags.size(); i++) {
+                TbYjxxRyBq rybq = new TbYjxxRyBq();
+                rybq.setId(UUIDGenerator.getUUID());
+                rybq.setYjryId(ryxx.getId());
+                rybq.setRybqmc(tags.getJSONObject(i).getString("tagName"));
+                rybq.setRybqdm(this.getRybqdm(tags.getJSONObject(i).getString("tagName")));
+                rybq.setXtSjly("1");
+                this.tbYjxxRyBqMapper.insert(rybq);
+            }
+        }
+    }
+
+    private String getRybqdm(String tagName) {
+        String bqdm = "";
+        switch (tagName) {
+            case "涉毒":
+                bqdm = "3";
+                break;
+            case "涉稳人员":
+                bqdm = "8";
+                break;
+            case "重点上访":
+                bqdm = "7";
+                break;
+            case "精神病人":
+                bqdm = "5";
+                break;
+            case "重型罪前科":
+                bqdm = "4";
+                break;
+            case "在逃":
+                bqdm = "2";
+                break;
+            case "涉恐":
+                bqdm = "6";
+                break;
+            default:
+                bqdm = "9";
+                break;
+        }
+        return bqdm;
+    }
+
+    // 获取人员标签名称
+    public String getRybqmc(JSONArray array) {
+        StringBuilder clbq = new StringBuilder();
+        if (array != null && array.size() > 0) {
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject json = array.getJSONObject(i);
+                String bq = json.getString("tagName");
+                clbq.append(bq).append(",");
+            }
+        }
+        if (clbq.length() > 0) {
+            clbq = new StringBuilder(clbq.substring(0, clbq.length() - 1));
+        }
+        return clbq.toString();
+    }
+
+    // 获取人员标签名称
+    public String getRybq(JSONArray array) {
+        StringBuilder bq = new StringBuilder();
+        if (array != null && array.size() > 0) {
+            for (int i = 0; i < array.size(); i++) {
+                JSONObject json = array.getJSONObject(i);
+                String bqmc = json.getString("tagName");
+                switch (bqmc) {
+                    case "涉毒":
+                        bq.append("3,");
+                        break;
+                    case "涉稳人员":
+                        bq.append("8,");
+                        break;
+                    case "重点上访":
+                        bq.append("7,");
+                        break;
+                    case "精神病人":
+                        bq.append("5,");
+                        break;
+                    case "重型罪前科":
+                        bq.append("4,");
+                        break;
+                    case "在逃":
+                        bq.append("2,");
+                        break;
+                    case "涉恐":
+                        bq.append("6,");
+                        break;
+                    default:
+                        bq.append("9,");
+                }
+            }
+        }
+        if (bq.length() > 0) {
+            bq = new StringBuilder(bq.substring(0, bq.length() - 1));
+        }
+        return bq.toString();
+    }
+
+
+    // 获取人员预警信息
+    public TbYjxx getYjxxRy(JSONObject obj, String yjlx) {
+        JSONObject person = obj.getJSONObject("person");
+        TbYjxx oldYjxx = this.baseMapper.queryTbYjxx(obj.getString("warningId"));
+        if (oldYjxx != null) {
+            return null;
+        }
+        JSONArray tags = person.getJSONArray("tag");
+        String yjbqmc = getRybqmc(tags);
+        String yjbq = getRybq(tags);
+        String srcIndex = obj.getString("srcIndex");
+        // String srcIndex = "51010944001320188550";
+        TbYjxx yjxx = new TbYjxx();
+        yjxx.setYjLx(yjlx);
+        yjxx.setYjLylx("01");
+        //预警时间(预警推送时间)
+        String alertTime = dateConvert(obj.getString("date"));
+        Date captureTime = DateUtils.strToDate(alertTime, "02");
+        // 预警发生时间
+        String waringTime = dateConvert(obj.getString("warningStartTime"));
+        if (StringUtils.isNotBlank(waringTime)) {
+            Date yjfssj = DateUtils.strToDate(waringTime, "02");
+            String yjFsnf = waringTime.substring(0, 4);
+            String yjfsyf = waringTime.substring(5, 7);
+            String yjFsxs = waringTime.substring(11, 13);
+            String yjFsny = yjFsnf + yjfsyf;
+            Calendar ca = Calendar.getInstance();//创建一个日期实例
+            ca.setTime(yjfssj);//实例化一个日期
+            int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+            yjxx.setYjFsnf(Integer.valueOf(yjFsnf));
+            yjxx.setYjFsyf(Integer.valueOf(yjfsyf));
+            yjxx.setYjFsny(Integer.valueOf(yjFsny));
+            yjxx.setYjFszs(yjfszs);
+            yjxx.setYjFsxs(Integer.valueOf(yjFsxs));
+            yjxx.setYjFsrq(yjfssj);
+            yjxx.setYjFssj(yjfssj);
+        }
+        yjxx.setId(UUIDGenerator.getUUID());
+        yjxx.setYjGzyid(srcIndex);
+        yjxx.setYjGzymc("");
+        TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.getInfoBySbbh(srcIndex);
+        if (sxt != null) {
+            yjxx.setYjGzyid(sxt.getSbbh());
+            yjxx.setYjGzymc(sxt.getSbmc());
+            yjxx.setYjDzXzqh(sxt.getXzqhdm());
+            yjxx.setSsbm(sxt.getSsbm());
+            yjxx.setSsbmdm(sxt.getSsbmdm());
+            yjxx.setSsbmid(sxt.getSsbmid());
+        }
+        yjxx.setYjSj(captureTime);
+        yjxx.setYjlyid(obj.getString("warningId"));
+        if (StringUtils.isNotBlank(person.getString("zdrybkdj"))) {
+            yjxx.setYjJb(person.getString("zdrybkdj") + "0");
+        }
+        String yjbt = yjbqmc + person.getString("name") + "(" + person.getString("idcard") + ")";
+        String yjnr = yjbqmc + person.getString("name") + "(" + person.getString("idcard") + ")于" + waringTime
+                + "在经过感知源《" + (StringUtils.isBlank(yjxx.getYjGzymc()) ? "未知感知源" : yjxx.getYjGzymc()) +
+                "》位置时发生预警！！";
+        yjxx.setYjBt(yjbt);
+        yjxx.setYjNr(yjnr);
+        if (StringUtils.isNotBlank(obj.getString("lng"))) {
+            yjxx.setJd(new BigDecimal(obj.getString("lng")));
+        }
+        if (StringUtils.isNotBlank(obj.getString("lat"))) {
+            yjxx.setWd(new BigDecimal(obj.getString("lat")));
+        }
+        if (person.containsKey("address")) {
+            yjxx.setYjDz(person.getString("address"));
+        }
+        yjxx.setYjRyxm(person.getString("name"));
+        yjxx.setYjRysfzh(person.getString("idcard"));
+        yjxx.setYjbq(yjbq);
+        yjxx.setYjbqmc(yjbqmc);
+        yjxx.setYjlyBqmc("");
+        yjxx.setYjTp(obj.getString("img"));
+        yjxx.setYjXtp(obj.getString("compareImg"));
+        String yjjb = getYjjb(person.getString("levelName"));
+        yjxx.setYjJb(yjjb);
+        int yjcs = this.baseMapper.countBySfzhOrCph(yjxx.getYjRysfzh(), null);
+        int yjjrcs = this.baseMapper.countCurrentBySfzhOrCph(yjxx.getYjRysfzh(), null);
+        yjcs = yjcs + 1;
+        yjjrcs = yjjrcs + 1;
+        yjxx.setYjCs(yjcs);
+        yjxx.setYjJrcs(yjjrcs);
+        yjxx.setYjDzXzqh("511421");
+        yjxx.setSsxgaj("仁寿县公安局");
+        yjxx.setSsxgajid("7");
+        yjxx.setSsxgajdm("511421000000");
+        yjxx.setSssgaj("眉山市公安局");
+        yjxx.setSssgajdm("511400000000");
+        yjxx.setSssgajid("2");
+        yjxx.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+        yjxx.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        yjxx.setXtScbz("0");
+        yjxx.setXtSjzt("1");
+        yjxx.setXtSjly("1");
+        yjxx.setSfFszl("0");
+        // 添加人员预警信息
+        return yjxx;
+    }
+
+    // 日期格式化
+    public String dateConvert(String dates) {
+        try {
+            if (dates.contains("T")) {
+                if (dates.contains(".")) {
+                    String[] strs = dates.split("\\.");
+                    String sq = strs[1];
+                    String[] times = sq.split("\\+");
+                    dates = strs[0] + "+" + times[1];
+                }
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+                Date date = sd.parse(dates);
+                return sdf.format(date);
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+        return dates;
+    }
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxSjServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxSjServiceImpl.java
new file mode 100644
index 0000000..af7a1cd
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjxxSjServiceImpl.java
@@ -0,0 +1,214 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.entity.yjzl.TbYjxxSj;
+import com.mosty.base.model.entity.yjzl.TbYjxxSjGlrycl;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.query.yjzl.TbYjxxSjQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxSjVo;
+import com.mosty.yjzl.mapper.TbYjxxMapper;
+import com.mosty.yjzl.mapper.TbYjxxSjGlryclMapper;
+import com.mosty.yjzl.mapper.TbYjxxSjMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.TbYjxxSjService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 预警信息-事件表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@AllArgsConstructor
+@Service
+public class TbYjxxSjServiceImpl extends ServiceImpl<TbYjxxSjMapper, TbYjxxSj>
+        implements TbYjxxSjService {
+
+    private final TbYjxxSjGlryclMapper tbYjxxSjGlryclMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYjxxSjVo> queryByPage(TbYjxxSjQuery yjxxSj) {
+        IPage<TbYjxxSjVo> voIPage = new Page<>(yjxxSj.getPageCurrent(), yjxxSj.getPageSize());
+        IPage<TbYjxxSj> pageQuery = new Page<>(yjxxSj.getPageCurrent(), yjxxSj.getPageSize());
+        QueryWrapper<TbYjxxSj> queryWrapper = getQueryWrapper(yjxxSj);
+        IPage<TbYjxxSj> page = this.baseMapper.selectPage(pageQuery, queryWrapper);
+        voIPage.setTotal(page.getTotal());
+        List<TbYjxxSj> records = page.getRecords();
+        List<TbYjxxSjVo> vos = dataPerfact(records);
+        voIPage.setRecords(vos);
+        return voIPage;
+    }
+
+    @Override
+    public List<TbYjxxSjVo> queryList(TbYjxxSjQuery tbYjxxSjQuery) {
+        QueryWrapper<TbYjxxSj> queryWrapper = getQueryWrapper(tbYjxxSjQuery);
+        List<TbYjxxSj> records = this.baseMapper.selectList(queryWrapper);
+        List<TbYjxxSjVo> vos = dataPerfact(records);
+        return vos;
+    }
+
+    @Override
+    public int insert(TbYjxxSjVo sjVo) {
+        TbYjxxSj sj = new TbYjxxSj();
+        BeanUtils.copyProperties(sjVo, sj);
+        sj.setId(UUIDGenerator.getUUID());
+        perfectDept(sj);
+        saveRelevanceData(sj, sjVo);
+        return this.baseMapper.insert(sj);
+    }
+
+    @Override
+    public int update(TbYjxxSjVo sjVo) {
+        TbYjxxSj sj = new TbYjxxSj();
+        BeanUtils.copyProperties(sjVo, sj);
+        sj.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        tbYjxxSjGlryclMapper.deleteByYjId(sj.getId());
+        saveRelevanceData(sj, sjVo);
+        return this.baseMapper.updateById(sj);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        return this.baseMapper.deleteByIds(list);
+    }
+
+    @Override
+    public TbYjxxSjVo queryById(String id) {
+        TbYjxxSjVo vo = new TbYjxxSjVo();
+        TbYjxxSj sj = this.baseMapper.selectById(id);
+        BeanUtils.copyProperties(sj, vo);
+        List<TbYjxxSjGlrycl> glryclList = tbYjxxSjGlryclMapper.queryByYjid(Arrays.asList(id));
+        vo.setGlryclList(glryclList);
+        return vo;
+    }
+
+    @Override
+    public void addEntity(TbYjxx yjxx, String sjFl, String sjFlmc) {
+        TbYjxxSj sj = new TbYjxxSj();
+        BeanUtils.copyProperties(yjxx, sj);
+        sj.setId(UUIDGenerator.getUUID());
+        sj.setYjId(yjxx.getId());
+        sj.setSjFl(sjFl);
+        sj.setXtSjly("1");
+        sj.setSjFlmc(sjFlmc);
+        this.baseMapper.insertEntity(sj);
+    }
+
+    /**
+     * 获取查询条件
+     *
+     * @param yjsj
+     * @return
+     */
+    public QueryWrapper<TbYjxxSj> getQueryWrapper(TbYjxxSjQuery yjsj) {
+        QueryWrapper<TbYjxxSj> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        queryWrapper.lambda().eq(TbYjxxSj::getXtScbz, "0")
+        .eq(StringUtils.isNotBlank(yjsj.getYjId()), TbYjxxSj::getYjId, yjsj.getYjId())
+        .like(StringUtils.isNotBlank(yjsj.getYjGzyid()), TbYjxxSj::getYjGzyid, yjsj.getYjGzyid())
+        .likeRight(StringUtils.isNotBlank(ssbm), TbYjxxSj::getSsbmdm, ssbm)
+        .eq(StringUtils.isNotBlank(yjsj.getSjFl()), TbYjxxSj::getSjFl, yjsj.getSjFl())
+        .eq(StringUtils.isNotBlank(yjsj.getYjJb()), TbYjxxSj::getYjJb, yjsj.getYjJb());
+//        if (yjsj.getYjsksj() != null && yjsj.getYjsksj() == null) {
+//            queryWrapper.lambda().ge(TbYjxxSj::getYjSj, yjsj.getYjsksj());
+//        }
+//        if (yjsj.getYjsksj() == null && yjsj.getYjsksj() != null) {
+//            queryWrapper.lambda().le(TbYjxxSj::getYjSj, yjsj.getYjsksj());
+//        }
+        if (yjsj.getYjsksj() != null && yjsj.getYjsksj() != null) {
+            queryWrapper.lambda().between(TbYjxxSj::getYjSj, yjsj.getYjsksj(), yjsj.getYjsksj());
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * 预警人员数据完善
+     *
+     * @param records
+     * @return
+     */
+    public List<TbYjxxSjVo> dataPerfact(List<TbYjxxSj> records) {
+        List<TbYjxxSjVo> vos = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> ids = records.stream().map(TbYjxxSj::getId).collect(Collectors.toList());
+            List<TbYjxxSjGlrycl> bqList = tbYjxxSjGlryclMapper.queryByYjid(ids);
+            for (TbYjxxSj record : records) {
+                TbYjxxSjVo vo = new TbYjxxSjVo();
+                BeanUtils.copyProperties(record, vo);
+                List<TbYjxxSjGlrycl> yjczjl =
+                        bqList.stream().filter(item -> item.getYjId().equals(record.getId())).collect(Collectors.toList());
+                vo.setGlryclList(yjczjl);
+                vos.add(vo);
+            }
+        }
+        return vos;
+    }
+
+    /**
+     * 部门赋值
+     *
+     * @param zfpb
+     */
+    public void perfectDept(TbYjxxSj zfpb) {
+        zfpb.setXtSjly("1");
+        zfpb.setXtSjzt("1");
+        zfpb.setXtScbz("0");
+        UserInfo user = UserInfoManager.get();
+        zfpb.setSsbm(user.getDeptName());
+        zfpb.setSsbmid(String.valueOf(user.getDeptId()));
+        zfpb.setSsbmdm(user.getDeptCode());
+        zfpb.setSsxgaj(user.getFxjDeptName());
+        zfpb.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        zfpb.setSsxgajdm(user.getFxjDeptCode());
+        zfpb.setSssgaj(user.getDszDeptName());
+        zfpb.setSssgajid(String.valueOf(user.getDszDeptId()));
+        zfpb.setSssgajdm(user.getDszDeptCode());
+    }
+
+    /**
+     * 保存关联数据
+     *
+     * @param ry
+     * @param vo
+     */
+    public void saveRelevanceData(TbYjxxSj ry, TbYjxxSjVo vo) {
+        if (vo != null) {
+            List<TbYjxxSjGlrycl> sjList = vo.getGlryclList();
+            if (!CollectionUtils.isEmpty(sjList)) {
+                for (TbYjxxSjGlrycl sj : sjList) {
+                    sj.setId(UUIDGenerator.getUUID());
+                    sj.setYjId(ry.getYjId());
+                    sj.setYjryclId(ry.getId());
+                    sj.setXtSjzt("1");
+                    sj.setXtSjly("1");
+                    sj.setXtScbz("0");
+                    tbYjxxSjGlryclMapper.insert(sj);
+                }
+            }
+        }
+    }
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjzltjServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjzltjServiceImpl.java
new file mode 100644
index 0000000..19aef57
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbYjzltjServiceImpl.java
@@ -0,0 +1,168 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.mosty.base.model.vo.yjzl.TbYjzlZqtjVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjphVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjxxVo;
+import com.mosty.base.model.vo.yjzl.TbYzzlDjtjVo;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.yjzl.mapper.TbYjzltjMapper;
+import com.mosty.yjzl.mapper.TbZlxxMapper;
+import com.mosty.yjzl.service.TbYjxxSjService;
+import com.mosty.yjzl.service.TbYjzltjService;
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class TbYjzltjServiceImpl implements TbYjzltjService {
+
+    private TbYjzltjMapper tbYjzltjMapper;
+
+    @Override
+    public List<TbYjzltjxxVo> rwzttjxx() {
+        UserInfo user = UserInfoManager.get();
+        Map<String, Object> map = new HashMap<>();
+        map.put("sfz", user.getIdEntityCard());
+        map.put("ssbmid", String.valueOf(user.getDeptId()));
+        return tbYjzltjMapper.rwzttjxx(map);
+    }
+
+    @Override
+    public List<TbYjzltjphVo> rwphtjxx(String type) {
+        String kssj = "", jssj = "";
+        if ("1".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("3".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("4".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        }
+        return tbYjzltjMapper.rwphtjxx(kssj, jssj);
+    }
+
+    @Override
+    public Map<String, Object> zlZqtjxx(String type) {
+        Map<String, Object> map = new HashMap<>();
+        List<String> timeList = new ArrayList<>();
+        List<Map<String, Object>> resList;
+        if ("1".equals(type)) {
+            String t = DateUtils.getQueryDateString(new Date(), "01") + " ";
+            String m = ":00:00";
+            String s = ":59:59";
+            timeList.add(t + "23" + s);
+            timeList.add(t + "20" + m);
+            timeList.add(t + "16" + m);
+            timeList.add(t + "12" + m);
+            timeList.add(t + "08" + m);
+            timeList.add(t + "04" + m);
+            timeList.add(t + "00" + m);
+        } else if ("2".equals(type)) {
+            for (int i = 0; i < 7; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i), "01"));
+            }
+        } else if ("3".equals(type)) {
+            for (int i = 0; i < 7; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 6), "01"));
+            }
+        } else if ("4".equals(type)) {
+            for (int i = 0; i < 7; i++) {
+                timeList.add(DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -i * 9), "01"));
+            }
+        }
+        Integer[] data1 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data2 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data3 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data4 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data5 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data6 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data7 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Integer[] data8 = new Integer[]{0, 0, 0, 0, 0, 0, 0};
+        Collections.reverse(timeList);
+        for (int i = 0; i < timeList.size() - 1; i++) {
+            Map<String, Object> mp = new HashMap();
+            if ("1".equals(type)) {
+                mp.put("kssj", timeList.get(i));
+                mp.put("jssj", timeList.get(i + 1));
+            } else {
+                mp.put("start", timeList.get(i));
+                mp.put("end", timeList.get(i + 1));
+            }
+            resList = this.tbYjzltjMapper.zlZqtjxx(mp);
+            for (int j = 0; j < resList.size(); j++) {
+                Map<String, Object> item = resList.get(j);
+                String zllx = item.get("zllx").toString();
+                if ("01".equals(zllx)) {
+                    data1[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("02".equals(zllx)) {
+                    data2[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("03".equals(zllx)) {
+                    data3[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("04".equals(zllx)) {
+                    data4[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("05".equals(zllx)) {
+                    data5[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("06".equals(zllx)) {
+                    data6[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("07".equals(zllx)) {
+                    data7[j] = Integer.parseInt(item.get("count") + "");
+                } else if ("08".equals(zllx)) {
+                    data8[j] = Integer.parseInt(item.get("count") + "");
+                }
+            }
+        }
+        timeList = timeList.stream().map(item -> {
+            if ("1".equals(type)) {
+                return DateUtils.getQueryDateString(DateUtils.strToDate(item, "02"), "16");
+            } else {
+                return DateUtils.getQueryDateString(DateUtils.strToDate(item, "01"), "18");
+            }
+        }).collect(Collectors.toList());
+        map.put("time", timeList);
+        map.put("data1", data1);
+        map.put("data2", data2);
+        map.put("data3", data3);
+        map.put("data4", data4);
+        map.put("data5", data5);
+        map.put("data6", data6);
+        map.put("data7", data7);
+        map.put("data8", data8);
+        return map;
+    }
+
+    @Override
+    public List<TbYzzlDjtjVo> zlDjtjxx(String type) {
+        String kssj = "", jssj = "";
+        if ("1".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("3".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("4".equals(type)) {
+            kssj = com.mosty.base.utils.DateUtils.getQueryDateString(com.mosty.base.utils.DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = com.mosty.base.utils.DateUtils.getQueryDateString(new Date(), "01");
+        }
+        Map<String, Object> map = new HashMap();
+        map.put("kssj", kssj);
+        map.put("jssj", jssj);
+        return tbYjzltjMapper.zlDjtjxx(map);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxServiceImpl.java
new file mode 100644
index 0000000..1571f01
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxServiceImpl.java
@@ -0,0 +1,2774 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.qwzx.TbQwJlDto;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskUserDto;
+import com.mosty.base.model.dto.websocket
+        .WebSocketObject;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.hczx.TbHcBpcry;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.trs.VwAlermYjgl;
+import com.mosty.base.model.entity.trs.VwAlermYjzlUser;
+import com.mosty.base.model.entity.yjzl.*;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.vo.sjzx.TbJqVo;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import com.mosty.base.model.vo.yjzl.*;
+import com.mosty.base.utils.*;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysDept;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.util.http.HttpUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.yjzl.mapper.*;
+import com.mosty.yjzl.remote.*;
+import com.mosty.yjzl.service.TbZlxxService;
+import com.mosty.yjzl.utils.OkHttpUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+@Service
+@AllArgsConstructor
+public class TbZlxxServiceImpl extends ServiceImpl<TbZlxxMapper, TbZlxx>
+        implements TbZlxxService {
+
+    private final TbZlxxMapper tbZlxxMapper;
+    private final TbFzycMapper tbFzycMapper;
+    private final TbYjxxMapper tbYjxxMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbZlxxZxjlMapper tbZlxxZxjlMapper;
+    private final TbZlxxZxrMapper tbZlxxZxrMapper;
+    private final TbYszxAdaptRemoteService tbYszxAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbZlxxPcryclMapper tbZlxxPcryclMapper;
+    private final TbRwzxAdaptRemoteService tbRwzxAdaptRemoteService;
+    private final TbZlYjSjMapper tbZlYjSjMapper;
+    private final TbYjxxSjMapper tbYjxxSjMapper;
+    private final TbZlYjRyMapper tbZlYjRyMapper;
+    private final TbYjxxRyMapper tbYjxxRyMapper;
+    private final TbZlYjClMapper tbZlYjClMapper;
+    private final TbYjxxRyBqMapper tbYjxxRyBqMapper;
+    private final TbYjxxClMapper tbYjxxClMapper;
+    private final TbZlRgMapper tbZlRgMapper;
+    private final TbSjzxAdaptRemoteService tbSjzxAdaptRemoteService;
+    private final TbWebSocketAdaptRemoteService tbWebSocketAdaptRemoteService;
+    private final TbFzycXfxzMapper tbFzycXfxzMapper;
+
+
+    @Override
+    public Map<String, Object> selectInstructCount(String startTime, String endTime) {
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+
+        if (StringUtils.isEmpty(startTime)) {
+            startTime = DateUtils.getSystemDateString() + " 00:00:00";
+        }
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtils.getSystemDateTimeString();
+        }
+
+        return this.tbZlxxMapper.selectInstructCount(startTime, endTime, ssbm);
+    }
+
+
+    @Override
+    public IPage<TbZlxxVo> selectInstructList(TbZlxxQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+
+        if (StringUtils.isEmpty(dto.getEndTime())) {
+            dto.setEndTime(DateUtils.getSystemDateTimeString());
+        }
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        List<TbZlxx> list = tbZlxxMapper.getListPage(map);
+        int count = this.tbZlxxMapper.getCount(map);
+        IPage<TbZlxxVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        List<TbZlxxVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbZlxxVo zlxxVo = new TbZlxxVo();
+            BeanUtils.copyProperties(item, zlxxVo);
+            // 查询执行人
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, item.getId())
+            );
+            List<TbZlxxZxrVo> zxrDtoList = new ArrayList<>();
+            zxrList.forEach(zxr -> {
+                TbZlxxZxrVo zxrVo = new TbZlxxZxrVo();
+                BeanUtils.copyProperties(zxr, zxrVo);
+                zxrDtoList.add(zxrVo);
+            });
+            zlxxVo.setZxrVoList(zxrDtoList);
+            // 查询执行记录
+            List<TbZlxxZxjl> zxjlList = this.tbZlxxZxjlMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxjl>()
+                            .eq(TbZlxxZxjl::getZlId, item.getId())
+            );
+            List<TbZlxxZxjlVo> zxjlVoList = new ArrayList<>();
+            zxjlList.forEach(zxjl -> {
+                TbZlxxZxjlVo vo = new TbZlxxZxjlVo();
+                BeanUtils.copyProperties(zxjl, zxjlVoList);
+                zxjlVoList.add(vo);
+            });
+            zlxxVo.setZxjlVoList(zxjlVoList);
+            // 查询是否是预警信息生成的指令
+            if ("01".equals(item.getZlly())) {
+                TbYjxx yjxx = this.tbYjxxMapper.getInfoById(item.getYwId());
+                if (yjxx != null && StringUtils.isNotBlank(yjxx.getYjGzyid())) {
+                    TbYsSxtDto sxt = this.tbYszxAdaptRemoteService.getSxtInfoVo(yjxx.getYjGzyid());
+                    if (sxt != null) {
+                        zlxxVo.setSbbh(StringUtils.isNotBlank(sxt.getJkdbgbh()) ? sxt.getJkdbgbh() : sxt.getSbbh());
+                    }
+                }
+            }
+            rList.add(zlxxVo);
+        });
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public String addZl(TbZlxxInsertDto dto) {
+//        if (StringUtils.isNotBlank(dto.getSsbmid())) {
+//            DeptInfoVo deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+//            if (deptInfoVo == null || StringUtils.isBlank(deptInfoVo.getDeptid())) {
+//                deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmid());
+//            }
+//            if (deptInfoVo == null) {
+//                throw new BusinessException("所属部门不存在");
+//            }
+//            dto.setSsbmid(deptInfoVo.getDeptid());
+//        }
+        UserInfo user = UserInfoManager.getUser();
+        TbZlxx zl = new TbZlxx();
+        BeanUtils.copyProperties(dto, zl);
+        zl.setZlly(zl.getZllx());
+        if (StringUtils.isNotBlank(dto.getZlxflx()) && dto.getZlxflx().equals("2") && !zl.getZljsdx().equals("01")) {
+            throw new BusinessException("短信指令只能下发到人员!");
+        }
+
+
+//        if ("2".equals(zl.getZlzxlx()) && ("02".equals(zl.getZljsdx()) || ("03").equals(zl.getZljsdx()))) {
+//            throw new BusinessException("多人任务不允许发送给部门或巡组");
+//        }
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+            if (StringUtils.isBlank(zl.getZlfsdd())) {
+                JSONObject obj = this.tbBaseAdaptRemoteService.getAddress(String.valueOf(zl.getJd()), String.valueOf(zl.getWd()));
+                if (obj != null) {
+                    String address = obj.getString("address");
+                    zl.setZlfsdd(address);
+                }
+            }
+        }
+        if (user != null) {
+            zl.setZlfqrId(String.valueOf(user.getUserId()));
+            zl.setZlfqrSfzh(user.getIdEntityCard());
+            zl.setZlfqr(user.getUserName());
+        } else {
+            zl.setZlfqrId("-1");
+            zl.setZlfqrSfzh("000000");
+            zl.setZlfqr("系统");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(String.valueOf(dto.getSsbmid()));
+        if (StringUtils.isBlank(dept.getDeptid()) && user != null) {
+            dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(String.valueOf(user.getDeptId()));
+        }
+        if (dept != null && StringUtils.isNotEmpty(dept.getDeptid())) {
+            zl.setSsbmdm(dept.getDeptcode());
+            zl.setSsbm(dept.getDeptname());
+            zl.setSsbmid(dept.getDeptid());
+            zl.setSsxgaj(dept.getFxjname());
+            zl.setSsxgajdm(dept.getFxjcode());
+            zl.setSsxgajid(dept.getFxjid());
+            zl.setSssgaj(dept.getDszname());
+            zl.setSssgajdm(dept.getDszcode());
+            zl.setSssgajid(dept.getDszid());
+            zl.setZlfsddxzqh(StringUtils.isNotBlank(dept.getDeptcode()) ? dept.getDeptcode().substring(0, 6) : null);
+        } else {
+            zl.setSsbm("四川省德阳市公安局");
+            zl.setSsbmdm("510600000000");
+            zl.setSsbmid("44015");
+            zl.setSsxgaj("四川省德阳市公安局");
+            zl.setSsxgajid("44015");
+            zl.setSsxgajdm("510600000000");
+            zl.setSssgajid("44015");
+            zl.setSssgaj("四川省德阳市公安局");
+            zl.setSssgajdm("510600000000");
+        }
+        zl.setXtSjly("1");
+        zl.setId(UUIDGenerator.getUUID());
+        // 计算指令接收人数
+        // 签收有效时间
+        String qs = this.tbBaseAdaptRemoteService.getValue("ZLQSYXSJ");
+        int qsyxsj = qs == null ? 5 : Integer.parseInt(qs);
+        zl.setQsyxsj(DateUtils.getNextDate(new Date(), "m", qsyxsj));
+        // 到达有效时间
+        String dd = this.tbBaseAdaptRemoteService.getValue("ZLDDXCYXSJ");
+        int ddxcyxsj = dd == null ? 15 : Integer.parseInt(dd);
+        zl.setDdxcyxsj(DateUtils.getNextDate(new Date(), "m", ddxcyxsj));
+        // 完结有效时间
+        String wj = this.tbBaseAdaptRemoteService.getValue("ZLCZWJSJ");
+        int zlwjyxsj = wj == null ? 120 : Integer.parseInt(wj);
+        zl.setZlwjyxsj(DateUtils.getNextDate(new Date(), "m", zlwjyxsj));
+        this.totalZljsrs(dto, zl);
+        zl.setZlfqrq(new Date());
+        zl.setZlfqsj(new Date());
+        if (StringUtils.isBlank(zl.getZlzxlx())) {
+            zl.setZlzxlx("1");
+        }
+        zl.setQszt("01");
+        zl.setZlwjzt("91");
+        zl.setZlzxzt("01");
+        zl.setZlzxqk(DateUtils.getQueryDateString(new Date(), "02") + "," + zl.getZlfqr() + "下发了该指令！！");
+        this.baseMapper.insertEntity(zl);
+        // 添加指令执行人和指令执行记录
+        this.addZlxxZxr(zl, dto);
+        if ("04".equals(zl.getZllx())) {
+            this.addSjzl(zl);
+        } else if ("02".equals(zl.getZllx())) {
+            this.addRyZl(zl);
+        } else if ("03".equals(zl.getZllx())) {
+            this.addClZl(zl);
+        } else if ("06".equals(zl.getZllx())) {
+            this.addRgZl(zl, dto);
+        }
+        return zl.getId();
+    }
+
+    // 添加人工指令
+    private void addRgZl(TbZlxx zl, TbZlxxInsertDto dto) {
+        TbZlRg rgzl = new TbZlRg();
+        BeanUtils.copyProperties(zl, rgzl);
+        rgzl.setZllx(dto.getRgzlLx());
+        this.tbZlRgMapper.insertEntity(rgzl);
+    }
+
+    // 添加车辆指令子表
+    private void addClZl(TbZlxx zl) {
+        TbZlYjCl zlCl = new TbZlYjCl();
+        BeanUtils.copyProperties(zl, zlCl);
+        // 指令ID
+        zlCl.setZlId(zl.getId());
+        // 预警ID
+        zlCl.setYjId(zl.getYwId());
+        // 查询预警事件
+        TbYjxxCl cl = this.tbYjxxClMapper.selectOne(
+                new LambdaQueryWrapper<TbYjxxCl>()
+                        .eq(TbYjxxCl::getYjId, zl.getYwId())
+        );
+        // 查询预警信息
+        if (cl != null) {
+            zlCl.setYjclId(cl.getId());
+            zlCl.setYjClbq(cl.getYjClbq());
+            zlCl.setYjlyBqmc(cl.getYjlyBqmc());
+            zlCl.setYjClyjlx("2");
+            zlCl.setYjFssj(cl.getYjFssj());
+            zlCl.setYjSj(cl.getYjSj());
+            zlCl.setYjJb(cl.getYjJb());
+            zlCl.setZldj(cl.getYjJb());
+            zlCl.setZlCphlx(cl.getYjCphlx());
+            zlCl.setZlClcph(cl.getYjClcph());
+            zlCl.setZlCljdcsyr(cl.getYjCljdcsyr());
+            zlCl.setZlCljdcsyrhm(cl.getYjCljdcsyrhm());
+            zlCl.setZlCphys(cl.getYjCphys());
+            zlCl.setZlClys(cl.getYjClys());
+            zlCl.setZlClpp(cl.getYjClpp());
+            zlCl.setZlCllx(cl.getYjCllx());
+            zlCl.setZlClnk(cl.getYjClnk());
+            zlCl.setZlXsfx(cl.getYjXsfx());
+            zlCl.setZlXssd(cl.getYjXssd());
+            zlCl.setZlClrs(cl.getYjClrs());
+            zlCl.setZlXssd(cl.getYjXssd());
+            zlCl.setYjGzyid(cl.getYjGzyid());
+            zlCl.setZlDzXzqh(cl.getYjDzXzqh());
+            zlCl.setZlDz(cl.getYjDz());
+            zlCl.setTpId(cl.getTpId());
+        }
+        zlCl.setZlBt(zl.getZlbt());
+        zlCl.setZlNr(zl.getZlnr());
+        this.tbZlYjClMapper.insertEntity(zlCl);
+    }
+
+    // 添加人员指令子表
+    private void addRyZl(TbZlxx zl) {
+        TbZlYjRy zlRy = new TbZlYjRy();
+        BeanUtils.copyProperties(zl, zlRy);
+        // 指令ID
+        zlRy.setZlId(zl.getId());
+        // 预警ID
+        zlRy.setYjId(zl.getYwId());
+        // 查询预警事件
+        TbYjxxRy ry = this.tbYjxxRyMapper.selectOne(
+                new LambdaQueryWrapper<TbYjxxRy>()
+                        .eq(TbYjxxRy::getYjId, zl.getYwId())
+        );
+        if (ry != null) {
+            zlRy.setRyyjId(ry.getId());
+            zlRy.setYjFssj(ry.getYjFssj());
+            zlRy.setYjSj(ry.getYjSj());
+            zlRy.setYjJb(ry.getYjJb());
+            zlRy.setZlRybq(ry.getYjRybq());
+            zlRy.setZlRybqmc(ry.getYjRybqmc());
+            zlRy.setZlZjlx(ry.getYjZjlx());
+            zlRy.setZlZjhm(ry.getYjZjhm());
+            zlRy.setZlRyxm(ry.getYjRyxm());
+            zlRy.setZlRyxb(ry.getYjRyxb());
+            zlRy.setZlRynl(ry.getYjRynl());
+            zlRy.setZlRymz(ry.getYjRymz());
+            zlRy.setZlRyjg(ry.getYjRyjg());
+            zlRy.setZlRyhjdXzqh(ry.getYjRyhjdXzqh());
+            zlRy.setZlRyhjd(ry.getYjRyhjd());
+            zlRy.setZlRyjzd(ry.getYjRyjzd());
+            zlRy.setZlRyjzdXzqh(ry.getYjRyjzdXzqh());
+            zlRy.setZlRygzdw(ry.getYjRygzdw());
+            zlRy.setZlRygzdwid(ry.getYjRygzdwid());
+            zlRy.setZlRylxdh(ry.getYjRylxdh());
+            zlRy.setZlXsd(ry.getYjXsd());
+            zlRy.setZlXwms(ry.getYjXwms());
+            zlRy.setLtx(ry.getLtx());
+            zlRy.setLty(ry.getLty());
+            zlRy.setRbx(ry.getRbx());
+            zlRy.setRby(ry.getRby());
+            zlRy.setYjGzyid(ry.getYjGzyid());
+            zlRy.setYjDzxzqh(ry.getYjDzxzqh());
+            zlRy.setYjDz(ry.getYjDz());
+            zlRy.setTpId(ry.getTpId());
+            zlRy.setCoverImage(ry.getCoverImage());
+            zlRy.setYjlyBqmc(ry.getYjlyBqmc());
+        }
+        zlRy.setZlfsrq(zl.getZlfqrq());
+        zlRy.setZlfssj(zl.getZlfqsj());
+        zlRy.setZlBt(zl.getZlbt());
+        zlRy.setZlNr(zl.getZlnr());
+        this.tbZlYjRyMapper.insertEntity(zlRy);
+    }
+
+    // 添加事件指令子表
+    private void addSjzl(TbZlxx zl) {
+        TbZlYjSj zlSj = new TbZlYjSj();
+        BeanUtils.copyProperties(zl, zlSj);
+        // 指令ID
+        zlSj.setZlId(zl.getId());
+        // 预警ID
+        zlSj.setYjId(zl.getYwId());
+        // 查询预警事件
+        TbYjxxSj sj = this.tbYjxxSjMapper.selectOne(
+                new LambdaQueryWrapper<TbYjxxSj>()
+                        .eq(TbYjxxSj::getYjId, zl.getYwId())
+        );
+        if (sj != null) {
+            zlSj.setYjSjid(sj.getId());
+            zlSj.setSjFl(sj.getSjFl());
+            zlSj.setSjFlmc(sj.getSjFlmc());
+            zlSj.setYjGzyid(sj.getYjGzyid());
+            zlSj.setYjJb(sj.getYjJb());
+            zlSj.setYjFssj(sj.getYjFssj());
+            zlSj.setYjSj(sj.getYjSj());
+            zlSj.setYjDzxzqh(sj.getYjDzXzqh());
+            zlSj.setYjDz(sj.getYjDz());
+            zlSj.setTpId(sj.getYjTp());
+        }
+        zlSj.setZlBt(zl.getZlbt());
+        zlSj.setZlNr(zl.getZlnr());
+        zlSj.setZlfsrq(zl.getZlfqrq());
+        zlSj.setZlfssj(zl.getZlfqsj());
+        zlSj.setCzqk(zl.getZlzxqk());
+        this.tbZlYjSjMapper.insertEntity(zlSj);
+    }
+
+    // 添加指令执行人和指令执行记录
+    private void addZlxxZxr(TbZlxx zl, TbZlxxInsertDto dto) {
+        if (StringUtils.isNotBlank(dto.getSsbmid())) {
+            DeptInfoVo deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+            if (deptInfoVo == null || StringUtils.isBlank(deptInfoVo.getDeptid())) {
+                deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmid());
+            }
+            if (deptInfoVo == null) {
+                throw new BusinessException("所属部门不存在");
+            }
+            dto.setSsbmid(deptInfoVo.getDeptid());
+        }
+        UserInfo user = UserInfoManager.getUser();
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        if (CollectionUtils.isEmpty(zxrDtoList)) {
+            throw new BusinessException("请至少添加一位指令执行人");
+        }
+        List<TbZlxxZxr> zxrList = new ArrayList<>();
+        zxrDtoList.forEach(zxrDto -> {
+            // 查询
+            TbZlxxZxr zxr = new TbZlxxZxr();
+            BeanUtils.copyProperties(zl, zxr);
+            zxr.setId(UUIDGenerator.getUUID());
+            zxr.setZlId(zl.getId());
+            zxr.setDqzt("01");
+            zxr.setDqztsm(DateUtils.getQueryDateString(new Date(), "02") + ",接收到该指令！！");
+            zxr.setDqztSj(new Date());
+            zxr.setXtSjly("1");
+            zxr.setZxrLx(zl.getZljsdx());
+            zxr.setZxrXzid(zxrDto.getZxrXzid());
+            zxr.setZxrId(zxrDto.getZxrId());
+            zxr.setZxrXm(zxrDto.getZxrXm());
+            zxr.setZxrSfz(zxrDto.getZxrSfz());
+            zxr.setZxrDh(zxrDto.getZxrDh());
+            zxr.setZxrJllx(zxrDto.getZxrJllx());
+            DeptInfoVo dept = null;
+            if ("01".equals(zxrDto.getZxrLx())) {
+                // 查询人员的所属部门
+                SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(zxr.getZxrSfz());
+                if (user1 == null) {
+                    throw new BusinessException("用户" + zxr.getZxrXm() + "（" + zxr.getZxrSfz() + "）不存在！");
+                }
+                zxr.setZxrId(String.valueOf(user1.getId()));
+                if (StringUtils.isBlank(zxr.getZxrDh())) {
+                    zxr.setZxrDh(user1.getMobile());
+                }
+                dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user1.getId()));
+                zxr.setZxrLx("01");
+                zl.setZljsdx("01");
+            } else if ("02".equals(zxrDto.getZxrLx())) {
+                dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(zxrDto.getSsbmid());
+                zxr.setZxrLx("02");
+                zl.setZljsdx("02");
+            } else if ("03".equals(zxrDto.getZxrLx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(zxrDto.getZxrXzid());
+                if (bb != null) {
+                    dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bb.getSsbmid());
+                }
+                zxr.setZxrLx("03");
+                zl.setZljsdx("03");
+            }
+            if (dept != null) {
+                zxr.setSsbmdm(dept.getDeptcode());
+                zxr.setSsbm(dept.getDeptname());
+                zxr.setSsbmid(dept.getDeptid());
+                zxr.setSsxgaj(dept.getFxjname());
+                zxr.setSsxgajdm(dept.getFxjcode());
+                zxr.setSsxgajid(dept.getFxjid());
+                zxr.setSssgaj(dept.getDszname());
+                zxr.setSssgajdm(dept.getDszcode());
+                zxr.setSssgajid(dept.getDszid());
+            }
+            this.tbZlxxZxrMapper.insert(zxr);
+            // 添加指令执行记录
+            this.addZlxxZxjl(zl, "00", zxr);
+            zxrList.add(zxr);
+        });
+        // 添加发送任务
+        this.addTask(zl, zxrList, user);
+    }
+
+    // 添加指令执行人和指令执行记录
+    private void addZlxxZxrOther(TbZlxx zl, TbZlxxInsertDto dto) {
+        if (StringUtils.isNotBlank(dto.getSsbmid())) {
+            DeptInfoVo deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+            if (deptInfoVo == null || StringUtils.isBlank(deptInfoVo.getDeptid())) {
+                deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmid());
+            }
+            if (deptInfoVo == null) {
+                throw new BusinessException("所属部门不存在");
+            }
+            dto.setSsbmid(deptInfoVo.getDeptid());
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        if (CollectionUtils.isEmpty(zxrDtoList)) {
+            throw new BusinessException("请至少添加一位指令执行人");
+        }
+        List<TbZlxxZxr> zxrList = new ArrayList<>();
+        zxrDtoList.forEach(zxrDto -> {
+            // 查询
+            TbZlxxZxr zxr = new TbZlxxZxr();
+            BeanUtils.copyProperties(zl, zxr);
+            zxr.setId(UUIDGenerator.getUUID());
+            zxr.setZlId(zl.getId());
+            zxr.setDqzt("01");
+            zxr.setDqztsm(DateUtils.getQueryDateString(new Date(), "02") + ",接收到该指令！！");
+            zxr.setDqztSj(new Date());
+            zxr.setXtSjly("1");
+            zxr.setZxrLx(zl.getZljsdx());
+            zxr.setZxrXzid(zxrDto.getZxrXzid());
+            zxr.setZxrId(zxrDto.getZxrId());
+            zxr.setZxrXm(zxrDto.getZxrXm());
+            zxr.setZxrSfz(zxrDto.getZxrSfz());
+            zxr.setZxrDh(zxrDto.getZxrDh());
+            zxr.setZxrJllx(zxrDto.getZxrJllx());
+            DeptInfoVo dept = null;
+            if ("01".equals(zxrDto.getZxrLx())) {
+                // 查询人员的所属部门
+                SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(zxr.getZxrSfz());
+                if (user1 == null) {
+                    throw new BusinessException("用户" + zxr.getZxrXm() + "（" + zxr.getZxrSfz() + "）不存在！");
+                }
+                zxr.setZxrId(String.valueOf(user1.getId()));
+                zxr.setZxrDh(user1.getMobile());
+                dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user1.getId()));
+                zxr.setZxrLx("01");
+                zl.setZljsdx("01");
+            } else if ("02".equals(zxrDto.getZxrLx())) {
+                dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(zxr.getSsbmid());
+                zxr.setZxrLx("02");
+                zl.setZljsdx("02");
+            } else if ("03".equals(zxrDto.getZxrLx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(zxrDto.getZxrXzid());
+                if (bb != null) {
+                    dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(bb.getSsbmid());
+                }
+                zxr.setZxrLx("03");
+                zl.setZljsdx("03");
+            }
+            if (dept != null) {
+                zxr.setSsbmdm(dept.getDeptcode());
+                zxr.setSsbm(dept.getDeptname());
+                zxr.setSsbmid(dept.getDeptid());
+                zxr.setSsxgaj(dept.getFxjname());
+                zxr.setSsxgajdm(dept.getFxjcode());
+                zxr.setSsxgajid(dept.getFxjid());
+                zxr.setSssgaj(dept.getDszname());
+                zxr.setSssgajdm(dept.getDszcode());
+                zxr.setSssgajid(dept.getDszid());
+            }
+            this.tbZlxxZxrMapper.insert(zxr);
+            // 添加指令执行记录
+            this.addZlxxZxjl(zl, "00", zxr);
+            zxrList.add(zxr);
+        });
+        // 添加发送任务
+        this.addTaskOther(zl, zxrList, user);
+    }
+
+    // 添加发送任务
+    private void addTaskOther(TbZlxx zl, List<TbZlxxZxr> list, SysUser user) {
+        TbRwTaskDto dto = new TbRwTaskDto();
+        String rwmc = zl.getZlbt();
+        String rwnr = zl.getZlnr();
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        dto.setYwid(zl.getId()).setRwmc(rwmc).setRwnr(rwnr).setRwxxlx("01")
+                .setRwjsdx(zl.getZljsdx()).setSfaqwc("1").setRwlx("2").setRwxl("05").setRwjjcd("2")
+                .setRwyqwcsj(DateUtils.getNextDate(new Date(), "H", +1))
+                .setRwms(zl.getZlzxlx()).setSsbmdm(zl.getSsbmdm()).setSsbm(zl.getSsbm()).setSsbmid(zl.getSsbmid());
+        dto.setCjrid(String.valueOf(user.getId())).setCjrxm(user.getUserName())
+                .setCjrsfzh(user.getIdEntityCard()).setSsbm(dept.getDeptname()).setSsbmdm(dept.getDeptid());
+        // 添加执行人
+        List<TbRwTaskUserDto> userDtoList = new ArrayList<>();
+        list.forEach(item -> {
+            TbRwTaskUserDto userDto = new TbRwTaskUserDto();
+            userDto.setRwzflx("01").setJsrid(item.getZxrId()).setJsrmc(item.getZxrXm()).setJsrsfzh(item.getZxrSfz())
+                    .setJsrlxdh(item.getZxrDh()).setJsbmdm(item.getSsbmid()).setJsxzid(item.getZxrXzid()).setRwjsdx(zl.getZljsdx());
+            userDtoList.add(userDto);
+        });
+        dto.setUserDtoList(userDtoList);
+        this.tbRwzxAdaptRemoteService.addRw(dto);
+    }
+
+    // 添加发送任务
+    private void addTask(TbZlxx zl, List<TbZlxxZxr> list, UserInfo user) {
+        TbRwTaskDto dto = new TbRwTaskDto();
+        String rwmc = zl.getZlbt();
+        String rwnr = zl.getZlnr();
+        dto.setYwid(zl.getId()).setRwmc(rwmc).setRwnr(rwnr).setRwxxlx("01")
+                .setRwjsdx(zl.getZljsdx()).setSfaqwc("1").setRwlx("2").setRwxl("05").setRwjjcd("2")
+                .setRwyqwcsj(DateUtils.getNextDate(new Date(), "H", +1))
+                .setRwms(zl.getZlzxlx()).setSsbmdm(zl.getSsbmdm()).setSsbm(zl.getSsbm()).setSsbmid(zl.getSsbmid());
+        if (user != null) {
+            dto.setCjrid(String.valueOf(user.getUserId())).setCjrxm(user.getUserName())
+                    .setCjrsfzh(user.getIdEntityCard()).setSsbm(user.getDeptName()).setSsbmdm(String.valueOf(user.getDeptId()));
+        } else {
+            dto.setCjrid("-1").setCjrxm("系统").setCjrsfzh("000000");
+        }
+        // 添加执行人
+        List<TbRwTaskUserDto> userDtoList = new ArrayList<>();
+        list.forEach(item -> {
+            TbRwTaskUserDto userDto = new TbRwTaskUserDto();
+            userDto.setRwzflx("01").setJsrid(item.getZxrId()).setJsrmc(item.getZxrXm()).setJsrsfzh(item.getZxrSfz())
+                    .setJsrlxdh(item.getZxrDh()).setJsbmdm(item.getSsbmid()).setJsxzid(item.getZxrXzid()).setRwjsdx(zl.getZljsdx());
+            userDtoList.add(userDto);
+        });
+        dto.setUserDtoList(userDtoList);
+        this.tbRwzxAdaptRemoteService.addRw(dto);
+    }
+
+    /**
+     * 添加指令执行记录
+     *
+     * @param zl     指令
+     * @param zlzxzt 执行记录的状态
+     */
+    private void addZlxxZxjl(TbZlxx zl, String zlzxzt, TbZlxxZxr zxr) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZlzxddXzqhdm(zl.getZlfsddxzqh());
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt(zlzxzt);
+        String str = "";
+        if (zxr != null) {
+            if ("01".equals(zxr.getZxrLx())) {
+                str = "(人员)" + zxr.getZxrXm();
+            } else if ("03".equals(zxr.getZxrLx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(zxr.getZxrXzid());
+                if (bb != null) {
+                    str = "(巡组)" + (StringUtils.isNotBlank(bb.getJzMc()) ? bb.getJzMc() : (bb.getFzrXm() + "警组"));
+                }
+            } else if ("02".equals(zxr.getZxrLx())) {
+                str = "(部门)" + zxr.getSsbm();
+            }
+        }
+        if ("00".equals(zlzxzt)) {
+            zxjl.setZxnr(zl.getZlfqr() + "于" + DateUtils.getQueryDateString(new Date(), "02") +
+                    "下发了该指令！接收" + (StringUtils.isNotBlank(str) ? str : ""));
+        } else if ("91".equals(zlzxzt)) {
+            zxjl.setZxnr(DateUtils.getQueryDateString(new Date(), "02") + "指令过期，");
+        } else if ("94".equals(zlzxzt)) {
+            zxjl.setZxnr("指令有效时间到期，指令超时，指令无需再进行！！");
+        }
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zxjl.setJd(zl.getJd());
+            zxjl.setWd(zl.getWd());
+            zxjl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        zxjl.setSsbmdm(zl.getSsbmdm());
+        zxjl.setSsbm(zl.getSsbm());
+        zxjl.setSsbmid(zl.getSsbmid());
+        zxjl.setSsxgaj(zl.getSsxgaj());
+        zxjl.setSsxgajdm(zl.getSsxgajdm());
+        zxjl.setSsxgajid(zl.getSsxgajid());
+        zxjl.setSssgaj(zl.getSssgaj());
+        zxjl.setSssgajdm(zl.getSssgajdm());
+        zxjl.setSssgajid(zl.getSssgajid());
+        zxjl.setZlzxrId(zl.getZlfqrId());
+        zxjl.setZlzxrSfz(zl.getZlfqrSfzh());
+        zxjl.setZlzxrXm(zl.getZlfqr());
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("1");
+        zxjl.setId(UUIDGenerator.getUUID());
+        if (StringUtils.isNotBlank(zxjl.getZxnr())) {
+            this.tbZlxxZxjlMapper.insertEntity(zxjl);
+        }
+    }
+
+    @Override
+    public void updateZl(TbZlxxInsertDto dto) {
+        TbZlxx zl = new TbZlxx();
+        BeanUtils.copyProperties(dto, zl);
+        if ("2".equals(zl.getZlzxlx()) && ("02".equals(zl.getZljsdx()) || ("03").equals(zl.getZljsdx()))) {
+            throw new BusinessException("多人任务不允许发送给部门或巡组");
+        }
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        // 计算指令接收人数
+        this.totalZljsrs(dto, zl);
+        this.baseMapper.updateEntity(zl);
+        // 删除指令接收人信息
+        this.tbZlxxZxjlMapper.deleteByZlid(dto.getId());
+        // 删除指令执行人信息
+        this.tbZlxxZxrMapper.deleteByZlid(dto.getId());
+        // 重新添加指令执行人和指令执行过程
+        this.addZlxxZxr(zl, dto);
+    }
+
+    @Override
+    public void changeZlGqzt() {
+        List<TbZlxx> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbZlxx>()
+                        .eq(TbZlxx::getXtSjzt, "1")
+                        .notIn(TbZlxx::getZlzxzt, "32", "92", "93", "94")
+                        .le(TbZlxx::getQsyxsj, new Date())
+                        .isNotNull(TbZlxx::getQsyxsj)
+        );
+        list.forEach(item -> {
+            item.setZlzxzt("94");
+            item.setZlwjzt("94");
+            item.setZlwjsj(item.getQsyxsj());
+            item.setZlwjsm("指令有效时间到期，指令超时，且有人员未完成指令！！");
+            item.setZlzxqk("指令有效时间到期，指令超时，且有人员未完成指令！！" + item.getZlzxqk());
+            this.baseMapper.updateEntity(item);
+            // 修改指令执行人的指令状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, item.getId())
+                            .eq(TbZlxxZxr::getXtSjzt, "1")
+                            .notIn(TbZlxxZxr::getDqzt, "32", "92", "93", "94")
+            );
+            zxrList.forEach(zxr -> {
+                zxr.setDqzt("94");
+                zxr.setDqztSj(item.getQsyxsj());
+                zxr.setDqztsm("指令有效时间到期，指令超时，指令无需再进行！！");
+                this.tbZlxxZxrMapper.updateById(zxr);
+            });
+            // 添加指令执行记录
+            this.addZlxxZxjl(item, "94", null);
+        });
+    }
+
+    // 统计指令接收人数
+    private void totalZljsrs(TbZlxxInsertDto dto, TbZlxx zl) {
+        if ("01".equals(zl.getZljsdx())) {
+            zl.setZljsrs(dto.getZxrDtoList() == null ? 0 : dto.getZxrDtoList().size());
+        } else if ("02".equals(zl.getZljsdx())) {
+            if (StringUtils.isEmpty(zl.getSsbmid())) {
+                throw new BusinessException("请选择对应的部门！！");
+            }
+            int count = this.tbBaseAdaptRemoteService.getUserCount(zl.getSsbmid());
+            zl.setZljsrs(count);
+        } else if ("03".equals(zl.getZljsdx())) {
+            List<TbZlxxZxrDtoInsertDto> list = dto.getZxrDtoList();
+            if (CollectionUtils.isEmpty(list)) {
+                throw new BusinessException("请选择对应的巡组！！");
+            }
+            TbZlxxZxrDtoInsertDto zxr = list.get(0);
+            // 查询该巡组的人数
+            List<TbQwJlDto> jlList = this.tbQwzxAdaptRemoteService.getJlxxByBbid(zxr.getZxrXzid());
+            zl.setZljsrs(jlList.size());
+        }
+    }
+
+
+    @Override
+    @Transactional
+    public void zlHandle(TbZlxxZtChangeDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbZlxx zl = this.tbZlxxMapper.selectById(dto.getZlId());
+        if (zl == null) {
+            throw new BusinessException("指令未找到！！");
+        }
+        TbZlxxZxr zxr = null;
+        if ("01".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrId, String.valueOf(user.getUserId()))
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        } else if ("02".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+                            .eq(TbZlxxZxr::getSsbmid, dto.getSsbmid())
+            );
+        } else if ("03".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrXzid, dto.getZlzxrXzid())
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        }
+        if (zxr == null) {
+            throw new BusinessException("执行人未找到！！");
+        }
+        // 签收状态
+        if ("01".equals(dto.getZlzxzt())) {
+            this.changeQszt(dto, zl, user, zxr);
+            //如果是犯罪预测指令 修改犯罪预测指令签收状态
+            if (zl.getZllx().equals("09")) {
+                tbFzycXfxzMapper.updateSfqs(zl.getId());
+            }
+        } else if ("02".equals(dto.getZlzxzt())) {
+            // 到达状态
+            this.changeDdzt(dto, zl, user, zxr);
+        } else if ("03".equals(dto.getZlzxzt())) {
+            // 处置完成
+            this.changeCzzt(dto, zl, user, zxr);
+        } else if ("04".equals(dto.getZlzxzt())) {
+            // 完结
+            this.changeWjzt(dto, zl, user, zxr);
+        } else if ("08".equals(dto.getZlzxzt())) {
+            // 转发
+            this.changeZfzt(dto, zl, user, zxr);
+        }
+    }
+
+    @Override
+    public void zlHandleRygk(TbZlxxZtChangeRygkDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbZlxx zl = this.tbZlxxMapper.selectById(dto.getZlId());
+        if (zl == null) {
+            throw new BusinessException("指令未找到！！");
+        }
+        TbZlxxZxr zxr = null;
+        if ("01".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrId, String.valueOf(user.getUserId()))
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        } else if ("02".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+                            .eq(TbZlxxZxr::getSsbmid, dto.getSsbmid())
+            );
+        } else if ("03".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrXzid, dto.getZlzxrXzid())
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        }
+        if (zxr == null) {
+            throw new BusinessException("执行人未找到！！");
+        }
+        // 研判
+        if ("05".equals(dto.getZlzxzt()) || "06".equals(dto.getZlzxzt())) {
+            this.changeYp(dto, zl, user, zxr);
+        } else if ("07".equals(dto.getZlzxzt())) {
+            // 反馈
+            this.changeYp(dto, zl, user, zxr);
+        }
+    }
+
+    private void changeYp(TbZlxxZtChangeRygkDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        String zt = "";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if ("05".equals(dto.getZlzxzt())) {
+            sm += "研判了该指令";
+            zt = "26";
+        } else if ("06".equals(dto.getZlzxzt())) {
+            sm += "再次研判了该指令";
+            zt = "26";
+        } else if ("07".equals(dto.getZlzxzt())) {
+            sm += "反馈了该指令";
+            zt = "27";
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录--研判反馈
+        this.addZlxxZxjlYp(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令状态
+        this.changeZlYpState(zl, zt, user, zxr);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 判断修改指令签收状态
+    private void changeZlYpState(TbZlxx zl, String zt, UserInfo user, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setQszt(zt);
+            zl.setQssj(new Date());
+            zl.setZlzxzt(zt);
+            String sm = "";
+            if ("26".equals(zl.getZlzxzt())) {
+                sm = "研判";
+            } else if ("27".equals(zl.getZlzxzt())) {
+                sm += "反馈";
+            }
+            zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令。" + zl.getZlzxqk());
+            zxr.setZlzxzt(zt);
+            zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令。" + zl.getZlzxqk());
+            this.tbZlxxMapper.updateEntity(zl);
+        }
+    }
+
+
+    // 添加指令执行记录
+    private void addZlxxZxjlYp(TbZlxx zl, TbZlxxZxr zxr, String zt, String sm, TbZlxxZtChangeRygkDto dto, UserInfo user) {
+        List<String> fjids = StringUtils.isNotBlank(dto.getFjid()) ? Arrays.asList(dto.getFjid().split(",")) : null;
+        List<String> fjmcs = StringUtils.isNotBlank(dto.getFjmc()) ? Arrays.asList(dto.getFjmc().split(",")) : null;
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt(zt);
+        if ("26".equals(zt)) {
+            zxjl.setZxnr(sm + "，研判意见：" + dto.getZxnr());
+        } else if ("27".equals(zt)) {
+            zxjl.setZxnr(sm + "，处置经过描述：" + dto.getZxnr());
+        }
+        if (dto.getJd() != null && dto.getWd() != null) {
+            zxjl.setJd(dto.getJd());
+            zxjl.setWd(dto.getWd());
+            zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (zxr != null) {
+            zxjl.setSsbmdm(zxr.getSsbmdm());
+            zxjl.setSsbm(zxr.getSsbm());
+            zxjl.setSsbmid(zxr.getSsbmid());
+            zxjl.setSsxgaj(zxr.getSsxgaj());
+            zxjl.setSsxgajdm(zxr.getSsxgajdm());
+            zxjl.setSsxgajid(zxr.getSsxgajid());
+            zxjl.setSssgaj(zxr.getSssgaj());
+            zxjl.setSssgajdm(zxr.getSssgajdm());
+            zxjl.setSssgajid(zxr.getSssgajid());
+            zxjl.setZlzxrId(zxr.getZxrId());
+            zxjl.setZlzxrXzid(zxr.getZxrXzid());
+            zxjl.setZlzxrDh(zxr.getZxrDh());
+            zxjl.setZlzxrSfz(zxr.getZxrSfz());
+            zxjl.setZlzxrXm(zxr.getZxrXm());
+        }
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("2");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+        if (!CollectionUtils.isEmpty(fjids) && !CollectionUtils.isEmpty(fjmcs)) {
+            for (int i = 0; i < fjids.size(); i++) {
+                zxjl = new TbZlxxZxjl();
+                zxjl.setId(UUIDGenerator.getUUID());
+                zxjl.setZlId(zl.getId());
+                zxjl.setZxsj(new Date());
+                zxjl.setZlzxzt(zt);
+                zxjl.setZxnr(fjmcs.get(i));
+                zxjl.setFjid(fjids.get(i));
+                if (dto.getJd() != null && dto.getWd() != null) {
+                    zxjl.setJd(dto.getJd());
+                    zxjl.setWd(dto.getWd());
+                    zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+                    zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+                }
+                if (zxr != null) {
+                    zxjl.setSsbmdm(zxr.getSsbmdm());
+                    zxjl.setSsbm(zxr.getSsbm());
+                    zxjl.setSsbmid(zxr.getSsbmid());
+                    zxjl.setSsxgaj(zxr.getSsxgaj());
+                    zxjl.setSsxgajdm(zxr.getSsxgajdm());
+                    zxjl.setSsxgajid(zxr.getSsxgajid());
+                    zxjl.setSssgaj(zxr.getSssgaj());
+                    zxjl.setSssgajdm(zxr.getSssgajdm());
+                    zxjl.setSssgajid(zxr.getSssgajid());
+                    zxjl.setZlzxrId(zxr.getZxrId());
+                    zxjl.setZlzxrXzid(zxr.getZxrXzid());
+                    zxjl.setZlzxrDh(zxr.getZxrDh());
+                    zxjl.setZlzxrSfz(zxr.getZxrSfz());
+                    zxjl.setZlzxrXm(zxr.getZxrXm());
+                }
+                zxjl.setZlzxdd(zl.getZlfsdd());
+                zxjl.setXtSjly("2");
+                zxjl.setId(UUIDGenerator.getUUID());
+                this.tbZlxxZxjlMapper.insertEntity(zxjl);
+            }
+        }
+    }
+
+    @Override
+    public TbZlxxInfoVo getInfo(String id) {
+        UserInfo user = UserInfoManager.get();
+        TbZlxx zlxx = this.baseMapper.selectById(id);
+        TbZlxxInfoVo vo = new TbZlxxInfoVo();
+        BeanUtils.copyProperties(zlxx, vo);
+        if (user != null) {
+            TbZlxxZxr zxr = this.baseMapper.selectZxr(id, String.valueOf(user.getDeptId()), user.getIdEntityCard());
+            if (zxr != null) {
+                TbZlxxZxrVo zxrVo = new TbZlxxZxrVo();
+                BeanUtils.copyProperties(zxr, zxrVo);
+                vo.setZxrVo(zxrVo);
+            }
+        }
+        return vo;
+    }
+
+    @Override
+    public void addZxjl(TbZlxxZxjlInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            throw new BusinessException("登录异常，请重新登录");
+        }
+        TbZlxx zl = this.baseMapper.selectById(dto.getZlId());
+        if (zl == null) {
+            throw new BusinessException("没有找到当前指令信息！！");
+        }
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        BeanUtils.copyProperties(dto, zxjl);
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt("05");
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zxjl.setJd(zl.getJd());
+            zxjl.setWd(zl.getWd());
+            zxjl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        zxjl.setSsbmdm(user.getDeptCode());
+        zxjl.setSsbm(user.getDeptName());
+        zxjl.setSsbmid(String.valueOf(user.getDeptId()));
+        zxjl.setSsxgaj(user.getFxjDeptName());
+        zxjl.setSsxgajdm(user.getFxjDeptCode());
+        zxjl.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        zxjl.setSssgaj(user.getDszDeptName());
+        zxjl.setSssgajdm(user.getDszDeptCode());
+        zxjl.setSssgajid(String.valueOf(user.getDszDeptId()));
+        zxjl.setZlzxrId(String.valueOf(user.getUserId()));
+        zxjl.setZlzxrSfz(user.getIdEntityCard());
+        zxjl.setZlzxrXm(user.getUserName());
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("1");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    @Override
+    public void addPcrycl(TbZlxxPcryclInsertDto dto) {
+        UserInfo user = UserInfoManager.get();
+        TbZlxxPcrycl rc = new TbZlxxPcrycl();
+        rc.setId(UUIDGenerator.getUUID());
+        rc.setPclxdm(dto.getPclxdm());
+        rc.setPcryclId(dto.getPcryclId());
+        rc.setZlId(dto.getZlId());
+        if (user != null) {
+            rc.setSsbmdm(user.getDeptCode());
+            rc.setSsbm(user.getDeptName());
+            rc.setSsbmid(String.valueOf(user.getDeptId()));
+            rc.setSsxgaj(user.getFxjDeptName());
+            rc.setSsxgajdm(user.getFxjDeptCode());
+            rc.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+            rc.setSssgaj(user.getDszDeptName());
+            rc.setSssgajdm(user.getDszDeptCode());
+            rc.setSssgajid(String.valueOf(user.getDszDeptId()));
+        }
+        rc.setXtSjly("2");
+        this.tbZlxxPcryclMapper.insert(rc);
+    }
+
+    // 转发
+    private void changeZfzt(TbZlxxZtChangeDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        String zt = "04";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令！";
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZfZlxxZxjl(zl, zxr, dto, user);
+        // 判断修改指令完结状态
+        this.changeZlZfState(zl, user, dto, zxr);
+        // 添加新的指令信息
+        this.sendNewZlxx(zl, dto);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+        // 查询是否是警情指令，如果是警情指令，修改警情的处置状态
+        this.updateJqCzzt(zl, "2");
+    }
+
+    // 转发
+    private void changeZfztOther(TbZlxxZtChangeDto dto, TbZlxx zl, SysUser user, TbZlxxZxr zxr) {
+        String zt = "04";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令！";
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZfZlxxZxjlOther(zl, zxr, dto, user);
+        // 判断修改指令完结状态
+        this.changeZlZfStateOther(zl, user, dto, zxr);
+        // 添加新的指令信息
+        this.sendNewZlxx(zl, dto);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 转发指令，添加新的指令信息
+    private void sendNewZlxx(TbZlxx zl, TbZlxxZtChangeDto dto) {
+        TbZlxxInsertDto ins = new TbZlxxInsertDto();
+        BeanUtils.copyProperties(zl, ins);
+        ins.setZxrDtoList(dto.getZxrDtoList());
+        this.addZl(ins);
+    }
+
+    // 到达状态
+    private void changeWjzt(TbZlxxZtChangeDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        String zt = "";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if (zl.getZlwjyxsj().getTime() <= new Date().getTime()) {
+            zt = "93";
+            sm += "超时完结了该指令！！指令完结说明：" + dto.getZlwjsm();
+        } else {
+            zt = "92";
+            sm += "完结了该指令！！指令完结说明：" + dto.getZlwjsm();
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjl(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令完结状态
+        this.changeZlWjState(zl, zt, sm, user, dto.getZlwjsm(), zxr);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+        // 查询是否是警情指令，如果是警情指令，修改警情的处置状态
+        this.updateJqCzzt(zl, "2");
+    }
+
+    // 到达状态
+    private void changeWjztOther(TbZlxxZtChangeDto dto, TbZlxx zl, SysUser user, TbZlxxZxr zxr) {
+        String zt = "";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if (zl.getZlwjyxsj().getTime() <= new Date().getTime()) {
+            zt = "93";
+            sm += "超时完结了该指令！！指令完结说明：" + dto.getZlwjsm();
+        } else {
+            zt = "92";
+            sm += "完结了该指令！！指令完结说明：" + dto.getZlwjsm();
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjlOther(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令完结状态
+        this.changeZlWjStateOther(zl, zt, sm, user, dto.getZlwjsm(), zxr);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    private void changeCzzt(TbZlxxZtChangeDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        String zt = "32";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02") + "完成处置！！";
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjl(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令状态
+        this.changeZlDdState(zl, zt, sm, user, zxr);
+        // 修改执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    private void changeCzztOther(TbZlxxZtChangeDto dto, TbZlxx zl, SysUser user, TbZlxxZxr zxr) {
+        String zt = "32";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02") + "完成处置！！";
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjlOther(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令状态
+        this.changeZlDdStateOther(zl, zt, sm, user, zxr);
+        // 修改执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 到达状态
+    private void changeDdzt(TbZlxxZtChangeDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        String zt = "";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if ("01".equals(zl.getZllx())) {
+            zt = "11";
+            sm += "到达现场，开始巡逻中..";
+        } else {
+            if (zl.getDdxcyxsj().getTime() <= new Date().getTime()) {
+                zt = "25";
+                sm += "到达现场，时间超时！！";
+            } else if ("0".equals(dto.getSfsddd())) {
+                // 自动
+                zt = "22";
+                sm += "通过位置计算，确认自动到达现场！";
+            } else if ("1".equals(dto.getSfsddd())) {
+                // 手动，判断两点之间的距离是否相差100米
+                if (dto.getJd() != null && dto.getWd() != null && zl.getJd() != null && zl.getWd() != null) {
+                    Double jl = Kit.getDistance(zl.getJd().doubleValue(), zl.getWd().doubleValue(),
+                            dto.getJd().doubleValue(), dto.getWd().doubleValue());
+                    if (jl < 100) {
+                        zt = "24";
+                        sm += "手动确认到达现场，经位置计算，确已到达，于指令地点相距" + jl + "米";
+                    } else {
+                        zt = "23";
+                        sm += "手动确认到达现场，经位置计算，实际并未到达，于指令地点相距" + jl + "米";
+                    }
+                } else {
+                    zt = "23";
+                    sm += "手动确认到达现场，位置未知！！";
+                }
+            }
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjl(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令状态
+        this.changeZlDdState(zl, zt, sm, user, zxr);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 到达状态
+    private void changeDdztOther(TbZlxxZtChangeDto dto, TbZlxx zl, SysUser user, TbZlxxZxr zxr) {
+        String zt = "";
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if ("01".equals(zl.getZllx())) {
+            zt = "11";
+            sm += "到达现场，开始巡逻中..";
+        } else {
+            if (zl.getDdxcyxsj().getTime() <= new Date().getTime()) {
+                zt = "25";
+                sm += "到达现场，时间超时！！";
+            } else if ("0".equals(dto.getSfsddd())) {
+                // 自动
+                zt = "22";
+                sm += "通过位置计算，确认自动到达现场！";
+            } else if ("1".equals(dto.getSfsddd())) {
+                // 手动，判断两点之间的距离是否相差100米
+                if (dto.getJd() != null && dto.getWd() != null && zl.getJd() != null && zl.getWd() != null) {
+                    Double jl = Kit.getDistance(zl.getJd().doubleValue(), zl.getWd().doubleValue(),
+                            dto.getJd().doubleValue(), dto.getWd().doubleValue());
+                    if (jl < 100) {
+                        zt = "24";
+                        sm += "手动确认到达现场，经位置计算，确已到达，于指令地点相距" + jl + "米";
+                    } else {
+                        zt = "23";
+                        sm += "手动确认到达现场，经位置计算，实际并未到达，于指令地点相距" + jl + "米";
+                    }
+                } else {
+                    zt = "23";
+                    sm += "手动确认到达现场，位置未知！！";
+                }
+            }
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 添加执行记录
+        this.addZlxxZxjlOther(zl, zxr, zt, sm, dto, user);
+        // 判断修改指令状态
+        this.changeZlDdStateOther(zl, zt, sm, user, zxr);
+        // 修改指令执行人信息
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 签收状态
+    private void changeQszt(TbZlxxZtChangeDto dto, TbZlxx zl, UserInfo user, TbZlxxZxr zxr) {
+        // 是否超过签收时间
+        String zt;
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if (zl.getQsyxsj().getTime() <= new Date().getTime()) {
+            zt = "03";
+            sm += "超时签收了该指令！";
+        } else {
+            zt = "02";
+            sm += "签收了该指令！";
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 判断修改指令状态
+        this.changeZlQsState(zl, zt, user, zxr);
+        // 添加执行记录
+        this.addZlxxZxjl(zl, zxr, zt, sm, dto, user);
+        // 修改执行人状态
+        this.tbZlxxZxrMapper.updateById(zxr);
+        // 查询是否是警情指令，如果是警情指令，修改警情的处置状态
+        this.updateJqCzzt(zl, "1");
+    }
+
+    // 查询是否是警情指令，如果是警情指令，修改警情的处置状态
+    private void updateJqCzzt(TbZlxx zl, String czzt) {
+        if ("05".equals(zl.getZllx()) && StringUtils.isNotBlank(zl.getYwId())) {
+            TbJqVo jq = this.tbSjzxAdaptRemoteService.getJqInfo(zl.getYwId());
+            if (jq != null) {
+                this.tbSjzxAdaptRemoteService.updateJqCzzt(jq.getId(), czzt);
+                // 表示警情已经完成，推送数据给前端，前端删除撒点
+                if ("2".equals(czzt)) {
+                    WebSocketObject obj = new WebSocketObject("02", jq.getId(), null);
+                    this.tbWebSocketAdaptRemoteService.sendMessage(obj);
+                }
+            }
+        }
+    }
+
+    // 签收状态
+    private void changeQsztOther(TbZlxxZtChangeDto dto, TbZlxx zl, SysUser user, TbZlxxZxr zxr) {
+        // 是否超过签收时间
+        String zt;
+        String sm = "于" + DateUtils.getQueryDateString(new Date(), "02");
+        if (zl.getQsyxsj().getTime() <= new Date().getTime()) {
+            zt = "03";
+            sm += "超时签收了该指令！";
+        } else {
+            zt = "02";
+            sm += "签收了该指令！";
+        }
+        zxr.setDqzt(zt);
+        zxr.setDqztSj(new Date());
+        zxr.setDqztsm(sm);
+        // 判断修改指令状态
+        this.changeZlQsStateOther(zl, zt, user, zxr);
+        // 添加执行记录
+        this.addZlxxZxjlOther(zl, zxr, zt, sm, dto, user);
+        // 修改执行人状态
+        this.tbZlxxZxrMapper.updateById(zxr);
+    }
+
+    // 判断修改指令转发状态
+    private void changeZlZfState(TbZlxx zl, UserInfo user, TbZlxxZtChangeDto dto, TbZlxxZxr zxr) {
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        String str = zxrDtoList.stream().map(it -> {
+            if ("01".equals(it.getZxrLx())) {
+                return "(人员)" + it.getZxrXm();
+            } else if ("03".equals(it.getZxrLx())) {
+                return "(巡组)" + it.getZxrXzmc();
+            } else if ("02".equals(it.getZxrLx())) {
+                return "(部门)" + it.getSsbmmc();
+            }
+            return "";
+        }).collect(Collectors.joining("、"));
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setZlzxzt("04");
+            zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!!"
+                    + zl.getZlzxqk());
+            zxr.setZlzxzt("04");
+            zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!!"
+                    + zl.getZlzxqk());
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他人的指令状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt("04");
+                item.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!"
+                        + zl.getZlzxqk());
+                item.setDqzt("04");
+                item.setDqztsm(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!");
+                item.setDqztSj(new Date());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        }
+    }
+
+    // 判断修改指令转发状态
+    private void changeZlZfStateOther(TbZlxx zl, SysUser user, TbZlxxZtChangeDto dto, TbZlxxZxr zxr) {
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        String str = zxrDtoList.stream().map(it -> {
+            if ("01".equals(it.getZxrLx())) {
+                return "(人员)" + it.getZxrXm();
+            } else if ("03".equals(it.getZxrLx())) {
+                return "(巡组)" + it.getZxrXzmc();
+            } else if ("02".equals(it.getZxrLx())) {
+                return "(部门)" + it.getSsbmmc();
+            }
+            return "";
+        }).collect(Collectors.joining("、"));
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setZlzxzt("04");
+            zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!!"
+                    + zl.getZlzxqk());
+            zxr.setZlzxzt("04");
+            zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!!"
+                    + zl.getZlzxqk());
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他人的指令状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt("04");
+                item.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!"
+                        + zl.getZlzxqk());
+                item.setDqzt("04");
+                item.setDqztsm(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令,转发给->" + str + "!");
+                item.setDqztSj(new Date());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        }
+    }
+
+    // 判断修改指令到达状态
+    private void changeZlWjStateOther(TbZlxx zl, String zt, String sm, SysUser user, String zlwjsm, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setDdxczt(zt);
+            zl.setDdxcsj(new Date());
+            zl.setZlzxzt(zt);
+            zl.setZlwjsm(zlwjsm);
+            zl.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他人的指令状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+                item.setDqzt(zt);
+                item.setDqztsm(user.getUserName() + sm);
+                item.setDqztSj(new Date());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有已完成状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z ->
+                    !"92".equals(z.getDqzt()) &&
+                            !"93".equals(z.getDqzt())
+            ).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setZlwjzt("92");
+                zl.setZlwjsj(new Date());
+                zl.setZlzxzt("92");
+                zl.setZlzxqk(user.getUserName() + sm + "，所有人已完结该指令！！" + zl.getZlzxqk());
+                zl.setZlwjsm(zlwjsm + "--" + zl.getZlwjsm());
+                zxr.setZlzxzt("92");
+                zxr.setZlzxqk(user.getUserName() + sm + "，所有人已完结该指令！！" + zl.getZlzxqk());
+                this.tbZlxxMapper.updateEntity(zl);
+            }
+        }
+    }
+
+    // 判断修改指令到达状态
+    private void changeZlWjState(TbZlxx zl, String zt, String sm, UserInfo user, String zlwjsm, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setDdxczt(zt);
+            zl.setDdxcsj(new Date());
+            zl.setZlzxzt(zt);
+            zl.setZlwjsm(zlwjsm);
+            zl.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他人的指令状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+                item.setDqzt(zt);
+                item.setDqztsm(user.getUserName() + sm);
+                item.setDqztSj(new Date());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有已完成状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z ->
+                    !"92".equals(z.getDqzt()) &&
+                            !"93".equals(z.getDqzt())
+            ).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setZlwjzt("92");
+                zl.setZlwjsj(new Date());
+                zl.setZlzxzt("92");
+                zl.setZlzxqk(user.getUserName() + sm + "，所有人已完结该指令！！" + zl.getZlzxqk());
+                zl.setZlwjsm(zlwjsm + "--" + zl.getZlwjsm());
+                zxr.setZlzxzt("92");
+                zxr.setZlzxqk(user.getUserName() + sm + "，所有人已完结该指令！！" + zl.getZlzxqk());
+                this.tbZlxxMapper.updateEntity(zl);
+            }
+        }
+    }
+
+    // 判断修改指令到达状态
+    private void changeZlDdState(TbZlxx zl, String zt, String sm, UserInfo user, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setDdxczt(zt);
+            zl.setDdxcsj(new Date());
+            zl.setZlzxzt(zt);
+            zl.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他指令执行人的状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+                item.setDqzt(zt);
+                item.setDqztSj(new Date());
+                item.setDqztsm(user.getUserName() + sm);
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有未签收和待到达现场的状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z ->
+                    "01".equals(z.getDqzt()) ||
+                            "02".equals(z.getDqzt()) ||
+                            "03".equals(z.getDqzt()) ||
+                            "21".equals(z.getDqzt()) ||
+                            "22".equals(z.getDqzt()) ||
+                            "23".equals(z.getDqzt()) ||
+                            "24".equals(z.getDqzt()) ||
+                            "31".equals(z.getDqzt())
+            ).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setZlzxzt("32");
+                zl.setZlzxqk(user.getUserName() + sm + "，所有人处置完成！！" + zl.getZlzxqk());
+                zxr.setZlzxzt("32");
+                zxr.setZlzxqk(user.getUserName() + sm + "，所有人处置完成！！" + zl.getZlzxqk());
+                this.tbZlxxMapper.updateEntity(zl);
+            }
+        }
+    }
+
+    // 判断修改指令到达状态
+    private void changeZlDdStateOther(TbZlxx zl, String zt, String sm, SysUser user, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setDdxczt(zt);
+            zl.setDdxcsj(new Date());
+            zl.setZlzxzt(zt);
+            zl.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+            this.tbZlxxMapper.updateEntity(zl);
+            // 修改其他指令执行人的状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setZlzxqk(user.getUserName() + sm + zl.getZlzxqk());
+                item.setDqzt(zt);
+                item.setDqztSj(new Date());
+                item.setDqztsm(user.getUserName() + sm);
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有未签收和待到达现场的状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z ->
+                    "01".equals(z.getDqzt()) ||
+                            "02".equals(z.getDqzt()) ||
+                            "03".equals(z.getDqzt()) ||
+                            "21".equals(z.getDqzt()) ||
+                            "22".equals(z.getDqzt()) ||
+                            "23".equals(z.getDqzt()) ||
+                            "24".equals(z.getDqzt()) ||
+                            "31".equals(z.getDqzt())
+            ).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setZlzxzt("32");
+                zl.setZlzxqk(user.getUserName() + sm + "，所有人处置完成！！" + zl.getZlzxqk());
+                zxr.setZlzxzt("32");
+                zxr.setZlzxqk(user.getUserName() + sm + "，所有人处置完成！！" + zl.getZlzxqk());
+                this.tbZlxxMapper.updateEntity(zl);
+            }
+        }
+    }
+
+    // 判断修改指令签收状态
+    private void changeZlQsState(TbZlxx zl, String zt, UserInfo user, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setQszt(zt);
+            zl.setQssj(new Date());
+            zl.setZlzxzt(zt);
+            String sm = "02".equals(zt) ? "签收" : "超时签收";
+            zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令" + zl.getZlzxqk());
+            zxr.setZlzxzt(zt);
+            zxr.setDqzt(zt);
+            zxr.setDqztsm(sm);
+            zxr.setDqztSj(new Date());
+            zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令" + zl.getZlzxqk());
+            // 修改其他执行人的状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setDqzt(zt);
+                item.setDqztsm(sm);
+                item.setDqztSj(new Date());
+                item.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                        + "了该指令" + zl.getZlzxqk());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有未签收的状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z -> "01".equals(z.getDqzt())).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setQszt("02");
+                zl.setQssj(new Date());
+                zl.setZlzxzt("02");
+                zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+                zxr.setDqzt(zt);
+                zxr.setDqztsm(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+                zxr.setDqztSj(new Date());
+                zxr.setZlzxzt("02");
+                zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+            }
+        }
+        this.tbZlxxMapper.updateEntity(zl);
+    }
+
+    // 判断修改指令签收状态
+    private void changeZlQsStateOther(TbZlxx zl, String zt, SysUser user, TbZlxxZxr zxr) {
+        if ("1".equals(zl.getZlzxlx())) {
+            //一人完成，指令即完成
+            zl.setQszt(zt);
+            zl.setQssj(new Date());
+            zl.setZlzxzt(zt);
+            String sm = "02".equals(zt) ? "签收" : "超时签收";
+            zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令" + zl.getZlzxqk());
+            zxr.setZlzxzt(zt);
+            zxr.setDqzt(zt);
+            zxr.setDqztsm(sm);
+            zxr.setDqztSj(new Date());
+            zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                    + "了该指令" + zl.getZlzxqk());
+            // 修改其他执行人的状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            zxrList.forEach(item -> {
+                item.setZlzxzt(zt);
+                item.setDqzt(zt);
+                item.setDqztsm(sm);
+                item.setDqztSj(new Date());
+                item.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02") + sm
+                        + "了该指令" + zl.getZlzxqk());
+                this.tbZlxxZxrMapper.updateById(item);
+            });
+        } else if ("2".equals(zl.getZlzxlx())) {
+            // 查询是否所有人的状态都达到该状态
+            List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+            // 查询是否有未签收的状态，如果没有，则改指令状态为签收
+            zxrList = zxrList.stream().filter(z -> "01".equals(z.getDqzt())).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(zxrList)) {
+                zl.setQszt("02");
+                zl.setQssj(new Date());
+                zl.setZlzxzt("02");
+                zl.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+                zxr.setDqzt(zt);
+                zxr.setDqztsm(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+                zxr.setDqztSj(new Date());
+                zxr.setZlzxzt("02");
+                zxr.setZlzxqk(user.getUserName() + "于" + DateUtils.getQueryDateString(new Date(), "02")
+                        + "签收了该指令，所有人都完成了指令的签收！！" + zl.getZlzxqk());
+            }
+        }
+        this.tbZlxxMapper.updateEntity(zl);
+    }
+
+    // 添加转发指令执行记录
+    private void addZfZlxxZxjl(TbZlxx zl, TbZlxxZxr zxr, TbZlxxZtChangeDto dto, UserInfo user) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt("11");
+        String zxnr = user.getUserName();
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        String str = zxrDtoList.stream().map(it -> {
+            if ("01".equals(it.getZxrLx())) {
+                return "(人员)" + it.getZxrXm();
+            } else if ("03".equals(it.getZxrLx())) {
+                return "(巡组)" + it.getZxrXzmc();
+            } else if ("02".equals(it.getZxrLx())) {
+                return "(部门)" + it.getSsbmmc();
+            }
+            return "";
+        }).collect(Collectors.joining("、"));
+        zxjl.setZxnr(zxnr + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令，转发给->" + str);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            zxjl.setJd(dto.getJd());
+            zxjl.setWd(dto.getWd());
+            zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (zxr != null) {
+            zxjl.setSsbmdm(zxr.getSsbmdm());
+            zxjl.setSsbm(zxr.getSsbm());
+            zxjl.setSsbmid(zxr.getSsbmid());
+            zxjl.setSsxgaj(zxr.getSsxgaj());
+            zxjl.setSsxgajdm(zxr.getSsxgajdm());
+            zxjl.setSsxgajid(zxr.getSsxgajid());
+            zxjl.setSssgaj(zxr.getSssgaj());
+            zxjl.setSssgajdm(zxr.getSssgajdm());
+            zxjl.setSssgajid(zxr.getSssgajid());
+            zxjl.setZlzxrId(zxr.getZxrId());
+            zxjl.setZlzxrXzid(zxr.getZxrXzid());
+            zxjl.setZlzxrDh(zxr.getZxrDh());
+            zxjl.setZlzxrSfz(zxr.getZxrSfz());
+            zxjl.setZlzxrXm(zxr.getZxrXm());
+        }
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("2");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    // 添加转发指令执行记录
+    private void addZfZlxxZxjlOther(TbZlxx zl, TbZlxxZxr zxr, TbZlxxZtChangeDto dto, SysUser user) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt("11");
+        String zxnr = user.getUserName();
+        List<TbZlxxZxrDtoInsertDto> zxrDtoList = dto.getZxrDtoList();
+        String str = zxrDtoList.stream().map(it -> {
+            if ("01".equals(it.getZxrLx())) {
+                return "(人员)" + it.getZxrXm();
+            } else if ("03".equals(it.getZxrLx())) {
+                return "(巡组)" + it.getZxrXzmc();
+            } else if ("02".equals(it.getZxrLx())) {
+                return "(部门)" + it.getSsbmmc();
+            }
+            return "";
+        }).collect(Collectors.joining("、"));
+        zxjl.setZxnr(zxnr + "于" + DateUtils.getQueryDateString(new Date(), "02") + "转发了该指令，转发给->" + str);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            zxjl.setJd(dto.getJd());
+            zxjl.setWd(dto.getWd());
+            zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (zxr != null) {
+            zxjl.setSsbmdm(zxr.getSsbmdm());
+            zxjl.setSsbm(zxr.getSsbm());
+            zxjl.setSsbmid(zxr.getSsbmid());
+            zxjl.setSsxgaj(zxr.getSsxgaj());
+            zxjl.setSsxgajdm(zxr.getSsxgajdm());
+            zxjl.setSsxgajid(zxr.getSsxgajid());
+            zxjl.setSssgaj(zxr.getSssgaj());
+            zxjl.setSssgajdm(zxr.getSssgajdm());
+            zxjl.setSssgajid(zxr.getSssgajid());
+            zxjl.setZlzxrId(zxr.getZxrId());
+            zxjl.setZlzxrXzid(zxr.getZxrXzid());
+            zxjl.setZlzxrDh(zxr.getZxrDh());
+            zxjl.setZlzxrSfz(zxr.getZxrSfz());
+            zxjl.setZlzxrXm(zxr.getZxrXm());
+        }
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("2");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    // 添加指令执行记录
+    private void addZlxxZxjl(TbZlxx zl, TbZlxxZxr zxr, String zt, String sm, TbZlxxZtChangeDto dto, UserInfo user) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt(zt);
+        String zxnr = user.getUserName();
+        zxjl.setZxnr(zxnr + sm);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            zxjl.setJd(dto.getJd());
+            zxjl.setWd(dto.getWd());
+            zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (zxr != null) {
+            zxjl.setSsbmdm(zxr.getSsbmdm());
+            zxjl.setSsbm(zxr.getSsbm());
+            zxjl.setSsbmid(zxr.getSsbmid());
+            zxjl.setSsxgaj(zxr.getSsxgaj());
+            zxjl.setSsxgajdm(zxr.getSsxgajdm());
+            zxjl.setSsxgajid(zxr.getSsxgajid());
+            zxjl.setSssgaj(zxr.getSssgaj());
+            zxjl.setSssgajdm(zxr.getSssgajdm());
+            zxjl.setSssgajid(zxr.getSssgajid());
+            zxjl.setZlzxrId(zxr.getZxrId());
+            zxjl.setZlzxrXzid(zxr.getZxrXzid());
+            zxjl.setZlzxrDh(zxr.getZxrDh());
+            zxjl.setZlzxrSfz(zxr.getZxrSfz());
+            zxjl.setZlzxrXm(zxr.getZxrXm());
+        }
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("2");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    // 添加指令执行记录
+    private void addZlxxZxjlOther(TbZlxx zl, TbZlxxZxr zxr, String zt, String sm, TbZlxxZtChangeDto dto, SysUser user) {
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt(zt);
+        String zxnr = user.getUserName();
+        zxjl.setZxnr(zxnr + sm);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            zxjl.setJd(dto.getJd());
+            zxjl.setWd(dto.getWd());
+            zxjl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        if (zxr != null) {
+            zxjl.setSsbmdm(zxr.getSsbmdm());
+            zxjl.setSsbm(zxr.getSsbm());
+            zxjl.setSsbmid(zxr.getSsbmid());
+            zxjl.setSsxgaj(zxr.getSsxgaj());
+            zxjl.setSsxgajdm(zxr.getSsxgajdm());
+            zxjl.setSsxgajid(zxr.getSsxgajid());
+            zxjl.setSssgaj(zxr.getSssgaj());
+            zxjl.setSssgajdm(zxr.getSssgajdm());
+            zxjl.setSssgajid(zxr.getSssgajid());
+            zxjl.setZlzxrId(zxr.getZxrId());
+            zxjl.setZlzxrXzid(zxr.getZxrXzid());
+            zxjl.setZlzxrDh(zxr.getZxrDh());
+            zxjl.setZlzxrSfz(zxr.getZxrSfz());
+            zxjl.setZlzxrXm(zxr.getZxrXm());
+        }
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("2");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    private TbZlxx addTrsZlxx(VwAlermYjzlVo yj, TbZlxx zl, VwAlermYjgl gl) {
+        zl = new TbZlxx();
+        zl.setId(yj.getId());
+        zl.setZllx("07");
+        zl.setZlly("07");
+        zl.setZlzxlx("1");
+        zl.setZlbt("预警人员《" + gl.getGlxm() + "（" + gl.getGlsfzh() + "）》");
+        zl.setZlnr(gl.getHdxq());
+        zl.setZlzxqk("系统发送了当前指令！");
+        zl.setZlfqrq(yj.getFbsj());
+        zl.setZlfqsj(yj.getFbsj());
+        zl.setYwId(yj.getZlbh());
+        String zldj;
+        switch (gl.getYjlyjbDm()) {
+            case "10":
+                zldj = "10";
+                break;
+            case "20":
+                zldj = "30";
+                break;
+            case "30":
+                zldj = "40";
+                break;
+            case "15":
+                zldj = "20";
+                break;
+            default:
+                zldj = "40";
+                break;
+        }
+        zl.setZldj(zldj);
+        zl.setZljsdx("01");
+        if ("未签收".equals(yj.getStatus())) {
+            zl.setQszt("01");
+            zl.setZlwjzt("91");
+            zl.setZlzxzt("01");
+        } else if ("正常签收".equals(yj.getStatus())) {
+            zl.setQszt("02");
+            zl.setZlzxzt("02");
+        } else if ("超时签收".equals(yj.getStatus())) {
+            zl.setQszt("03");
+            zl.setZlzxzt("03");
+        } else if ("正常反馈".equals(yj.getStatus()) || "超时反馈".equals(yj.getStatus())) {
+            zl.setZlzxzt("26");
+        }
+        zl.setQsyxsj(yj.getQssj());
+        zl.setZlwjyxsj(yj.getCzsj());
+        zl.setJd(gl.getHdjd());
+        zl.setWd(gl.getHdwd());
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        zl.setZlfsddxzqh(StringUtils.isNotBlank(gl.getSqrdwdh()) ? gl.getSqrdwdh().substring(0, 6) : "");
+        zl.setZlfsdd(gl.getHdfsdxz());
+        zl.setZlfqrId("-1");
+        zl.setZlfqr("系统");
+        zl.setZlfqrSfzh("000000");
+        zl.setXtSjly("1");
+        zl.setFjId(gl.getFileids());
+        zl.setZljsrs(yj.getUserList().size());
+        if (StringUtils.isNotBlank(gl.getSqrdwdh())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(gl.getSqrdwdh());
+            if (dept != null) {
+                zl.setSsbmid(dept.getDeptid());
+                zl.setSsbmdm(dept.getDeptcode());
+                zl.setSsbm(dept.getDeptname());
+                zl.setSsxgajid(dept.getFxjid());
+                zl.setSsxgajdm(dept.getFxjcode());
+                zl.setSsxgaj(dept.getFxjname());
+                zl.setSssgajid(dept.getDszid());
+                zl.setSssgajdm(dept.getDszcode());
+                zl.setSssgaj(dept.getDszname());
+            }
+        }
+        this.baseMapper.insertEntity(zl);
+        return zl;
+    }
+
+    @Override
+    @Transactional
+    public void addTrsZl(VwAlermYjzlVo zlVo) {
+        // 查询是否有当前指令
+        VwAlermYjgl gl = zlVo.getVwAlermYjgl();
+        TbZlxx zl = this.baseMapper.selectById(zlVo.getId());
+        if (zl == null) {
+            // 添加指令信息
+            zl = this.addTrsZlxx(zlVo, zl, gl);
+            // 添加指令签收人表
+            List<VwAlermYjzlUser> userList = zlVo.getUserList();
+            this.addZlzxrList(userList, zl);
+            // 添加指令人员子表
+            this.addZlry(zlVo, zl);
+        }
+    }
+
+    @Override
+    public void addTrsYj(VwAlermYjgl vo) {
+        TbYjxx yjxx = this.tbYjxxMapper.selectById(vo.getId());
+        if (yjxx == null) {
+            yjxx = this.addTrsYjxx(vo);
+            this.addYjxxRy(yjxx);
+        }
+    }
+
+    @Override
+    public void addZlxx(TbZlxxInsertDto dto) {
+        if (StringUtils.isEmpty(dto.getSfzh())) {
+            throw new BusinessException("缺失指令发送人身份证号");
+        }
+        if (StringUtils.isNotBlank(dto.getSsbmid())) {
+            DeptInfoVo deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+            if (deptInfoVo == null || StringUtils.isBlank(deptInfoVo.getDeptid())) {
+                deptInfoVo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmid());
+            }
+            if (deptInfoVo == null) {
+                throw new BusinessException("所属部门不存在");
+            }
+            dto.setSsbmid(deptInfoVo.getDeptid());
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        if (user == null) {
+            throw new BusinessException("用户不存在!");
+        }
+        TbZlxx zl = new TbZlxx();
+        BeanUtils.copyProperties(dto, zl);
+        zl.setZlly(zl.getZllx());
+        if ("2".equals(zl.getZlzxlx()) && ("02".equals(zl.getZljsdx()) || ("03").equals(zl.getZljsdx()))) {
+            throw new BusinessException("多人任务不允许发送给部门或巡组");
+        }
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        zl.setZlfqrId(String.valueOf(user.getId()));
+        zl.setZlfqrSfzh(user.getIdEntityCard());
+        zl.setZlfqr(user.getUserName());
+
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(String.valueOf(dto.getSsbmid()));
+        if (StringUtils.isBlank(dept.getDeptid())) {
+            dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        }
+        if (dept != null) {
+            zl.setSsbmdm(dept.getDeptcode());
+            zl.setSsbm(dept.getDeptname());
+            zl.setSsbmid(dept.getDeptid());
+            zl.setSsxgaj(dept.getFxjname());
+            zl.setSsxgajdm(dept.getFxjcode());
+            zl.setSsxgajid(dept.getFxjid());
+            zl.setSssgaj(dept.getDszname());
+            zl.setSssgajdm(dept.getDszcode());
+            zl.setSssgajid(dept.getDszid());
+            zl.setZlfsddxzqh(StringUtils.isNotBlank(dept.getDeptcode()) ? dept.getDeptcode().substring(0, 6) : null);
+        }
+        zl.setXtSjly("1");
+        zl.setId(UUIDGenerator.getUUID());
+        // 计算指令接收人数
+        // 签收有效时间
+        String qs = this.tbBaseAdaptRemoteService.getValue("ZLQSYXSJ");
+        int qsyxsj = qs == null ? 5 : Integer.parseInt(qs);
+        zl.setQsyxsj(DateUtils.getNextDate(new Date(), "m", qsyxsj));
+        // 到达有效时间
+        String dd = this.tbBaseAdaptRemoteService.getValue("ZLDDXCYXSJ");
+        int ddxcyxsj = dd == null ? 15 : Integer.parseInt(dd);
+        zl.setDdxcyxsj(DateUtils.getNextDate(new Date(), "m", ddxcyxsj));
+        // 完结有效时间
+        String wj = this.tbBaseAdaptRemoteService.getValue("ZLCZWJSJ");
+        int zlwjyxsj = wj == null ? 120 : Integer.parseInt(wj);
+        zl.setZlwjyxsj(DateUtils.getNextDate(new Date(), "m", zlwjyxsj));
+        this.totalZljsrs(dto, zl);
+        zl.setZlfqrq(new Date());
+        zl.setZlfqsj(new Date());
+        if (StringUtils.isBlank(zl.getZlzxlx())) {
+            zl.setZlzxlx("1");
+        }
+        zl.setQszt("01");
+        zl.setZlwjzt("91");
+        zl.setZlzxzt("01");
+        zl.setZlzxqk(DateUtils.getQueryDateString(new Date(), "02") + "," + zl.getZlfqr() + "下发了该指令！！");
+        this.baseMapper.insertEntity(zl);
+        // 添加指令执行人和指令执行记录
+        this.addZlxxZxrOther(zl, dto);
+        if ("04".equals(zl.getZllx())) {
+            this.addSjzl(zl);
+        } else if ("02".equals(zl.getZllx())) {
+            this.addRyZl(zl);
+        } else if ("03".equals(zl.getZllx())) {
+            this.addClZl(zl);
+        } else if ("06".equals(zl.getZllx())) {
+            this.addRgZl(zl, dto);
+        }
+    }
+
+    @Override
+    public void zlHandleOther(TbZlxxZtChangeDto dto) {
+        if (StringUtils.isEmpty(dto.getSfzh())) {
+            throw new BusinessException("处置人身份证号必须！");
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        if (user == null) {
+            throw new BusinessException("用户未找到！");
+        }
+        TbZlxx zl = this.tbZlxxMapper.selectById(dto.getZlId());
+        if (zl == null) {
+            throw new BusinessException("指令未找到！！");
+        }
+        TbZlxxZxr zxr = null;
+        if ("01".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrId, String.valueOf(user.getId()))
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        } else if ("02".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+                            .eq(TbZlxxZxr::getSsbmid, dto.getSsbmid())
+            );
+        } else if ("03".equals(dto.getZljsdx())) {
+            zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZxrXzid, dto.getZlzxrXzid())
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+            );
+        }
+        if (zxr == null) {
+            throw new BusinessException("执行人未找到！！");
+        }
+        // 签收状态
+        if ("01".equals(dto.getZlzxzt())) {
+            this.changeQsztOther(dto, zl, user, zxr);
+        } else if ("02".equals(dto.getZlzxzt())) {
+            // 到达状态
+            this.changeDdztOther(dto, zl, user, zxr);
+        } else if ("03".equals(dto.getZlzxzt())) {
+            // 处置完成
+            this.changeCzztOther(dto, zl, user, zxr);
+        } else if ("04".equals(dto.getZlzxzt())) {
+            // 完结
+            this.changeWjztOther(dto, zl, user, zxr);
+        } else if ("08".equals(dto.getZlzxzt())) {
+            // 转发
+            this.changeZfztOther(dto, zl, user, zxr);
+        }
+    }
+
+    @Override
+    public IPage<TbZlxxVo> getMySendZlList(MyZlSearchDto dto) {
+        if (StringUtils.isNotBlank(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 23:59:59");
+        }
+        UserInfo user = UserInfoManager.get();
+        if (user == null) return null;
+        List<String> ztList = new ArrayList<>();
+        List<String> lxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getZlzxzt())) {
+            ztList = Arrays.asList(dto.getZlzxzt().split(","));
+        }
+        if (StringUtils.isNotBlank(dto.getZllx())) {
+            lxList = Arrays.asList(dto.getZllx().split(","));
+        }
+        IPage<TbZlxx> page = this.baseMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbZlxx>()
+                        .like(StringUtils.isNotBlank(dto.getZlnr()), TbZlxx::getZlnr, dto.getZlnr())
+                        .ge(StringUtils.isNotBlank(dto.getKssj()), TbZlxx::getZlfqsj, dto.getKssj())
+                        .le(StringUtils.isNotBlank(dto.getJssj()), TbZlxx::getZlfqsj, dto.getJssj())
+                        .in(!CollectionUtils.isEmpty(ztList), TbZlxx::getZlzxzt, ztList)
+                        .in(!CollectionUtils.isEmpty(lxList), TbZlxx::getZllx, lxList)
+                        .eq(TbZlxx::getZlfqrId, user.getUserId())
+                        .orderByDesc(TbZlxx::getZlfqsj)
+        );
+        IPage<TbZlxxVo> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbZlxxVo> resList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbZlxxVo vo = new TbZlxxVo();
+                BeanUtils.copyProperties(item, vo);
+                resList.add(vo);
+            });
+        }
+        resPage.setTotal(page.getTotal());
+        resPage.setRecords(resList);
+        return resPage;
+    }
+
+    @Override
+    public void addZxjlOther(TbZlxxZxjlInsertDto dto) {
+        if (StringUtils.isEmpty(dto.getSfzh())) {
+            throw new BusinessException("身份证号必须！");
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        if (user == null) {
+            throw new BusinessException("用户未找到！");
+        }
+        TbZlxx zl = this.baseMapper.selectById(dto.getZlId());
+        if (zl == null) {
+            throw new BusinessException("没有找到当前指令信息！！");
+        }
+        TbZlxxZxjl zxjl = new TbZlxxZxjl();
+        BeanUtils.copyProperties(dto, zxjl);
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setZlId(zl.getId());
+        zxjl.setZxsj(new Date());
+        zxjl.setZlzxzt("05");
+        if (zl.getJd() != null && zl.getWd() != null) {
+            zxjl.setJd(zl.getJd());
+            zxjl.setWd(zl.getWd());
+            zxjl.setZb(JtsUtils.getPoint(zl.getJd(), zl.getWd()));
+            zxjl.setZbhash(GeoHashKit.encode(zl.getJd(), zl.getWd()));
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        zxjl.setSsbm(dept.getDeptname());
+        zxjl.setSsbmid(dept.getDeptid());
+        zxjl.setSsbmdm(dept.getDeptcode());
+        zxjl.setSsxgajdm(dept.getFxjcode());
+        zxjl.setSsxgajid(dept.getFxjid());
+        zxjl.setSsxgaj(dept.getFxjname());
+        zxjl.setSssgaj(dept.getDszname());
+        zxjl.setSssgajdm(dept.getDszcode());
+        zxjl.setSssgajid(dept.getDszid());
+        zxjl.setZlzxrId(String.valueOf(user.getId()));
+        zxjl.setZlzxrSfz(user.getIdEntityCard());
+        zxjl.setZlzxrXm(user.getUserName());
+        zxjl.setZlzxdd(zl.getZlfsdd());
+        zxjl.setXtSjly("1");
+        zxjl.setId(UUIDGenerator.getUUID());
+        this.tbZlxxZxjlMapper.insertEntity(zxjl);
+    }
+
+    @Override
+    public Integer getZlCount(String ssbmdm, String time, String zlzxzt) {
+        List<String> zxztList = StringUtils.isNotBlank(zlzxzt) ? Arrays.asList(zlzxzt.split(",")) : null;
+        try {
+//             ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(ssbmdm, null);
+            return this.tbZlxxZxrMapper.selectCount(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .likeRight(!StringUtils.isEmpty(ssbmdm), TbZlxxZxr::getSsbmdm, ssbmdm)
+                            .in(!CollectionUtils.isEmpty(zxztList), TbZlxxZxr::getDqzt, zxztList)
+                            .eq(TbZlxxZxr::getZlfqrq, time)
+            );
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    private TbYjxx addTrsYjxx(VwAlermYjgl gl) {
+        TbYjxx item = new TbYjxx();
+        item.setId(gl.getId());
+        item.setYjLx("6");
+        item.setYjLylx("01");
+        item.setYjFsnf(Integer.valueOf(DateUtils.getQueryDateString(gl.getHdfssj(), "13")));
+        item.setYjFsyf(Integer.valueOf(DateUtils.getQueryDateString(gl.getHdfssj(), "14")));
+        item.setYjFsny(Integer.valueOf(DateUtils.getQueryDateString(gl.getHdfssj(), "15")));
+        Calendar ca = Calendar.getInstance();
+        ca.setTime(gl.getHdfssj());
+        int yjfszs = ca.get(Calendar.WEEK_OF_YEAR);
+        item.setYjFszs(yjfszs);
+        item.setYjFsxs(Integer.valueOf(DateUtils.getQueryDateString(gl.getHdfssj(), "16")));
+        item.setYjFsrq(gl.getHdfssj());
+        item.setYjFssj(gl.getHdfssj());
+        item.setYjSj(gl.getHdfssj());
+        // 是否发送指令
+        item.setSfFszl(StringUtils.isBlank(gl.getYjzlid()) ? "0" : "1");
+        String yjdj;
+        switch (gl.getYjlyjbDm()) {
+            case "10":
+                yjdj = "10";
+                break;
+            case "20":
+                yjdj = "30";
+                break;
+            case "30":
+                yjdj = "40";
+                break;
+            case "15":
+                yjdj = "20";
+                break;
+            default:
+                yjdj = "40";
+                break;
+        }
+        item.setYjJb(yjdj);
+        item.setYjBt("预警人员《" + gl.getGlxm() + "（" + gl.getGlsfzh() + "）》");
+        item.setYjNr(gl.getHdxq());
+        int yjcs = this.tbYjxxMapper.countBySfzhOrCph(gl.getGlsfzh(), null);
+        int yjjrcs = this.tbYjxxMapper.countCurrentBySfzhOrCph(gl.getGlsfzh(), null);
+        yjcs = yjcs + 1;
+        yjjrcs = yjjrcs + 1;
+        item.setYjCs(yjcs);
+        item.setYjJrcs(yjjrcs);
+        item.setJd(gl.getHdjd());
+        item.setWd(gl.getHdwd());
+//        if (item.getJd() != null && item.getWd() != null) {
+//            item.setZb(JtsUtils.getPoint(item.getJd(), item.getWd()));
+//            item.setZbhash(GeoHashKit.encode(item.getJd(), item.getWd()));
+//        }
+        item.setYjDzXzqh(StringUtils.isNotBlank(gl.getSqrdwdh()) ? gl.getSqrdwdh().substring(0, 6) : null);
+        item.setYjDz(gl.getHdfsdd());
+        item.setYjRyxm(gl.getGlxm());
+        item.setYjRysfzh(gl.getGlsfzh());
+        if ("2".equals(gl.getYjlyDm())) {
+            item.setYjClcph(gl.getGlqthm());
+        }
+        this.saveYjbq(item, gl.getRyxl());
+        item.setYjTp(gl.getFileids());
+        item.setYjlyid("01");
+        item.setYjlyBqmc("拓尔思重点人员库");
+        if (StringUtils.isNotBlank(gl.getSqrdwdh())) {
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(gl.getSqrdwdh());
+            if (dept != null) {
+                item.setSsbm(dept.getDeptname());
+                item.setSsbmid(dept.getDeptid());
+                item.setSsbmdm(dept.getDeptcode());
+                item.setSsxgajdm(dept.getFxjcode());
+                item.setSsxgajid(dept.getFxjid());
+                item.setSsxgaj(dept.getFxjname());
+                item.setSssgaj(dept.getDszname());
+                item.setSssgajdm(dept.getDszcode());
+                item.setSssgajid(dept.getDszid());
+            }
+        }
+        item.setXtSjly("1");
+        this.tbYjxxMapper.insertEntity(item);
+        return item;
+    }
+
+    // 添加预警信息人员
+    private void addYjxxRy(TbYjxx yjxx) {
+        TbYjxxRy ryxx = new TbYjxxRy();
+        ryxx.setId(UUIDGenerator.getUUID());
+        ryxx.setYjId(yjxx.getId());
+        ryxx.setYjClid("");
+        ryxx.setYjGzyid(yjxx.getYjGzyid());
+        ryxx.setYjGzymc(yjxx.getYjGzymc());
+        ryxx.setYjFssj(yjxx.getYjFssj());
+        ryxx.setYjSj(yjxx.getYjSj());
+        ryxx.setYjJb(yjxx.getYjJb());
+        ryxx.setYjBt(yjxx.getYjBt());
+        ryxx.setYjNr(yjxx.getYjNr());
+        ryxx.setYjDzxzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjlyBqmc(yjxx.getYjlyBqmc());
+        ryxx.setYjZjlx("1");
+        ryxx.setYjZjhm(yjxx.getYjRysfzh());
+        ryxx.setYjRyxm(yjxx.getYjRyxm());
+        ryxx.setYjRyxb(IDCardUtil.getSex(yjxx.getYjRysfzh()));
+        ryxx.setYjRynl(IDCardUtil.getAge(yjxx.getYjRysfzh()));
+        ryxx.setYjRymz("");
+        ryxx.setYjRyjg(yjxx.getYjDzXzqh());
+        ryxx.setYjRyhjdXzqh(yjxx.getYjDzXzqh());
+        ryxx.setYjRyhjd("");
+        ryxx.setYjDz(yjxx.getYjDz());
+        ryxx.setTpId(yjxx.getYjTp());
+        ryxx.setJd(yjxx.getJd());
+        ryxx.setWd(yjxx.getWd());
+//        if (ryxx.getJd() != null && ryxx.getWd() != null) {
+//            ryxx.setZb(yjxx.getZb());
+//            ryxx.setZbhash(yjxx.getZbhash());
+//        }
+        ryxx.setYjRybq(yjxx.getYjbq());
+        ryxx.setYjRybqmc(yjxx.getYjbqmc());
+        ryxx.setSsbm(yjxx.getSsbm());
+        ryxx.setSsbmid(yjxx.getSsbmid());
+        ryxx.setSsxgajid(yjxx.getSsxgajid());
+        ryxx.setSssgajid(yjxx.getSssgajid());
+        ryxx.setSsbmdm(yjxx.getSsbmdm());
+        ryxx.setSsxgaj(yjxx.getSsxgaj());
+        ryxx.setSsxgajdm(yjxx.getSsxgajdm());
+        ryxx.setSssgaj(yjxx.getSssgaj());
+        ryxx.setSssgajdm(yjxx.getSssgajdm());
+        ryxx.setXtSjly("1");
+        this.tbYjxxRyMapper.insertEntity(ryxx);
+        saveTbYjxxRyBq(ryxx);
+    }
+
+    // 添加人员信息标签
+    private void saveTbYjxxRyBq(TbYjxxRy ryxx) {
+        TbYjxxRyBq rybq = new TbYjxxRyBq();
+        rybq.setId(UUIDGenerator.getUUID());
+        rybq.setYjryId(ryxx.getId());
+        rybq.setRybqdm(ryxx.getYjRybq());
+        rybq.setRybqmc(ryxx.getYjRybqmc());
+        rybq.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+        rybq.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        rybq.setXtScbz("0");
+        rybq.setXtSjzt("1");
+        rybq.setXtSjly("1");
+        this.tbYjxxRyBqMapper.insert(rybq);
+    }
+
+    private void saveYjbq(TbYjxx yjxx, String name) {
+        yjxx.setYjbqmc(name);
+        if (name.contains("控")) {
+            yjxx.setYjbq("1");
+        } else if (name.contains("在逃")) {
+            yjxx.setYjbq("2");
+        } else if (name.contains("毒")) {
+            yjxx.setYjbq("3");
+        } else if (name.contains("前科") || name.contains("盗") || name.contains("抢")) {
+            yjxx.setYjbq("4");
+        } else if (name.contains("精神") || name.contains("肇事") || name.contains("肇祸")) {
+            yjxx.setYjbq("5");
+        } else if (name.contains("涉恐")) {
+            yjxx.setYjbq("6");
+        } else if (name.contains("信访") || name.contains("上访")) {
+            yjxx.setYjbq("7");
+        } else if (name.contains("稳")) {
+            yjxx.setYjbq("8");
+        } else {
+            yjxx.setYjbq("9");
+        }
+    }
+
+    // 添加指令接收人员表
+    private void addZlzxrList(List<VwAlermYjzlUser> userList, TbZlxx zl) {
+        // 添加指令执行记录
+        List<TbZlxxZxr> zxrList = new ArrayList<>();
+        userList.forEach(user -> {
+            TbZlxxZxjl jl = new TbZlxxZxjl();
+            jl.setId(UUIDGenerator.getUUID());
+            jl.setZlId(zl.getId());
+            jl.setZxsj(user.getSigntime());
+            String zlzxzt = "";
+            String time = DateUtils.getQueryDateString(user.getSigntime() == null ? new Date() : user.getSigntime(), "02");
+            String zlzxnr = user.getUsername() + time;
+            if ("0".equals(user.getStatusCode())) {
+                zlzxzt = "00";
+                zlzxnr += "接收到该指令！！";
+            } else if ("1".equals(user.getStatusCode())) {
+                zlzxzt = "01";
+                zlzxnr += "签收了该指令";
+            } else if ("2".equals(user.getStatusCode())) {
+                zlzxzt = "02";
+                zlzxnr += "签收了该指令,超时签收！";
+            } else if ("3".equals(user.getStatusCode())) {
+                zlzxzt = "05";
+                zlzxnr += "下发了该指令";
+            } else if ("4".equals(user.getStatusCode())) {
+                zlzxzt = "04";
+                zlzxnr += "对该指令进行了反馈！";
+            } else if ("5".equals(user.getStatusCode())) {
+                zlzxzt = "04";
+                zlzxnr += "对该指令进行了反馈,反馈超时！！";
+            }
+            jl.setZxsj(DateUtils.strToDate(time, "02"));
+            jl.setZlzxzt(zlzxzt);
+            jl.setZxnr(zlzxnr);
+            jl.setZlzxddXzqhdm(StringUtils.isNotBlank(user.getUnitcode()) ? user.getUnitcode().substring(0, 6) : null);
+            SysUser sysUser = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(user.getIdcard());
+            if (sysUser != null) {
+                jl.setZlzxrId(String.valueOf(sysUser.getId()));
+                jl.setZlzxrDh(StringUtils.isNotBlank(sysUser.getTelePhone()) ? sysUser.getTelePhone() : sysUser.getMobile());
+            }
+            jl.setZlzxrXm(user.getUsername());
+            jl.setZlzxrSfz(user.getIdcard());
+            DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(user.getUnitcode());
+            if (dept != null) {
+                jl.setSsbmdm(dept.getDeptcode());
+                jl.setSsbm(dept.getDeptname());
+                jl.setSsbmid(dept.getDeptid());
+                jl.setSsxgaj(dept.getFxjname());
+                jl.setSsxgajdm(dept.getFxjcode());
+                jl.setSsxgajid(dept.getFxjid());
+                jl.setSssgaj(dept.getDszname());
+                jl.setSssgajdm(dept.getDszcode());
+                jl.setSssgajid(dept.getDszid());
+            }
+            jl.setSsbmdm(user.getUnitcode());
+            jl.setSsbm(user.getUnitname());
+            jl.setXtSjly("1");
+            this.tbZlxxZxjlMapper.insert(jl);
+            // 添加指令接收人（如果存在则修改）
+            TbZlxxZxr zxr = this.tbZlxxZxrMapper.selectOne(
+                    new LambdaQueryWrapper<TbZlxxZxr>()
+                            .eq(TbZlxxZxr::getZlId, zl.getId())
+                            .eq(TbZlxxZxr::getZxrSfz, user.getIdcard())
+                            .last(" limit 1")
+            );
+            String dqzt = "";
+            String dqztSm = user.getUsername() + time;
+            Date daztSj = user.getSigntime() == null ? new Date() : user.getSigntime();
+            if ("0".equals(user.getStatusCode())) {
+                dqzt = "01";
+                dqztSm += "接收到该指令！！";
+            } else if ("1".equals(user.getStatusCode())) {
+                dqzt = "02";
+                dqztSm += "签收了该指令";
+            } else if ("2".equals(user.getStatusCode())) {
+                dqzt = "03";
+                dqztSm += "签收了该指令,超时签收！";
+            } else if ("3".equals(user.getStatusCode())) {
+                dqzt = "05";
+                dqztSm += "下发了该指令";
+            } else if ("4".equals(user.getStatusCode())) {
+                dqzt = "27";
+                dqztSm += "对该指令进行了反馈！";
+            } else if ("5".equals(user.getStatusCode())) {
+                dqzt = "27";
+                dqztSm += "对该指令进行了反馈,反馈超时！！";
+            }
+            if (zxr == null) {
+                zxr = new TbZlxxZxr();
+                BeanUtils.copyProperties(zl, zxr);
+                zxr.setId(UUIDGenerator.getUUID());
+                zxr.setZlId(zl.getId());
+                zxr.setZxrLx("01");
+                if (sysUser != null) {
+                    zxr.setZxrId(String.valueOf(sysUser.getId()));
+                    zxr.setZxrDh(StringUtils.isNotBlank(sysUser.getTelePhone()) ? sysUser.getTelePhone() : sysUser.getMobile());
+                }
+                zxr.setZxrXm(user.getUsername());
+                zxr.setZxrSfz(user.getIdcard());
+                zxr.setZxrJllx("01");
+                zxr.setDqztSj(daztSj);
+                zxr.setDqzt(dqzt);
+                zxr.setDqztsm(dqztSm);
+                if (dept != null) {
+                    zxr.setSsbmdm(dept.getDeptcode());
+                    zxr.setSsbm(dept.getDeptname());
+                    zxr.setSsbmid(dept.getDeptid());
+                    zxr.setSsxgaj(dept.getFxjname());
+                    zxr.setSsxgajdm(dept.getFxjcode());
+                    zxr.setSsxgajid(dept.getFxjid());
+                    zxr.setSssgaj(dept.getDszname());
+                    zxr.setSssgajdm(dept.getDszcode());
+                    zxr.setSssgajid(dept.getDszid());
+                }
+                zxr.setSsbmdm(user.getUnitcode());
+                zxr.setSsbm(user.getUnitname());
+                zxr.setXtSjly("1");
+                this.tbZlxxZxrMapper.insert(zxr);
+            } else {
+                zxr.setDqztSj(daztSj);
+                zxr.setDqzt(dqzt);
+                zxr.setDqztsm(dqztSm);
+                this.tbZlxxZxrMapper.updateById(zxr);
+            }
+            zxrList.add(zxr);
+        });
+        this.addTask(zl, zxrList, null);
+    }
+
+    @Override
+    public IPage<TbZlYjRyVo> getSyrkZlxx(VwSyrkJzgjGxListQuery dto) {
+        String tempSfz = dto.getZjhm().substring(0, 6) + "********" + dto.getZjhm().substring(14);
+        IPage<TbZlYjRy> page = this.tbZlYjRyMapper.selectPage(
+                new Page<>(dto.getPageCurrent(), dto.getPageSize()),
+                new LambdaQueryWrapper<TbZlYjRy>()
+                        .eq(TbZlYjRy::getXtSjzt, "1")
+                        .and(
+                                it -> it.eq(TbZlYjRy::getZlZjhm, dto.getZjhm()).or()
+                                        .eq(TbZlYjRy::getZlZjhm, tempSfz)
+                        )
+                        .orderByDesc(TbZlYjRy::getYjSj)
+        );
+        IPage<TbZlYjRyVo> resPage = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        List<TbZlYjRyVo> list = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(page.getRecords())) {
+            page.getRecords().forEach(item -> {
+                TbZlYjRyVo vo = new TbZlYjRyVo();
+                BeanUtils.copyProperties(item, vo);
+                list.add(vo);
+            });
+        }
+        resPage.setTotal(page.getTotal());
+        resPage.setRecords(list);
+        return resPage;
+    }
+
+    @Override
+    public List<Map<String, Object>> getTjOfZllx(String type) {
+        String kssj = "", jssj = "";
+        if ("1".equals(type)) {
+            kssj = DateUtils.getQueryDateString(new Date(), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("2".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -7), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("3".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -30), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        } else if ("4".equals(type)) {
+            kssj = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "D", -90), "01");
+            jssj = DateUtils.getQueryDateString(new Date(), "01");
+        }
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+
+        return this.baseMapper.getTjOfZllx(kssj, jssj, ssbm);
+    }
+
+    @Override
+    public TbZlxx getLastZlxx() {
+        return this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbZlxx>()
+                        .eq(TbZlxx::getZllx, "07")
+                        .orderByDesc(TbZlxx::getZlfqsj)
+                        .last(" limit 1")
+        );
+    }
+
+    @Override
+    public Map<String, Object> getStatisticsByStatus() {
+        UserInfo user = UserInfoManager.get();
+        Map<String, Object> map = new HashMap<>();
+        map.put("all", this.baseMapper.getStatisticsByStatus(user.getIdEntityCard(), String.valueOf(user.getDeptId()), "1"));
+        map.put("wwc", this.baseMapper.getStatisticsByStatus(user.getIdEntityCard(), String.valueOf(user.getDeptId()), "2"));
+        return map;
+    }
+
+    // 添加人员指令子表
+    private void addZlry(VwAlermYjzlVo yj, TbZlxx zl) {
+        VwAlermYjgl gl = yj.getVwAlermYjgl();
+        TbZlYjRy ry = new TbZlYjRy();
+        BeanUtils.copyProperties(zl, ry);
+        ry.setId(UUIDGenerator.getUUID());
+        ry.setZlId(gl.getYjzlid());
+        ry.setZldj(zl.getZldj());
+        ry.setZlfsrq(zl.getZlfqrq());
+        ry.setZlfssj(zl.getZlfqsj());
+        ry.setZlBt(zl.getZlbt());
+        ry.setZlNr(zl.getZlnr());
+        ry.setZlRybqmc(gl.getRyxl());
+        ry.setZlRybq(this.getRybqdm(gl.getRyxl()));
+        ry.setZlZjlx("1");
+        ry.setZlZjhm(gl.getGlsfzh());
+        ry.setZlRyxm(gl.getGlxm());
+        ry.setZlRyxb(IDCardUtil.getAge(gl.getGlsfzh()) + "");
+        ry.setZlRynl(IDCardUtil.getSexInteger(gl.getGlsfzh()));
+        ry.setZlRyjg(gl.getGlsfzh().substring(0, 6));
+        ry.setZlRyhjdXzqh(gl.getGlsfzh().substring(0, 6));
+        if (zl.getJd() != null && zl.getWd() != null) {
+            ry.setJd(zl.getJd());
+            ry.setWd(zl.getWd());
+            ry.setZb(JtsUtils.getPoint(ry.getJd(), ry.getWd()));
+            ry.setZbhash(GeoHashKit.encode(ry.getJd(), ry.getWd()));
+        }
+        ry.setYjDz(zl.getZlfsdd());
+        ry.setTpId(zl.getFjId());
+        ry.setCoverImage(zl.getZltp());
+        this.tbZlYjRyMapper.insertEntity(ry);
+    }
+
+    private String getRybqdm(String name) {
+        String bqdm;
+        if (name.contains("控")) {
+            bqdm = "1";
+        } else if (name.contains("在逃")) {
+            bqdm = "2";
+        } else if (name.contains("毒")) {
+            bqdm = "3";
+        } else if (name.contains("前科") || name.contains("盗") || name.contains("抢")) {
+            bqdm = "4";
+        } else if (name.contains("精神") || name.contains("肇事") || name.contains("肇祸")) {
+            bqdm = "5";
+        } else if (name.contains("涉恐")) {
+            bqdm = "6";
+        } else if (name.contains("信访") || name.contains("上访")) {
+            bqdm = "7";
+        } else if (name.contains("稳")) {
+            bqdm = "8";
+        } else {
+            bqdm = "9";
+        }
+        return bqdm;
+    }
+
+    @Override
+    public Map<String, Integer> yjzlTj() {
+        Map<String, Integer> zlMap = new HashMap();
+        String ssbm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+        //统计预警指令
+        //进行中
+        Integer jx = this.baseMapper.selectCount(new LambdaQueryWrapper<TbZlxx>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbZlxx::getSsbmdm, ssbm)
+                .ge(TbZlxx::getZlfqrq, DateUtils.getSystemDateString())
+                .notIn(TbZlxx::getZlzxzt, "01,32,91,92,93,94")
+        );
+        zlMap.put("jx", jx);
+        //完成
+        Integer wc = this.baseMapper.selectCount(new LambdaQueryWrapper<TbZlxx>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbZlxx::getSsbmdm, ssbm)
+                .ge(TbZlxx::getZlfqrq, DateUtils.getSystemDateString())
+                .in(TbZlxx::getZlzxzt, "32,91,92,93,94")
+        );
+        zlMap.put("wc", wc);
+        //犯罪预测
+        Integer fzyc = this.tbFzycMapper.selectCount(new LambdaQueryWrapper<TbFzyc>()
+                .likeRight(StringUtils.isNotBlank(ssbm), TbFzyc::getSsbmdm, ssbm)
+                .ge(TbFzyc::getRealDate, DateUtils.getShortCompactString(new Date()))
+        );
+        zlMap.put("fzyc", fzyc);
+        return zlMap;
+    }
+
+    @Override
+    public void andJqZl(String ssbmid, String jqid, String bbids, String zlxflx) {
+        if (StringUtils.isEmpty(jqid) || StringUtils.isEmpty(bbids)) throw new BusinessException("警情id和报备id不能为空！");
+        TbJqVo jq = this.tbSjzxAdaptRemoteService.getJqInfo(jqid);
+        if (ObjectUtils.isNotEmpty(jq)) {
+            List<String> list = Arrays.asList(bbids.split(","));
+            TbZlxxInsertDto dto = new TbZlxxInsertDto();
+            dto.setYwId(jqid);
+            dto.setZllx("05");
+            dto.setZlly("05");
+            if (list.size() > 1) {
+                dto.setZlzxlx("2");
+            } else {
+                dto.setZlzxlx("1");
+            }
+            dto.setZlbt(jq.getBjlxmc());
+            dto.setZlnr(jq.getBjnr());
+            switch (jq.getJqjb()) {
+                case "01":
+                    dto.setZldj("10");
+                    break;
+                case "02":
+                    dto.setZldj("20");
+                    break;
+                case "03":
+                    dto.setZldj("30");
+                    break;
+                default:
+                    dto.setZldj("40");
+                    break;
+            }
+            dto.setZljsdx("03");
+            dto.setJd(jq.getJd());
+            dto.setWd(jq.getWd());
+            dto.setZlfsddxzqh(jq.getSfdzxzqh());
+            dto.setZlfsdd(jq.getSfdz());
+            List<TbZlxxZxrDtoInsertDto> insertDtoList = new ArrayList<>();
+            for (String bbid : list) {
+                TbZlxxZxrDtoInsertDto zxrDtoInsertDto = new TbZlxxZxrDtoInsertDto();
+                zxrDtoInsertDto.setZxrLx("03");
+                zxrDtoInsertDto.setZxrXzid(bbid);
+                insertDtoList.add(zxrDtoInsertDto);
+            }
+            dto.setZxrDtoList(insertDtoList);
+            dto.setSsbmid(ssbmid);
+            dto.setZlxflx(zlxflx);
+            this.addZl(dto);
+        }
+
+
+    }
+
+    @Override
+    public void andYjZl(String yjid, String bbids) {
+        if (StringUtils.isEmpty(yjid) || StringUtils.isEmpty(bbids)) throw new BusinessException("预警id和报备id不能为空！");
+        TbYjxx yjxx = this.tbYjxxMapper.selectById(yjid);
+        if (ObjectUtils.isNotEmpty(yjxx)) {
+            List<String> list = Arrays.asList(bbids.split(","));
+            TbZlxxInsertDto dto = new TbZlxxInsertDto();
+            dto.setYwId(yjid);
+
+            if (StringUtils.isNotBlank(yjxx.getYjLx()) && yjxx.getYjLx().equals("2")) {
+                dto.setZllx("03"); //车辆预警
+                dto.setZlly("03");
+            } else {
+                dto.setZllx("02"); //车辆预警
+                dto.setZlly("02");
+            }
+            if (list.size() > 1) {
+                dto.setZlzxlx("2");
+            } else {
+                dto.setZlzxlx("1");
+            }
+            dto.setZlbt(yjxx.getYjBt());
+            dto.setZlnr(yjxx.getYjNr());
+            dto.setZldj(yjxx.getYjJb());
+            dto.setZljsdx("03");
+            dto.setJd(yjxx.getJd());
+            dto.setWd(yjxx.getWd());
+            dto.setZlfsddxzqh(yjxx.getYjDzXzqh());
+            dto.setZlfsdd(yjxx.getYjDz());
+            dto.setZltp(yjxx.getYjTp());
+            List<TbZlxxZxrDtoInsertDto> insertDtoList = new ArrayList<>();
+            for (String bbid : list) {
+                TbZlxxZxrDtoInsertDto zxrDtoInsertDto = new TbZlxxZxrDtoInsertDto();
+                zxrDtoInsertDto.setZxrLx("03");
+                zxrDtoInsertDto.setZxrXzid(bbid);
+                insertDtoList.add(zxrDtoInsertDto);
+            }
+            dto.setZxrDtoList(insertDtoList);
+            this.addZl(dto);
+        }
+
+    }
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxZxjlServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxZxjlServiceImpl.java
new file mode 100644
index 0000000..4988198
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZlxxZxjlServiceImpl.java
@@ -0,0 +1,360 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglXfllVo;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.yjzl.CyjlSearchDto;
+import com.mosty.base.model.dto.yjzl.MyZlSearchDto;
+import com.mosty.base.model.dto.yjzl.NewZxjlSearchDto;
+import com.mosty.base.model.dto.yjzl.third.ThirdMyZlSearchDto;
+import com.mosty.base.model.dto.yjzl.third.ThirdZlInfoSearchDto;
+import com.mosty.base.model.query.jcgl.TbJcglXfllQueryAllDto;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxInfoVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxZxjlVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxZxrVo;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.core.business.entity.SysUser;
+import com.mosty.common.core.business.entity.vo.SysUserVO;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxjl;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxr;
+import com.mosty.base.model.query.yjzl.TbZlxxZxjlQuery;
+import com.mosty.yjzl.mapper.TbZlxxMapper;
+import com.mosty.yjzl.mapper.TbZlxxZxjlMapper;
+import com.mosty.yjzl.mapper.TbZlxxZxrMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.remote.TbJcglAdaptRemoteService;
+import com.mosty.yjzl.remote.TbQwzxAdaptRemoteService;
+import com.mosty.yjzl.service.TbZlxxZxjlService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 指令-执行过程表 服务实现类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+@AllArgsConstructor
+@Service
+public class TbZlxxZxjlServiceImpl extends ServiceImpl<TbZlxxZxjlMapper, TbZlxxZxjl> implements TbZlxxZxjlService {
+
+    private final TbZlxxZxrMapper tbZlxxZxrMapper;
+    private final TbZlxxMapper tbZlxxMapper;
+    private final TbZlxxZxjlMapper tbZlxxZxjlMapper;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public List<TbZlxxZxjl> queryList(TbZlxxZxjlQuery zxjl) {
+        QueryWrapper<TbZlxxZxjl> queryWrapper = new QueryWrapper<>();
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        zxjl.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(zxjl.getSsbmdm(), null));
+
+        queryWrapper.lambda().eq(TbZlxxZxjl::getXtScbz, "0")
+        .eq(StringUtils.isNotBlank(zxjl.getZlId()), TbZlxxZxjl::getZlId, zxjl.getZlId())
+        .likeRight(StringUtils.isNotBlank(zxjl.getSsbmdm()), TbZlxxZxjl::getSsbmdm, zxjl.getSsbmdm())
+        .like(StringUtils.isNotBlank(zxjl.getZlzxzt()), TbZlxxZxjl::getZlzxzt, zxjl.getZlzxzt());
+        return this.baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public int insert(TbZlxxZxjl zxjl) {
+        zxjl.setId(UUIDGenerator.getUUID());
+        zxjl.setXtSjly("2");
+        UserInfo user = UserInfoManager.get();
+        zxjl.setSsbm(user.getDeptName());
+        zxjl.setSsbmid(String.valueOf(user.getDeptId()));
+        zxjl.setSsbmdm(user.getDeptCode());
+        zxjl.setSsxgaj(user.getFxjDeptName());
+        zxjl.setSsxgajid(String.valueOf(user.getFxjDeptId()));
+        zxjl.setSsxgajdm(user.getFxjDeptCode());
+        zxjl.setSssgaj(user.getDszDeptName());
+        zxjl.setSssgajid(String.valueOf(user.getDszDeptId()));
+        zxjl.setSssgajdm(user.getDszDeptCode());
+        return this.baseMapper.insert(zxjl);
+    }
+
+    @Override
+    public int update(TbZlxxZxjl zxjl) {
+        zxjl.setXtZhgxsj(new Timestamp(System.currentTimeMillis()));
+        return this.baseMapper.updateById(zxjl);
+    }
+
+    @Override
+    public int deleteById(List<String> list) {
+        return this.baseMapper.deleteZxjl(list);
+    }
+
+    @Override
+    public List<Map<String, Object>> getCyjlList(CyjlSearchDto dto) {
+        List<TbZlxx> zlList = this.tbZlxxMapper.selectList(
+                new LambdaQueryWrapper<TbZlxx>()
+                        .eq(TbZlxx::getYwId, dto.getSjid())
+        );
+        if (CollectionUtils.isEmpty(zlList)) return null;
+        List<String> zlidList = zlList.stream().map(TbZlxx::getId).collect(Collectors.toList());
+        List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(new LambdaQueryWrapper<TbZlxxZxr>().in(TbZlxxZxr::getZlId, zlidList));
+        List<Map<String, Object>> list = new ArrayList<>();
+        zxrList.forEach(item -> {
+            if ("01".equals(item.getZxrLx())) {
+                List<Map<String, Object>> tempList = list.stream().filter(it -> it.get("sfz").equals(item.getZxrSfz())).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(tempList)) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("xm", item.getZxrXm());
+                    map.put("sfz", item.getZxrSfz());
+                    map.put("dh", item.getZxrDh());
+                    map.put("ssbm", item.getSsbm());
+                    map.put("fl", item.getZxrJllx());
+                    list.add(map);
+                }
+            } else if ("02".equals(item.getZxrLx())) {
+                // 查询该部门下的所有的巡防力量
+                TbJcglXfllQueryAllDto queryAllDto = new TbJcglXfllQueryAllDto();
+                queryAllDto.setDeptid(item.getSsbmid());
+                List<TbJcglXfllVo> llList = this.tbJcglAdaptRemoteService.getXfll(queryAllDto);
+                llList.forEach(ll -> {
+                    List<Map<String, Object>> tempList = list.stream().filter(it -> it.get("sfz").equals(ll.getSfzh())).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(tempList)) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("xm", ll.getXm());
+                        map.put("sfz", ll.getSfzh());
+                        map.put("dh", ll.getLxdh());
+                        map.put("ssbm", ll.getSsbm());
+                        map.put("fl", ll.getFl());
+                        list.add(map);
+                    }
+                });
+            } else if ("03".equals(item.getZxrLx())) {
+                // 查询巡组信息
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(item.getZxrXzid());
+                if (bb != null) {
+                    List<Map<String, Object>> tempList = list.stream().filter(it -> it.get("sfz").equals(bb.getFzrSfzh())).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(tempList)) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("xm", bb.getFzrXm());
+                        map.put("sfz", bb.getFzrSfzh());
+                        map.put("dh", bb.getFzrLxdh());
+                        map.put("ssbm", bb.getSsbm());
+                        map.put("fl", "01");
+                        list.add(map);
+                    }
+                    if (!CollectionUtils.isEmpty(bb.getJlList())) {
+                        bb.getJlList().forEach(jl -> {
+                            if (jl != null && jl.getSfzh() != null) {
+                                List<Map<String, Object>> jlTempList = list.stream().filter(it -> it.get("sfz").equals(jl.getSfzh())).collect(Collectors.toList());
+                                if (CollectionUtils.isEmpty(jlTempList)) {
+                                    Map<String, Object> map = new HashMap<>();
+                                    map.put("xm", jl.getJlxm());
+                                    map.put("sfz", jl.getSfzh());
+                                    map.put("dh", jl.getLxdh());
+                                    map.put("ssbm", jl.getSsbm());
+                                    map.put("fl", jl.getJllx());
+                                    list.add(map);
+                                }
+                            }
+                        });
+                    }
+                }
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public List<TbQwXfbbVo> getXczbList(String sjid) {
+        List<TbZlxx> zlList = this.tbZlxxMapper.selectList(new LambdaQueryWrapper<TbZlxx>().eq(TbZlxx::getYwId, sjid));
+        if (CollectionUtils.isEmpty(zlList)) {
+            return null;
+        }
+        List<String> zlidList = zlList.stream().map(TbZlxx::getId).collect(Collectors.toList());
+        List<TbZlxxZxr> zxrList = this.tbZlxxZxrMapper.selectList(new LambdaQueryWrapper<TbZlxxZxr>().in(TbZlxxZxr::getZlId, zlidList));
+        List<TbQwXfbbVo> list = new ArrayList<>();
+        for (TbZlxxZxr item : zxrList) {
+            if ("03".equals(item.getZxrLx())) {
+                TbQwXfbbVo bb = this.tbQwzxAdaptRemoteService.getBbInfo(item.getZxrXzid());
+                if (bb != null) {
+                    List<TbQwXfbbVo> temp = list.stream().filter(it -> it.getId().equals(bb.getId())).collect(Collectors.toList());
+                    if (CollectionUtils.isEmpty(temp)) {
+                        list.add(bb);
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> getMyZlCount() {
+        UserInfo user = UserInfoManager.get();
+        if (user == null) {
+            return null;
+        }
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("sfz", user.getIdEntityCard());
+        mp.put("ssbmid", String.valueOf(user.getDeptId()));
+        return this.tbZlxxMapper.getMyZlCount(mp);
+    }
+
+    @Override
+    public IPage<TbZlxxZxrVo> getMyZlList(MyZlSearchDto dto) {
+        if (StringUtils.isNotBlank(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 23:59:59");
+        }
+        UserInfo user = UserInfoManager.get();
+        if (user == null) return null;
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("sfz", user.getIdEntityCard());
+        mp.put("ssbmid", String.valueOf(user.getDeptId()));
+        List<String> ztList = new ArrayList<>();
+        List<String> lxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getZlzxzt())) {
+            ztList = Arrays.asList(dto.getZlzxzt().split(","));
+        }
+        if (StringUtils.isNotBlank(dto.getZllx())) {
+            lxList = Arrays.asList(dto.getZllx().split(","));
+        }
+        mp.put("ztList", ztList);
+        mp.put("zlnr", dto.getZlnr());
+        mp.put("lxList", lxList);
+        mp.put("kssj", dto.getKssj());
+        mp.put("jssj", dto.getJssj());
+        mp.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        mp.put("pageSize", dto.getPageSize());
+        int count = this.tbZlxxMapper.getMyZlCountBy(mp);
+        List<TbZlxxZxrVo> rList = this.tbZlxxMapper.getMyZlList(mp);
+        IPage<TbZlxxZxrVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    public List<TbZlxxZxjlVo> getNewZxjl(NewZxjlSearchDto dto) {
+        List<TbZlxxZxjl> jlList = this.tbZlxxZxjlMapper.selectList(
+                new LambdaQueryWrapper<TbZlxxZxjl>()
+                        .eq(TbZlxxZxjl::getZlId, dto.getZlid())
+                        .gt(StringUtils.isNotBlank(dto.getTime()), TbZlxxZxjl::getZxsj, dto.getTime())
+                        .orderByAsc(TbZlxxZxjl::getZxsj)
+                        .orderByDesc(TbZlxxZxjl::getFjid)
+        );
+        List<TbZlxxZxjlVo> voList = new ArrayList<>();
+        jlList.forEach(item -> {
+            TbZlxxZxjlVo vo = new TbZlxxZxjlVo();
+            BeanUtils.copyProperties(item, vo);
+            voList.add(vo);
+        });
+        return voList;
+    }
+
+    @Override
+    public List<Map<String, Object>> getStatistics(String sfzh) {
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(sfzh);
+        if (user == null) {
+            throw new BusinessException("用户不存在！");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        if (dept == null) {
+            throw new BusinessException("用户未分配任何部门！");
+        }
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("sfz", user.getIdEntityCard());
+        mp.put("ssbmid", String.valueOf(dept.getDeptid()));
+        return this.tbZlxxMapper.getStatistics(mp);
+    }
+
+    @Override
+    public IPage<TbZlxxZxrVo> getPageList(ThirdMyZlSearchDto dto) {
+        if (StringUtils.isBlank(dto.getSfzh())) {
+            throw new BusinessException("身份证号不能为空");
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        if (user == null) {
+            throw new BusinessException("用户不存在！");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        if (dept == null) {
+            throw new BusinessException("用户未分配任何部门！");
+        }
+        if (StringUtils.isNotBlank(dto.getKssj())) {
+            dto.setKssj(dto.getKssj() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getJssj())) {
+            dto.setJssj(dto.getJssj() + " 23:59:59");
+        }
+        Map<String, Object> mp = new HashMap<>();
+        mp.put("sfz", user.getIdEntityCard());
+        mp.put("ssbmid", String.valueOf(dept.getDeptid()));
+        List<String> ztList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getZlzxzt())) {
+            ztList = Arrays.asList(dto.getZlzxzt().split(","));
+        }
+        List<String> lxList = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getZllx())) {
+            lxList = Arrays.asList(dto.getZllx().split(","));
+        }
+        mp.put("ztList", ztList);
+        mp.put("zlnr", dto.getZlnr());
+        mp.put("lxList", lxList);
+        mp.put("kssj", dto.getKssj());
+        mp.put("jssj", dto.getJssj());
+        mp.put("pageIndex", (dto.getPageCurrent() - 1) * dto.getPageSize());
+        mp.put("pageSize", dto.getPageSize());
+        mp.put("time", dto.getTime());
+        int count = this.tbZlxxMapper.getMyZlCountBy(mp);
+        List<TbZlxxZxrVo> rList = this.tbZlxxMapper.getMyZlList(mp);
+        IPage<TbZlxxZxrVo> page = new Page<>(dto.getPageCurrent(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(rList);
+        return page;
+    }
+
+    @Override
+    public TbZlxxInfoVo getInfo(ThirdZlInfoSearchDto dto) {
+        if (StringUtils.isBlank(dto.getSfzh())) {
+            throw new BusinessException("身份证号不能为空");
+        }
+        SysUser user = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(dto.getSfzh());
+        if (user == null) {
+            throw new BusinessException("用户不存在！");
+        }
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getDeptInfoByUserId(String.valueOf(user.getId()));
+        if (dept == null) {
+            throw new BusinessException("用户未分配任何部门！");
+        }
+        TbZlxx zlxx = this.tbZlxxMapper.selectById(dto.getZlid());
+        TbZlxxInfoVo vo = new TbZlxxInfoVo();
+        BeanUtils.copyProperties(zlxx, vo);
+        TbZlxxZxr zxr = this.tbZlxxMapper.selectZxr(dto.getZlid(), dept.getDeptid(), user.getIdEntityCard());
+        if (zxr != null) {
+            TbZlxxZxrVo zxrVo = new TbZlxxZxrVo();
+            BeanUtils.copyProperties(zxr, zxrVo);
+            vo.setZxrVo(zxrVo);
+        }
+        return vo;
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZxzbServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZxzbServiceImpl.java
new file mode 100644
index 0000000..08af144
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/TbZxzbServiceImpl.java
@@ -0,0 +1,382 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.jcgl.TbJcglXfqyDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxInsertDto;
+import com.mosty.base.model.dto.yjzl.TbZlxxZxrDtoInsertDto;
+import com.mosty.base.model.entity.qwzx.TbQwXfbb;
+import com.mosty.base.model.entity.sjzx.TbJq;
+import com.mosty.base.model.entity.yjzl.*;
+import com.mosty.base.model.query.yjzl.TbZxzbQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.utils.Constant;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.base.utils.Kit;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.common.redis.service.RedisService;
+import com.mosty.yjzl.cluster.DistanceRunnable;
+import com.mosty.yjzl.cluster.NeighborDTO;
+import com.mosty.yjzl.cluster.WGS84Point;
+import com.mosty.yjzl.mapper.*;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.remote.TbJcglAdaptRemoteService;
+import com.mosty.yjzl.remote.TbQwzxAdaptRemoteService;
+import com.mosty.yjzl.service.TbZlxxService;
+import com.mosty.yjzl.service.TbZxzbService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.locationtech.jts.geom.Coordinate;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+
+/**
+ * 中心坐标服务器
+ */
+@Service
+@AllArgsConstructor
+public class TbZxzbServiceImpl extends ServiceImpl<TbZxzbMapper, TbZxzb>
+        implements TbZxzbService {
+
+    private final TbYjxxMapper tbYjxxMapper;
+    private final TbFzycMapper tbFzycMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbJcglAdaptRemoteService tbJcglAdaptRemoteService;
+    private final TbFzycJsdxMapper tbFzycJsdxMapper;
+    private final TbQwzxAdaptRemoteService tbQwzxAdaptRemoteService;
+    private final TbZlxxService tbZlxxService;
+    private final TbFzycXfxzMapper tbFzycXfxzMapper;
+    private final RedisService redisService;
+
+    @Override
+    public IPage<TbZxzb> queryListPage(TbZxzbQuery zxzbQuery) {
+        IPage<TbZxzb> page = this.baseMapper.selectPage(
+                new Page<>(zxzbQuery.getPageNum(), zxzbQuery.getPageSize()),
+                new LambdaQueryWrapper<TbZxzb>()
+                        .eq(TbZxzb::getZblx, zxzbQuery.getZblx())
+                        .eq(StringUtils.isNotBlank(zxzbQuery.getZbrq()), TbZxzb::getZbrq, zxzbQuery.getZbrq())
+                        .orderByDesc(TbZxzb::getZxdsl)
+        );
+        return page;
+    }
+
+    @Override
+    public List<TbZxzb> queryList(TbZxzbQuery zxzbQuery) {
+        List<TbZxzb> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbZxzb>()
+                        .eq(TbZxzb::getZblx, zxzbQuery.getZblx())
+                        .eq(StringUtils.isNotBlank(zxzbQuery.getZbrq()), TbZxzb::getZbrq, zxzbQuery.getZbrq())
+                        .orderByDesc(TbZxzb::getZxdsl)
+        );
+        return list;
+    }
+
+    @Override
+    public void computeCenter(String startTime, String endTime) {
+        if (StringUtils.isEmpty(endTime)) {
+            endTime = DateUtils.getHDateString();
+        }
+        if (StringUtils.isEmpty(startTime)) {
+            String queryDateString = DateUtils.getQueryDateString(new Date(), "16");
+            if (queryDateString.equals("09")) {
+                startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "H", -8), "02");
+            } else {
+                startTime = DateUtils.getQueryDateString(DateUtils.getNextDate(new Date(), "H", -4), "02");
+            }
+
+        }
+//        int xldw = 1;//默认相邻点位10
+//        String xldws = tbBaseAdaptRemoteService.getValue("ZXZB_XLDWSL");
+//        if (StringUtils.isNotBlank(xldws)) {
+//            //有配置取配置相邻点位
+//            xldw = Integer.valueOf(xldws);
+//        }
+
+        //用于定位本地获取方块区域
+        String uuid = UUIDGenerator.getUUID();
+
+        List<TbJq> jqList = this.tbYjxxMapper.queryJq(startTime, endTime);
+        Set<WGS84Point> points = new HashSet<>();
+        if (!CollectionUtils.isEmpty(jqList)) {
+            for (TbJq jq : jqList) {
+                if (jq.getJd() != null && jq.getWd() != null) {
+                    points.add(new WGS84Point(jq.getWd().doubleValue(), jq.getJd().doubleValue(), jq.getSsbmdm()));
+                }
+            }
+        }
+        if (points.size() > 0) {
+            this.baseMapper.deleteAll("01");
+            ScheduledExecutorService threadPool = Executors.newScheduledThreadPool(100);
+            List<NeighborDTO> neighborList = Collections.synchronizedList(new ArrayList<>(30000));
+//            int counter = 0;
+            for (WGS84Point point : points) {
+                // 计算每个点一定范围内所有点坐标
+                threadPool.execute(new DistanceRunnable(point, points, neighborList, 1000));
+//                System.out.println(++counter);
+            }
+            // 等待线程池执行完毕
+            while (neighborList.size() != points.size()) {
+                System.out.println(neighborList.size());
+            }
+            threadPool.shutdown();
+            // 排序
+            Collections.sort(neighborList);
+            // 筛选
+            Map<WGS84Point, Long> map = new HashMap<>();
+            Iterator<NeighborDTO> it = neighborList.iterator();
+            while (it.hasNext()) {
+                NeighborDTO neighborDTO = (NeighborDTO) it.next();
+                Map<WGS84Point, Long> neighbors = neighborDTO.getNeighbors();
+                if (map.containsKey(neighborDTO.getPoint())) {
+                    it.remove();
+                }
+                map.putAll(neighbors);
+            }
+            if (!CollectionUtils.isEmpty(neighborList)) {
+                //查询所有巡防区
+                List<TbJcglXfqyDto> listXfqyAll = this.tbJcglAdaptRemoteService.getListXfqyAll();
+
+
+                Map<String, List<TbFzycJsdx>> xqMap = new HashMap<>();
+                //查询最后一条数据的的标示
+                TbFzyc fzyc1 = this.tbFzycMapper.selectOne(new LambdaQueryWrapper<TbFzyc>().orderByDesc(TbFzyc::getXtCjsj).last(" limit 1"));
+                if (ObjectUtils.isNotEmpty(fzyc1)) {
+                    String dwId = fzyc1.getDwId();
+                    if (StringUtils.isNotEmpty(dwId)) {
+                        List<TbFzycJsdx> tbFzycJsdxes = this.tbFzycJsdxMapper.selectList(new LambdaQueryWrapper<TbFzycJsdx>().eq(TbFzycJsdx::getDwId, dwId).isNotNull(TbFzycJsdx::getXfqId));
+                        if (ObjectUtils.isNotEmpty(tbFzycJsdxes)) {
+                            xqMap = tbFzycJsdxes.stream().filter(s -> StringUtils.isNotEmpty(s.getXfqId())).collect(Collectors.groupingBy(TbFzycJsdx::getXfqId));
+                        }
+                    }
+                }
+                List<TbFzyc> fzycList = new ArrayList<>();
+                // 业务操作
+                for (NeighborDTO neighborDTO : neighborList) {
+                    WGS84Point point = neighborDTO.getPoint();
+                    Map<WGS84Point, Long> neighbors = neighborDTO.getNeighbors();
+                    int size = neighbors.size() + 1;
+                    //半径
+                    Map<String, double[]> mapPoint = returnLLSquarePoint(point.getLongitude(), point.getLatitude(), 150);
+                    double[] leftTopPoint = mapPoint.get("leftTopPoint");
+                    double[] rightBottomPoint = mapPoint.get("rightBottomPoint");
+                    BigDecimal x1 = BigDecimal.valueOf(leftTopPoint[1]);
+                    BigDecimal y1 = BigDecimal.valueOf(leftTopPoint[0]);
+                    BigDecimal x2 = BigDecimal.valueOf(rightBottomPoint[1]);
+                    BigDecimal y2 = BigDecimal.valueOf(rightBottomPoint[0]);
+                    TbFzyc fzyc = new TbFzyc();
+                    fzyc.setId(UUIDGenerator.getUUID());
+                    fzyc.setRealDate(endTime.substring(0, 10));
+                    fzyc.setX1(x1);
+                    fzyc.setY1(y1);
+                    fzyc.setX2(x2);
+                    fzyc.setY2(y2);
+                    fzyc.setGridType("300");
+                    fzyc.setProb(BigDecimal.valueOf(size));
+                    DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(point.getSsbmdm());
+                    if (ObjectUtils.isNotEmpty(dept)) {
+                        fzyc.setSsbm(dept.getDeptname());
+                        fzyc.setSsbmid(dept.getDeptid());
+                        fzyc.setSsbmdm(dept.getDeptcode());
+                        fzyc.setSsxgajdm(dept.getFxjcode());
+                        fzyc.setSsxgajid(dept.getFxjid());
+                        fzyc.setSsxgaj(dept.getFxjname());
+                        fzyc.setSssgaj(dept.getDszname());
+                        fzyc.setSssgajdm(dept.getDszcode());
+                        fzyc.setSssgajid(dept.getDszid());
+                    } else {
+                        fzyc.setSsbm("四川省德阳市公安局");
+                        fzyc.setSsbmid("44015");
+                        fzyc.setSsbmdm("510600000000");
+                        fzyc.setSsxgajdm("510600000000");
+                        fzyc.setSsxgajid("44015");
+                        fzyc.setSsxgaj("四川省德阳市公安局");
+                        fzyc.setSssgaj("四川省德阳市公安局");
+                        fzyc.setSssgajdm("510600000000");
+                        fzyc.setSssgajid("44015");
+                    }
+
+                    fzyc.setXtSjzt("1");
+                    fzyc.setXtScbz("0");
+                    fzyc.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+                    BigDecimal X = x1.add(x2.subtract(x1).divide(new BigDecimal(2)));
+                    BigDecimal Y = y1.add(y2.subtract(y1).divide(new BigDecimal(2)));
+                    fzyc.setZxX(X);
+                    fzyc.setZxY(Y);
+                    fzyc.setDwId(uuid);
+                    fzyc.setBc(startTime.substring(11, 13) + "-" + endTime.substring(11, 13));
+
+//                    //根据点位计算在那个巡区上
+//                    Set<String> xfq = new HashSet<>();
+                    if (!CollectionUtils.isEmpty(listXfqyAll)) {
+                        int cs = 0;
+                        for (TbJcglXfqyDto dto : listXfqyAll) {
+                            //特警大队 机动一 二 三不生成方块
+                            if (!dto.getSsbmdm().equals("510700440300") && !dto.getSsbmdm().equals("510700440400") && !dto.getSsbmdm().equals("510700440500") && !dto.getSsbmdm().equals("510700440600")) {
+                                Coordinate[] coordinates = new Coordinate[dto.getPgis().size()];
+                                for (int i = 0; i < dto.getPgis().size(); i++) {
+                                    BigDecimal[] jwd = dto.getPgis().get(i);
+                                    Coordinate coor = new Coordinate();
+                                    coor.x = jwd[0].doubleValue();
+                                    coor.y = jwd[1].doubleValue();
+                                    coordinates[i] = coor;
+                                }
+                                boolean s = Kit.isInGeometry(coordinates, X + "," + Y);
+                                if (s) {
+                                    TbFzycJsdx tbFzycJsdx = new TbFzycJsdx();
+                                    BeanUtils.copyProperties(dto, tbFzycJsdx);
+                                    tbFzycJsdx.setId(UUIDGenerator.getUUID());
+                                    tbFzycJsdx.setFzycId(fzyc.getId());
+                                    tbFzycJsdx.setXfqId(dto.getId());
+                                    tbFzycJsdx.setXfqMc(dto.getXfqMc());
+                                    tbFzycJsdx.setDwId(uuid);
+                                    cs += tbFzycJsdxMapper.insert(tbFzycJsdx);
+                                    //本地区域已经有数据 删除上次区域数据
+                                    xqMap.remove(dto.getId());
+                                    //下发指令
+                                    List<TbQwXfbb> xfbbs = this.tbQwzxAdaptRemoteService.getBbidByXq(dto.getId());
+                                    for (TbQwXfbb bb : xfbbs) {
+                                        TbZlxxInsertDto zldto = new TbZlxxInsertDto();
+                                        zldto.setYwId(fzyc.getId());
+                                        zldto.setZllx("09");
+                                        zldto.setZlly("09");
+                                        zldto.setZlzxlx("1");
+                                        zldto.setZlbt("犯罪预测");
+                                        zldto.setZlnr("次区域内发生" + size + "起警情,请加强巡逻");
+                                        zldto.setZldj("40");
+                                        zldto.setZljsdx("03");
+                                        zldto.setJd(X);
+                                        zldto.setWd(Y);
+                                        zldto.setZlfsddxzqh(fzyc.getSsbmdm().substring(0, 6));
+                                        zldto.setZljsrs(1);
+                                        zldto.setSsbmid(bb.getSsbmid());
+                                        zldto.setSsbmdm(bb.getSsbmdm());
+                                        zldto.setSsbm(bb.getSsbm());
+                                        zldto.setSsbm(bb.getSsbm());
+                                        zldto.setZlxflx("4");
+                                        List<TbZlxxZxrDtoInsertDto> zxrDtoList = new ArrayList<>();
+                                        TbZlxxZxrDtoInsertDto zxr = new TbZlxxZxrDtoInsertDto();
+                                        zxr.setZxrLx("03").setZxrXzid(bb.getId()).setZxrXzmc(bb.getJzMc());
+                                        zxrDtoList.add(zxr);
+                                        zldto.setZxrDtoList(zxrDtoList);
+                                        String zlid = tbZlxxService.addZl(zldto);
+                                        TbFzycXfxz xfxz = new TbFzycXfxz();
+                                        BeanUtils.copyProperties(tbFzycJsdx, xfxz);
+                                        xfxz.setId(UUIDGenerator.getUUID());
+                                        xfxz.setBbId(bb.getId());
+                                        xfxz.setZlId(zlid);
+                                        xfxz.setSfqs("0");
+                                        String xzmc = bb.getJzMc();
+                                        if (StringUtils.isEmpty(xzmc)) {
+                                            xzmc = bb.getFzrXm() + "警组";
+                                        }
+                                        xfxz.setXzmc(xzmc);
+                                        this.tbFzycXfxzMapper.insert(xfxz);
+                                    }
+                                }
+                            }
+                        }
+                        if (cs > 0) {
+                            fzycList.add(fzyc);
+                            this.tbFzycMapper.insert(fzyc);
+                            //查询警情部门是否添加
+                            int jsc = this.tbFzycJsdxMapper.selectCount(new LambdaQueryWrapper<TbFzycJsdx>()
+                                    .eq(TbFzycJsdx::getFzycId, fzyc.getId())
+                                    .eq(TbFzycJsdx::getSsbmdm, point.getSsbmdm())
+                            );
+                            if (jsc < 1) {
+                                //不管有没有都存到到对象里面
+                                TbFzycJsdx tbFzycJsdx = new TbFzycJsdx();
+                                BeanUtils.copyProperties(fzyc, tbFzycJsdx);
+                                tbFzycJsdx.setId(UUIDGenerator.getUUID());
+                                tbFzycJsdx.setFzycId(fzyc.getId());
+                                tbFzycJsdx.setDwId(uuid);
+                                tbFzycJsdxMapper.insert(tbFzycJsdx);
+                            }
+                        }
+
+                    }
+
+
+                }
+                //上次存在的区域 本次没有定位
+                if (ObjectUtils.isNotEmpty(xqMap)) {
+                    List<TbFzycJsdx> jsdxList = new ArrayList<>();
+                    for (String k : xqMap.keySet()) {
+                        jsdxList.addAll(xqMap.get(k));
+                    }
+                    Map<String, List<TbFzycJsdx>> fzMap = jsdxList.stream().collect(Collectors.groupingBy(TbFzycJsdx::getFzycId));
+                    Set<String> setFz = jsdxList.stream().map(TbFzycJsdx::getFzycId).collect(Collectors.toSet());
+                    List<TbFzyc> tbFzycs = this.tbFzycMapper.selectList(new LambdaQueryWrapper<TbFzyc>().in(TbFzyc::getId, setFz));
+                    for (TbFzyc fzyc : tbFzycs) {
+                        List<TbFzycJsdx> jsdxList1 = fzMap.get(fzyc.getId());
+                        fzyc.setLsId(fzyc.getId());
+                        fzyc.setId(UUIDGenerator.getUUID());
+                        fzyc.setDwId(uuid);
+                        fzyc.setSfxl("0");
+                        fzyc.setRealDate(endTime.substring(0, 10));
+                        fzyc.setBc(startTime.substring(11, 13) + "-" + endTime.substring(11, 13));
+                        fzyc.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+                        fzycList.add(fzyc);
+                        this.tbFzycMapper.insert(fzyc);
+                        for (TbFzycJsdx jsdx : jsdxList1) {
+                            jsdx.setId(UUIDGenerator.getUUID());
+                            jsdx.setFzycId(fzyc.getId());
+                            jsdx.setLsId(fzyc.getId());
+                            jsdx.setDwId(uuid);
+                            jsdx.setXtCjsj(new Timestamp(System.currentTimeMillis()));
+                            tbFzycJsdxMapper.insert(jsdx);
+
+                        }
+                    }
+                }
+                redisService.setCacheObject(Constant.FZYC_LIST, fzycList);
+                redisService.setCacheObject(Constant.FZYC_BC, startTime.substring(11, 13) + "-" + endTime.substring(11, 13));
+            }
+        }
+    }
+
+    /**
+     * 根据经纬度，获取正方形四个点位
+     *
+     * @param longitude 经度
+     * @param latitude  纬度
+     * @param distance  范围（米）  半径
+     * @return
+     */
+    public static Map<String, double[]> returnLLSquarePoint(double longitude, double latitude, double distance) {
+        Map<String, double[]> squareMap = new HashMap<String, double[]>();
+        // 计算经度弧度,从弧度转换为角度
+        double dLongitude = 2 * (Math.asin(Math.sin(distance / (2 * 6378137)) / Math.cos(Math.toRadians(latitude))));
+        dLongitude = Math.toDegrees(dLongitude);
+        // 计算纬度角度
+        double dLatitude = distance / 6378137;
+        dLatitude = Math.toDegrees(dLatitude);
+        // 正方形
+        //左上角
+        double[] leftTopPoint = {latitude + dLatitude, longitude - dLongitude};
+        //右上角
+        double[] rightTopPoint = {latitude + dLatitude, longitude + dLongitude};
+        //左下角
+        double[] leftBottomPoint = {latitude - dLatitude, longitude - dLongitude};
+        //右下角
+        double[] rightBottomPoint = {latitude - dLatitude, longitude + dLongitude};
+        squareMap.put("leftTopPoint", leftTopPoint);
+        squareMap.put("rightTopPoint", rightTopPoint);
+        squareMap.put("leftBottomPoint", leftBottomPoint);
+        squareMap.put("rightBottomPoint", rightBottomPoint);
+        return squareMap;
+    }
+
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/YjzlStatisticsServiceImpl.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/YjzlStatisticsServiceImpl.java
new file mode 100644
index 0000000..1b07f68
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/Impl/YjzlStatisticsServiceImpl.java
@@ -0,0 +1,578 @@
+package com.mosty.yjzl.service.Impl;
+
+import com.google.common.collect.ImmutableList;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.query.yjzl.TbYjqkQuery;
+import com.mosty.base.utils.DateUtils;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.yjzl.mapper.YjzlStatisticsMapper;
+import com.mosty.yjzl.remote.TbBaseAdaptRemoteService;
+import com.mosty.yjzl.service.YjzlStatisticsService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class YjzlStatisticsServiceImpl implements YjzlStatisticsService {
+
+    private final YjzlStatisticsMapper yjzlStatisticsMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public List<Map<String, Object>> clyjlb(TbYjxxStatisticsDto vo) {
+//        UserInfo user = UserInfoManager.get();
+        vo.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(vo.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", vo);
+//        map.put("useSql", PermissionsUtil.createSql("", user));
+        return this.yjzlStatisticsMapper.clyjlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBycCphm(TbYjxxPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.queryBycCphm(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBycCphmlb(TbYjxxPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.queryBycCphmlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yqueryBycCphmlb(TbYjxxYStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yqueryBycCphmlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zqueryBycCphmlb(TbYjxxPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zqueryBycCphmlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjcltj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjcltj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjbqtj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjbqtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjjbtj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjjbtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yyjcltj(TbYjxxYStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yyjcltj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zyjcltj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zyjcltj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBySfzh(TbYjxxRyStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.queryBySfzh(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBySfzhlb(TbYjxxRyPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.queryBySfzhlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.queryBySfzhlbsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yqueryBySfzhlb(TbYjxxRyNyStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yqueryBySfzhlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yqueryBySfzhlbsc(TbYjxxRyNyStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yqueryBySfzhlbsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zqueryBySfzhlb(TbYjxxRyPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zqueryBySfzhlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zqueryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("a", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zqueryBySfzhlbsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ryyjlb(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.ryyjlb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjjbtjRy(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjjbtjRy(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> jbtj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.jbtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjrytj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjrytj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjrytjsc(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjrytjsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yyjrytj(TbYjxxYyjStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yyjrytj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yyjrytjsc(TbYjxxYyjStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yyjrytjsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zyjrytj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zyjrytj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zyjrytjsc(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zyjrytjsc(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zbyjbfylb(TbYjxxRyPageStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zbyjbfylb(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> zbyjtj(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.zbyjtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> gzyyjpm(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.gzyyjpm(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> pcsyjpm(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.pcsyjpm(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ryyjpm(TbYjxxStatisticsDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.ryyjpm(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> ycyjtj(TbYjxxStatisticsQueryDto dto) {
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.ycyjtj(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> yjtj() {
+        String ssbmdm = this.tbBaseAdaptRemoteService.getSsbm(null, null);
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("useSql", PermissionsUtil.createSql("", UserInfoManager.get()));
+        return this.yjzlStatisticsMapper.yjtj(ssbmdm);
+    }
+
+    /**
+     * 泸州态势统计-各区县预警情况
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, Object> getGqxyjqk(TbYjqkQuery dto) {
+        HashMap<Object, Object> ssxgajxx = new HashMap<>();
+        ssxgajxx.put("10111", "泸州机场分局");
+        ssxgajxx.put("10929", "江阳区分局");
+        ssxgajxx.put("11336", "龙马潭区分局");
+        ssxgajxx.put("11379", "纳溪区");
+        ssxgajxx.put("11382", "泸县");
+        ssxgajxx.put("11436", "合江县");
+        ssxgajxx.put("11503", "叙永县");
+        ssxgajxx.put("11531", "古蔺县");
+
+        if (StringUtils.isEmpty(dto.getKssj()) || StringUtils.isEmpty(dto.getJssj())) { // 为空的提示
+            throw new BusinessException("请选择您要查询时间！");
+        }
+        Map<String, Object> map = new HashMap<>();
+        // 预警数量
+        List<Map<String, Object>> yjsl = this.yjzlStatisticsMapper.getYjsl(dto.getKssj(), dto.getJssj());
+        // 指令数
+        List<Map<String, Object>> zls = this.yjzlStatisticsMapper.getZls();
+        // 执行数
+        List<Map<String, Object>> zxs = this.yjzlStatisticsMapper.getZxs(dto.getKssj(), dto.getJssj());
+
+        // re预警数量
+        List<Map<String, Object>> yjslResList = new ArrayList<>();
+        // re指令数
+        List<Map<String, Object>> zlsResList = new ArrayList<>();
+        // re执行数
+        List<Map<String, Object>> zxsResList = new ArrayList<>();
+
+        ssxgajxx.keySet().forEach(item -> { // 循环遍历  通过key获取value 过滤比较从数据库获取的值
+            Map<String, Object> resMap = new HashMap<>();
+            // 预警数量
+            List<Map<String, Object>> yjslList = yjsl.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item)); // value 为所属县公安局
+            resMap.put("ssxgajid", item); // key 为所属县公安局id
+            if (yjslList.size() == 1) { // 如果集合的长度为1 说明数据库中有，获取count
+                resMap.put("count", yjslList.get(0).get("count"));
+            } else { // 否则设置count为0
+                resMap.put("count", 0);
+            }
+            yjslResList.add(resMap); // 将resMap添加进yjslResList中 最后put进map
+
+            // 指令数
+            resMap = new HashMap<>();
+            List<Map<String, Object>> zlsList = zls.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (zlsList.size() == 1) {
+                resMap.put("count", zlsList.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            zlsResList.add(resMap);
+
+            // 执行数
+            resMap = new HashMap<>();
+            List<Map<String, Object>> zxsList = zxs.stream().filter(it -> String.valueOf(it.get("ssxgajid")).equals(item)).collect(Collectors.toList());
+            resMap.put("ssxgaj", ssxgajxx.get(item));
+            resMap.put("ssxgajid", item);
+            if (zxsList.size() == 1) {
+                resMap.put("count", zxsList.get(0).get("count"));
+            } else {
+                resMap.put("count", 0);
+            }
+            zxsResList.add(resMap);
+        });
+
+        map.put("yjslResList", yjslResList);
+        map.put("zlsResList", zlsResList);
+        map.put("zxsResList", zxsResList);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getJqscAndZlTj(TbYjqkQuery dto) {
+        if (com.mosty.common.base.util.StringUtils.isEmpty(dto.getKssj()) || com.mosty.common.base.util.StringUtils.isEmpty(dto.getJssj())) {
+            throw new BusinessException("请选择查询时间");
+        }
+        Map<String, Object> map = new HashMap<>();
+        if (dto.getKssj().equals(dto.getJssj())) {
+            // 查询警情数据
+            List<Map<String, Object>> jqList = this.yjzlStatisticsMapper.getJqTj(dto.getKssj());
+            // 预警数量
+            List<Map<String, Object>> yjsl = this.yjzlStatisticsMapper.getYjsl1(dto.getKssj(), dto.getJssj());
+            // 指令数
+            List<Map<String, Object>> zls = this.yjzlStatisticsMapper.getZls1(dto.getKssj(), dto.getJssj());
+            // 执行数
+            List<Map<String, Object>> zxs = this.yjzlStatisticsMapper.getZxs1(dto.getKssj(), dto.getJssj());
+            List<String> timeList = ImmutableList.of("00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
+                    "10", "11", "12", "13", "14", "15", "16", "17",
+                    "18", "19", "20", "21", "22", "23");
+            timeList.forEach(item -> {
+                boolean jqFlag = false;
+                boolean yjFlag = false;
+                boolean zlsFlag = false;
+                boolean zxsFlag = false;
+                for (Map<String, Object> jq : jqList) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : yjsl) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        yjFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : zls) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        zlsFlag = true;
+                    }
+                }
+                for (Map<String, Object> jq : zxs) {
+                    String time = String.valueOf(jq.get("time")).length() == 1 ?
+                            "0" + jq.get("time") : String.valueOf(jq.get("time"));
+                    if (item.equals(time)) {
+                        zxsFlag = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!yjFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    yjsl.add(mp);
+                }
+                if (!zlsFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    zls.add(mp);
+                }
+                if (!zxsFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", item);
+                    mp.put("count", 0);
+                    zxs.add(mp);
+                }
+            });
+            jqList.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            yjsl.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            zls.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            zxs.sort(Comparator.comparingInt(a -> Integer.parseInt(a.get("time").toString())));
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("yjsl", yjsl.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zls", zls.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zxs", zxs.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        } else {
+            // 警情
+            List<Map<String, Object>> jqList = this.yjzlStatisticsMapper.getJqTjByTime(dto.getKssj(), dto.getJssj());
+            // 预警数量
+            List<Map<String, Object>> yjsl = this.yjzlStatisticsMapper.getYjslByTime(dto.getKssj(), dto.getJssj());
+            // 指令数
+            List<Map<String, Object>> zls = this.yjzlStatisticsMapper.getZlsByTime(dto.getKssj(), dto.getJssj());
+            // 执行数
+            List<Map<String, Object>> zxs = this.yjzlStatisticsMapper.getZxsByTime(dto.getKssj(), dto.getJssj());
+            Date kssj = DateUtils.strToDate(dto.getKssj(), "01");
+            Date jssj = DateUtils.strToDate(dto.getJssj(), "01");
+            while (kssj.getTime() <= jssj.getTime()) {
+                boolean jqFlag = false;
+                boolean yjFlag = false;
+                boolean zlFlag = false;
+                boolean zxFlag = false;
+                for (Map<String, Object> item : yjsl) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        yjFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : zls) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        zlFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : jqList) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        jqFlag = true;
+                    }
+                }
+                for (Map<String, Object> item : zxs) {
+                    if (String.valueOf(item.get("time")).equals(DateUtils.getQueryDateString(kssj, "01"))) {
+                        zxFlag = true;
+                    }
+                }
+                if (!jqFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    jqList.add(mp);
+                }
+                if (!yjFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    yjsl.add(mp);
+                }
+                if (!zlFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    zls.add(mp);
+                }
+                if (!zxFlag) {
+                    Map<String, Object> mp = new HashMap<>();
+                    mp.put("time", DateUtils.getQueryDateString(kssj, "01"));
+                    mp.put("count", 0);
+                    zxs.add(mp);
+                }
+                kssj = DateUtils.getNextDate(kssj, "D", 1);
+            }
+            jqList.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            yjsl.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            zls.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            zxs.sort((a, b) -> {
+                Date k = DateUtils.strToDate(a.get("time").toString(), "01");
+                Date j = DateUtils.strToDate(b.get("time").toString(), "01");
+                return (int) (k.getTime() - j.getTime());
+            });
+            map.put("jqList", jqList.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("yjsl", yjsl.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zls", zls.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+            map.put("zxs", zxs.stream().map(item -> item.get("count")).collect(Collectors.toList()));
+        }
+        return map;
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycPzService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycPzService.java
new file mode 100644
index 0000000..45b763d
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycPzService.java
@@ -0,0 +1,27 @@
+package com.mosty.yjzl.service;
+
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import com.mosty.base.model.entity.yjzl.TbFzycPz;
+import com.mosty.base.model.vo.yjzl.TbFzycPzVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbFzycPzService {
+
+    @ApiOperation("新增")
+    int insert(TbFzycPzVo fzycPzVo);
+
+    @ApiOperation("修改")
+    int updateById(TbFzycPzVo fzycPzVo);
+
+    @ApiOperation("根据ID查询")
+    TbFzycPz queryById(String id);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(String id);
+
+    @ApiOperation("查询全部配置单位")
+    List<TbFzycPz> queryAll();
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycService.java
new file mode 100644
index 0000000..c9bccda
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycService.java
@@ -0,0 +1,39 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.TbFzycDto;
+import com.mosty.base.model.entity.yjzl.TbFzyc;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbFzycService {
+
+    @ApiOperation("新增")
+    int insert(TbFzyc fzyc);
+
+    @ApiOperation("修改")
+    int fzUpdateById(TbFzyc fzyc);
+
+    @ApiOperation("根据ID查询")
+    TbFzyc queryById(String id);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(String id);
+
+    @ApiOperation("查询犯罪预测列表")
+    List<TbFzyc> queryList(TbFzycDto tbFzycDto);
+
+    @ApiOperation("查询犯罪预测列表")
+    List<TbFzyc> queryListApp(TbFzycDto tbFzycDto);
+
+
+    @ApiOperation("查询犯罪预测列表")
+    IPage<TbFzyc> queryListPage(TbFzycDto tbFzycDto);
+
+    @ApiOperation("已巡逻修改")
+    int updateBySfxl(String id);
+
+    @ApiOperation("查询犯罪预测数量")
+    Integer getFzyjCount(String ssbmdm, String time, String sfxl);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycXljlService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycXljlService.java
new file mode 100644
index 0000000..146207f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbFzycXljlService.java
@@ -0,0 +1,33 @@
+package com.mosty.yjzl.service;
+
+import com.mosty.base.model.dto.yjzl.TbFzycXljlDto;
+import com.mosty.base.model.entity.wzzx.TbWzSbsswz;
+import com.mosty.base.model.entity.yjzl.TbFzycXljl;
+import com.mosty.base.model.vo.wzzx.TbWzSblswzVo;
+import com.mosty.base.model.vo.yjzl.TbFzJlVo;
+import com.mosty.base.model.vo.yjzl.TbFzycXljlVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbFzycXljlService {
+
+    @ApiOperation("新增")
+    int insert(TbFzycXljlVo xljlVo);
+
+    @ApiOperation("修改")
+    int updateById(TbFzycXljlVo xljlVo);
+
+    @ApiOperation("根据ID查询")
+    TbFzycXljl queryById(String id);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(String id);
+
+    @ApiOperation("查询犯罪预警预测指令巡逻记录列表")
+    List<TbFzycXljlDto> qfzxl(String id);
+
+    @ApiOperation("新增")
+    int addBySbwz(TbFzJlVo vo);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjDyyjxxService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjDyyjxxService.java
new file mode 100644
index 0000000..aa0b415
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjDyyjxxService.java
@@ -0,0 +1,22 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.yjzl.TbYjDyyjxx;
+import com.mosty.base.model.query.yjzl.TbYjDyyjxxQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+
+public interface TbYjDyyjxxService {
+
+    @ApiOperation("查询订阅预警信息")
+    IPage<TbYjDyyjxx> queryByPage(TbYjDyyjxxQuery dyyjxx);
+
+    @ApiOperation("新增订阅预警信息")
+    int insert(TbYjDyyjxx dyyjxx);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(List<String> list);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxCsbService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxCsbService.java
new file mode 100644
index 0000000..339c63a
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxCsbService.java
@@ -0,0 +1,39 @@
+package com.mosty.yjzl.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjmxCsbQuery;
+import com.mosty.base.model.vo.yjzl.TbYjmxCsbVo;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbYjmxCsbService {
+
+    /**
+     * 新增
+     * @param csb
+     */
+    int insert(TbYjmxCsbVo csb);
+
+
+    /**
+     * 查询
+     * @param id
+     * @return
+     */
+    TbYjmxCsbVo queryById(String id);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    int deleteById(String id);
+
+    @ApiOperation("分页查询")
+    IPage<TbYjmxCsbVo> getPage(TbYjmxCsbQuery dto);
+
+    @ApiOperation("编辑")
+    int updateById(TbYjmxCsbVo clVo);
+}
+
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxService.java
new file mode 100644
index 0000000..8fa1ac2
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjmxService.java
@@ -0,0 +1,57 @@
+package com.mosty.yjzl.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjmxQuery;
+import com.mosty.base.model.vo.yjzl.TbYjmxAllVo;
+import com.mosty.base.model.vo.yjzl.TbYjmxVo;
+import io.swagger.annotations.ApiOperation;
+
+
+public interface TbYjmxService {
+
+
+
+    /**
+     * 新增
+     * @param yjmx
+     */
+    int insert(TbYjmxVo yjmx);
+
+    /**
+     * 编辑
+     * @param yjmx
+     */
+    int updateById(TbYjmxVo yjmx);
+
+    /**
+     * 查询
+     * @param id
+     * @return
+     */
+    TbYjmxVo queryById(String id);
+
+    /**
+     * 根据ID删除
+     * @param id
+     * @return
+     */
+    int deleteById(String id);
+
+    @ApiOperation("分页查询")
+    IPage<TbYjmxVo> getPage(TbYjmxQuery dto);
+
+    /**
+     * 根据ID更改模型状态
+     * @param id
+     * @return
+     */
+    int startMx(String id);
+
+    /**
+     * 查询模型参数详情信息
+     * @param mxid
+     * @return
+     */
+    TbYjmxAllVo getMxCs(String mxid);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxClService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxClService.java
new file mode 100644
index 0000000..f202a76
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxClService.java
@@ -0,0 +1,59 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjxxClQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxClVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-车辆表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-21
+ */
+public interface TbYjxxClService {
+
+    /**
+     * 分页查询预警车辆
+     * @param tbYjxxClQuery
+     * @return
+     */
+    IPage<TbYjxxClVo> queryByPage(TbYjxxClQuery tbYjxxClQuery);
+
+    /**
+     * 不分页查询预警车辆
+     * @param tbYjxxClQuery
+     * @return
+     */
+    List<TbYjxxClVo> queryList(TbYjxxClQuery tbYjxxClQuery);
+
+    /**
+     * 新增预警车辆
+     * @param clVo
+     */
+    int insert(TbYjxxClVo clVo);
+
+    /**
+     * 修改预警车辆
+     * @param clVo
+     */
+    int update(TbYjxxClVo clVo);
+
+    /**
+     * 根据ID删除
+     * @param list
+     * @return
+     */
+    int deleteById(List<String> list);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    TbYjxxClVo queryById(String id);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxDypzService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxDypzService.java
new file mode 100644
index 0000000..42f165c
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxDypzService.java
@@ -0,0 +1,26 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjxxDypzQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxDypzVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbYjxxDypzService {
+
+    @ApiOperation("查询订阅配置")
+    IPage<TbYjxxDypzVo> queryList(TbYjxxDypzQuery dypz);
+
+    @ApiOperation("新增订阅配置")
+    int insert(TbYjxxDypzVo dypz);
+
+    @ApiOperation("编辑订阅配置")
+    int updateById(TbYjxxDypzVo dypz);
+
+    @ApiOperation("查询订阅配置")
+    TbYjxxDypzVo queryById(String id);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(List<String> list);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxLzService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxLzService.java
new file mode 100644
index 0000000..4aee22a
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxLzService.java
@@ -0,0 +1,15 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.BasePage;
+import com.mosty.base.model.entity.lzother.TAlarmYjgj;
+import com.mosty.base.model.entity.yjzl.TbYjxxMxyj;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbYjxxLzService {
+
+    @ApiOperation("添加泸州拓尔思预警信息")
+    void addYjxx(TAlarmYjgj item);
+
+    IPage<TbYjxxMxyj> querYjmx(BasePage basePage, String ssbmdm);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxRyService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxRyService.java
new file mode 100644
index 0000000..b41ab36
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxRyService.java
@@ -0,0 +1,59 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.query.yjzl.TbYjxxRyQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxRyVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-人员表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+public interface TbYjxxRyService {
+
+    /**
+     * 分页查询预警信息-人员表
+     * @param tbYjxxRyQuery
+     * @return
+     */
+    IPage<TbYjxxRyVo> queryByPage(TbYjxxRyQuery tbYjxxRyQuery);
+
+    /**
+     * 不分页查询预警信息-人员表
+     * @param tbYjxxRyQuery
+     * @return
+     */
+    List<TbYjxxRyVo> queryList(TbYjxxRyQuery tbYjxxRyQuery);
+
+    /**
+     * 新增预警信息-人员表
+     * @param ryVo
+     */
+    int insert(TbYjxxRyVo ryVo);
+
+    /**
+     * 修改预警信息-人员表
+     * @param ryVo
+     */
+    int update(TbYjxxRyVo ryVo);
+
+    /**
+     * 根据ID删除
+     * @param list
+     * @return
+     */
+    int deleteById(List<String> list);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    TbYjxxRyVo queryById(String id);
+
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxService.java
new file mode 100644
index 0000000..1f6c848
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxService.java
@@ -0,0 +1,78 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.GetLastYjDto;
+import com.mosty.base.model.dto.yjzl.TbYjxxDTO;
+import com.mosty.base.model.dto.yjzl.YjConvertZlDto;
+import com.mosty.base.model.entity.rh.RhMyhtWarn;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.yjzl.*;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TbYjxxService {
+
+    @ApiOperation("查询预警列表-分页")
+    IPage<TbYjxx> getPageList(TbYjxxQuery dto);
+
+    @ApiOperation("大屏-查询预警信轨迹")
+    IPage<TbYjxx> selectTrack(TbYjxxYjgjQuery tbYjxx);
+
+    @ApiOperation("查询预警信息-不分页")
+    List<TbYjxx> getList(TbYjxxNoPageQuery dto);
+
+    @ApiOperation("查询预警列表-热力图使用")
+    List<Map<String, Object>> getListHotMap(TbYjxxNoPageQuery dto);
+
+    @ApiOperation("查询预警列表-热力图使用")
+    List<Map<String, Object>> getListHotMapEs(TbYjxxNoPageQuery dto);
+
+    @ApiOperation("查询预警详情")
+    TbYjxx getInfo(String id);
+
+    @ApiOperation("新增预警")
+    int insert(TbYjxx yjxx);
+
+    @ApiOperation("查询预警")
+    TbYjxx queryYjxx(TbYjxx yjxx);
+
+    @ApiOperation("根据预警内容查询预警信息列表")
+    List<TbYjxxDTO> selectYjByNr(String yjNr);
+
+    @ApiOperation("解析kafka推送的预警消息")
+    void setYjxxByKafka(String message);
+
+    @ApiOperation("通过证件号码查询人员的预警信息")
+    IPage<TbYjxx> getYjgj(VwSyrkJzgjGxListQuery dto);
+
+    @ApiOperation("APP端预警信息统计")
+    List<Map<String, Object>> getYjxxTj(TbYjxxYjjbStatisticsQuery dto);
+
+    @ApiOperation("APP端单人、单车预警统计")
+    Map<String, Object> getStatistics(TbYjxxStatisticsQuery dto);
+
+    @ApiOperation("APP端预警信息统计-预警类型")
+    List<Map<String, Object>> getYjxxTjYjlx(String kssj, String jssj);
+
+    @ApiOperation("APP各时段预警")
+    Object gsdyj(String type);
+
+    @ApiOperation("APP预警转为指令")
+    void yjConvertZl(YjConvertZlDto dto);
+
+    @ApiOperation("获取最新一条预警")
+    TbYjxx getLastYj(GetLastYjDto dto);
+
+    @ApiOperation("修改预警信息是否发送指令")
+    void updateYjxxSffszl(String id);
+
+    @ApiOperation("查询预警信息列表（只查询又经纬度信息的）")
+    List<TbYjxx> getYjxx30Day(TbYjxxQuery dto);
+
+
+}
+
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxSjService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxSjService.java
new file mode 100644
index 0000000..34a871e
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjxxSjService.java
@@ -0,0 +1,41 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.model.query.yjzl.TbYjxxSjQuery;
+import com.mosty.base.model.vo.yjzl.TbYjxxSjVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 预警信息-事件表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+public interface TbYjxxSjService {
+
+    @ApiOperation("分页查询预警事件")
+    IPage<TbYjxxSjVo> queryByPage(TbYjxxSjQuery tbYjxxSjQuery);
+
+    @ApiOperation("不分页查询预警事件-人员表")
+    List<TbYjxxSjVo> queryList(TbYjxxSjQuery tbYjxxSjQuery);
+
+    @ApiOperation("新增预警事件")
+    int insert(TbYjxxSjVo sjVo);
+
+    @ApiOperation("修改预警事件-人员表")
+    int update(TbYjxxSjVo sjVo);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(List<String> list);
+
+    @ApiOperation("根据ID查询")
+    TbYjxxSjVo queryById(String id);
+
+    @ApiOperation("添加事件预警信息")
+    void addEntity(TbYjxx yjxx, String sjFl, String sjFlmc);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjzltjService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjzltjService.java
new file mode 100644
index 0000000..81604e0
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbYjzltjService.java
@@ -0,0 +1,25 @@
+package com.mosty.yjzl.service;
+
+import com.mosty.base.model.vo.yjzl.TbYjzlZqtjVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjphVo;
+import com.mosty.base.model.vo.yjzl.TbYjzltjxxVo;
+import com.mosty.base.model.vo.yjzl.TbYzzlDjtjVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TbYjzltjService {
+
+    @ApiOperation("指令中心--首页指令状态统计信息")
+    List<TbYjzltjxxVo> rwzttjxx();
+
+    @ApiOperation("指令中心--首页指令排行统计信息")
+    List<TbYjzltjphVo> rwphtjxx(String type);
+
+    @ApiOperation("指令中心--首页指令周期统计信息")
+    Map<String, Object> zlZqtjxx(String type);
+
+    @ApiOperation("指令中心--首页指令等级统计信息")
+    List<TbYzzlDjtjVo> zlDjtjxx(String type);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxService.java
new file mode 100644
index 0000000..d5072f6
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxService.java
@@ -0,0 +1,94 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.entity.trs.VwAlermYjgl;
+import com.mosty.base.model.entity.trs.VwAlermYjzl;
+import com.mosty.base.model.entity.yjzl.TbZlYjRy;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.afjcsj.VwSyrkJzgjGxListQuery;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.trs.VwAlermYjzlVo;
+import com.mosty.base.model.vo.yjzl.TbZlYjRyVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxInfoVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TbZlxxService {
+
+    @ApiOperation("根据时间查询指令执行情况")
+    Map<String, Object> selectInstructCount(String startTime, String endTime);
+
+    @ApiOperation("查询指令列表--分页")
+    IPage<TbZlxxVo> selectInstructList(TbZlxxQuery dto);
+
+    @ApiOperation("添加指令信息")
+    String addZl(TbZlxxInsertDto dto);
+
+    @ApiOperation("修改指令信息")
+    void updateZl(TbZlxxInsertDto dto);
+
+    @ApiOperation("指令到期状态修改")
+    void changeZlGqzt();
+
+    @ApiOperation("指令处置流程")
+    void zlHandle(TbZlxxZtChangeDto dto);
+
+    @ApiOperation("指令处置流程（人员管控）")
+    void zlHandleRygk(TbZlxxZtChangeRygkDto dto);
+
+    @ApiOperation("查询指令详细信息")
+    TbZlxxInfoVo getInfo(String id);
+
+    @ApiOperation("添加指令执行记录")
+    void addZxjl(TbZlxxZxjlInsertDto dto);
+
+    @ApiOperation("添加指令盘查人车的记录")
+    void addPcrycl(TbZlxxPcryclInsertDto dto);
+
+    @ApiOperation("获取托尔斯预警指令信息添加")
+    void addTrsZl(VwAlermYjzlVo yjzl);
+
+    @ApiOperation("查询实有人口指令信息")
+    IPage<TbZlYjRyVo> getSyrkZlxx(VwSyrkJzgjGxListQuery dto);
+
+    @ApiOperation("APP指令统计--指令类型")
+    List<Map<String, Object>> getTjOfZllx(String type);
+
+    @ApiOperation("获取trs最后一条指令信息")
+    TbZlxx getLastZlxx();
+
+    @ApiOperation("根据完成情况统计指令数量")
+    Map<String, Object> getStatisticsByStatus();
+
+    @ApiOperation("获取托尔斯预警信息添加")
+    void addTrsYj(VwAlermYjgl vo);
+
+    @ApiOperation("添加指令信息--第三方")
+    void addZlxx(TbZlxxInsertDto dto);
+
+    @ApiOperation("指令处置--第三方")
+    void zlHandleOther(TbZlxxZtChangeDto dto);
+
+    @ApiOperation("查询我发送的指令信息")
+    IPage<TbZlxxVo> getMySendZlList(MyZlSearchDto dto);
+
+    @ApiOperation("添加指令执行记录")
+    void addZxjlOther(TbZlxxZxjlInsertDto dto);
+
+    @ApiOperation("查询我发送的指令")
+    Integer getZlCount(String ssbmdm, String time, String zlzxzt);
+
+    @ApiOperation("查询我发送的指令")
+    Map<String,Integer> yjzlTj();
+
+    @ApiOperation("警情转指令")
+    void andJqZl(String ssbmid,String jqid,String bbids,String zlxflx);
+
+    @ApiOperation("预警转指令")
+    void andYjZl(String yjid,String bbids);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxZxjlService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxZxjlService.java
new file mode 100644
index 0000000..04e3332
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZlxxZxjlService.java
@@ -0,0 +1,68 @@
+package com.mosty.yjzl.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.qwzx.TbQwXfbbVo;
+import com.mosty.base.model.dto.yjzl.CyjlSearchDto;
+import com.mosty.base.model.dto.yjzl.MyZlSearchDto;
+import com.mosty.base.model.dto.yjzl.NewZxjlSearchDto;
+import com.mosty.base.model.dto.yjzl.third.ThirdMyZlSearchDto;
+import com.mosty.base.model.dto.yjzl.third.ThirdZlInfoSearchDto;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.entity.yjzl.TbZlxxZxjl;
+import com.mosty.base.model.query.yjzl.TbZlxxZxjlQuery;
+import com.mosty.base.model.vo.yjzl.TbZlxxInfoVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxZxjlVo;
+import com.mosty.base.model.vo.yjzl.TbZlxxZxrVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 指令-执行过程表 服务类
+ * </p>
+ *
+ * @author zengbo
+ * @since 2022-07-19
+ */
+public interface TbZlxxZxjlService {
+
+    @ApiOperation("不分页查询指令执行过程")
+    List<TbZlxxZxjl> queryList(TbZlxxZxjlQuery tbZlxxZxjlQuery);
+
+    @ApiOperation("指令执行过程")
+    int insert(TbZlxxZxjl zxjl);
+
+    @ApiOperation("修改指令执行过程")
+    int update(TbZlxxZxjl zxjl);
+
+    @ApiOperation("根据ID删除")
+    int deleteById(List<String> list);
+
+    @ApiOperation("查询事件的参与警力")
+    List<Map<String,Object>> getCyjlList(CyjlSearchDto sjid);
+
+    @ApiOperation("查询现场装备集合")
+    List<TbQwXfbbVo> getXczbList(String sjid);
+
+    @ApiOperation("APP获取我的指令数量")
+    List<Map<String,Object>> getMyZlCount();
+
+    @ApiOperation("APP获取我的指令列表")
+    IPage<TbZlxxZxrVo> getMyZlList(MyZlSearchDto dto);
+
+    @ApiOperation("查询最新的指令执行记录")
+    List<TbZlxxZxjlVo> getNewZxjl(NewZxjlSearchDto dto);
+
+    @ApiOperation("根据身份证号查询指令统计")
+    List<Map<String,Object>> getStatistics(String sfzh);
+
+    @ApiOperation("根据状态查询指令列表")
+    IPage<TbZlxxZxrVo> getPageList(ThirdMyZlSearchDto dto);
+
+    @ApiOperation("查询指令详情接口")
+    TbZlxxInfoVo getInfo(ThirdZlInfoSearchDto dto);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZxzbService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZxzbService.java
new file mode 100644
index 0000000..414f12f
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/TbZxzbService.java
@@ -0,0 +1,20 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.entity.yjzl.TbZxzb;
+import com.mosty.base.model.query.yjzl.TbZxzbQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+public interface TbZxzbService {
+
+    @ApiOperation("分页查询中心坐标")
+    IPage<TbZxzb> queryListPage(TbZxzbQuery zxzbQuery);
+
+    @ApiOperation("不分页查询中心坐标")
+    List<TbZxzb> queryList(TbZxzbQuery zxzbQuery);
+
+    @ApiOperation("计算坐标")
+    void computeCenter(String startTime, String endTime);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/service/YjzlStatisticsService.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/YjzlStatisticsService.java
new file mode 100644
index 0000000..59d8aac
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/service/YjzlStatisticsService.java
@@ -0,0 +1,117 @@
+package com.mosty.yjzl.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.query.yjzl.TbYjqkQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+public interface YjzlStatisticsService {
+
+    @ApiOperation("车辆预警列表TOP")
+    List<Map<String, Object>> clyjlb(TbYjxxStatisticsDto vo);
+
+    @ApiOperation("根据车牌号查询")
+    List<Map<String, Object>> queryBycCphm(TbYjxxPageStatisticsDto vo);
+
+    @ApiOperation("根据车牌号查询预警列表-日")
+    List<Map<String, Object>> queryBycCphmlb(TbYjxxPageStatisticsDto vo);
+
+    @ApiOperation("根据车牌号查询预警列表-月")
+    List<Map<String, Object>> yqueryBycCphmlb(TbYjxxYStatisticsDto vo);
+
+    @ApiOperation("根据车牌号查询预警列表-月")
+    List<Map<String, Object>> zqueryBycCphmlb(TbYjxxPageStatisticsDto dto);
+
+    @ApiOperation("日预警车辆TOP20")
+    List<Map<String, Object>> yjcltj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警标签统计")
+    List<Map<String, Object>> yjbqtj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警级别统计")
+    List<Map<String, Object>> yjjbtj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("月预警车辆TOP20")
+    List<Map<String, Object>> yyjcltj(TbYjxxYStatisticsDto dto);
+
+    @ApiOperation("周预警车辆TOP20")
+    List<Map<String, Object>> zyjcltj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询--人员")
+    List<Map<String, Object>> queryBySfzh(TbYjxxRyStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-日")
+    List<Map<String, Object>> queryBySfzhlb(TbYjxxRyPageStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-日(三车前科人员)")
+    List<Map<String, Object>> queryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-月")
+    List<Map<String, Object>> yqueryBySfzhlb(TbYjxxRyNyStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-月(三车前科人员)")
+    List<Map<String, Object>> yqueryBySfzhlbsc(TbYjxxRyNyStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-周")
+    List<Map<String, Object>> zqueryBySfzhlb(TbYjxxRyPageStatisticsDto dto);
+
+    @ApiOperation("根据身份证查询列表-周(三车前科人员)")
+    List<Map<String, Object>> zqueryBySfzhlbsc(TbYjxxRyPageStatisticsDto dto);
+
+    @ApiOperation("人员预警列表TOP")
+    List<Map<String, Object>> ryyjlb(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警级别统计")
+    List<Map<String, Object>> yjjbtjRy(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警人员级别统计")
+    List<Map<String, Object>> jbtj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警人员TOP20")
+    List<Map<String, Object>> yjrytj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> yjrytjsc(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("月预警人员TOP20")
+    List<Map<String, Object>> yyjrytj(TbYjxxYyjStatisticsDto dto);
+
+    @ApiOperation("月预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> yyjrytjsc(TbYjxxYyjStatisticsDto dto);
+
+    @ApiOperation("周预警人员TOP20")
+    List<Map<String, Object>> zyjrytj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("周预警人员TOP20(三车前科人员)")
+    List<Map<String, Object>> zyjrytjsc(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("周边预警列表(不分页)")
+    List<Map<String, Object>> zbyjbfylb(TbYjxxRyPageStatisticsDto dto);
+
+    @ApiOperation("周边预警统计")
+    List<Map<String, Object>> zbyjtj(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("感知源预警排名")
+    List<Map<String, Object>> gzyyjpm(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("派出所预警排名")
+    List<Map<String, Object>> pcsyjpm(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("人员预警排名")
+    List<Map<String, Object>> ryyjpm(TbYjxxStatisticsDto dto);
+
+    @ApiOperation("右侧预警统计")
+    List<Map<String, Object>> ycyjtj(TbYjxxStatisticsQueryDto dto);
+
+    @ApiOperation("预警中心--预警统计")
+    List<Map<String, Object>> yjtj();
+
+    @ApiOperation("泸州态势统计-各区县预警情况")
+    Map<String, Object> getGqxyjqk(TbYjqkQuery dto);
+
+    @ApiOperation("泸州态势统计-警情与预警指令执行对比分析")
+    Map<String, Object> getJqscAndZlTj(TbYjqkQuery dto);
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzFzycTask.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzFzycTask.java
new file mode 100644
index 0000000..2eb72db
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzFzycTask.java
@@ -0,0 +1,26 @@
+package com.mosty.yjzl.task;
+
+import com.mosty.yjzl.service.TbZxzbService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时拉取大数据犯罪预警预测指令
+ */
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class LzFzycTask {
+
+
+    private final TbZxzbService tbZxzbService;
+
+    //四个小时跑一次数据
+    @Scheduled(cron = "0 0 1,9,13,17,21 * * ?")
+    public void run() {
+        tbZxzbService.computeCenter(null, null);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzYjxxRedisClearTask.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzYjxxRedisClearTask.java
new file mode 100644
index 0000000..2c8d22b
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/LzYjxxRedisClearTask.java
@@ -0,0 +1,33 @@
+package com.mosty.yjzl.task;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+import com.mosty.base.utils.Constant;
+import com.mosty.common.redis.service.RedisService;
+import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 每天清除前一天redis中得数据
+ */
+@Component
+@AllArgsConstructor
+public class LzYjxxRedisClearTask {
+
+    private final RedisTemplate redisTemplate;
+
+    @Scheduled(cron = "0 0 0 * * ? ")
+    public void run() {
+        redisTemplate.delete(Constant.LZYJ_DATA_PQRY);
+        redisTemplate.delete(Constant.LZYJ_DATA_SWRY);
+        redisTemplate.delete(Constant.LZYJ_DATA_QKSD);
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/task/TbZlxxGqTask.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/TbZlxxGqTask.java
new file mode 100644
index 0000000..b81afb2
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/task/TbZlxxGqTask.java
@@ -0,0 +1,25 @@
+package com.mosty.yjzl.task;
+
+import com.mosty.yjzl.service.TbZlxxService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 每隔几分钟执行一次任务的修改与变更
+ * 查询是否有任务已经超期
+ */
+@Component
+@AllArgsConstructor
+public class TbZlxxGqTask {
+
+    private final TbZlxxService tbZlxxService;
+
+    @Scheduled(cron = "0 */60 * * * ?")
+    public void run() {
+        this.tbZlxxService.changeZlGqzt();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/third/YjzlThirdController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/third/YjzlThirdController.java
new file mode 100644
index 0000000..88d0e65
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/third/YjzlThirdController.java
@@ -0,0 +1,80 @@
+package com.mosty.yjzl.third;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yjzl.*;
+import com.mosty.base.model.dto.yjzl.third.ThirdMyZlSearchDto;
+import com.mosty.base.model.dto.yjzl.third.ThirdZlInfoSearchDto;
+import com.mosty.base.model.query.yjzl.TbZlxxQuery;
+import com.mosty.base.model.vo.yjzl.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yjzl.service.TbYjzltjService;
+import com.mosty.yjzl.service.TbZlxxService;
+import com.mosty.yjzl.service.TbZlxxZxjlService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "预警指令第三方服务接口")
+@AllArgsConstructor
+@RestController
+@RequestMapping("/yjThird")
+public class YjzlThirdController {
+
+    private final TbZlxxZxjlService tbZlxxZxjlService;
+    private final TbZlxxService tbZlxxService;
+
+    @ApiOperation("根据身份证号查询指令统计")
+    @GetMapping(value = "/getStatistics")
+    public ResponseResult<List<Map<String, Object>>> getStatistics(String sfzh) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getStatistics(sfzh));
+    }
+
+    @ApiOperation("根据状态查询指令列表")
+    @GetMapping(value = "/getPageList")
+    public ResponseResult<IPage<TbZlxxZxrVo>> getPageList(ThirdMyZlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getPageList(dto));
+    }
+
+    @ApiOperation("查询指令详情接口")
+    @GetMapping(value = "/getInfo")
+    public ResponseResult<TbZlxxInfoVo> getInfo(ThirdZlInfoSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getInfo(dto));
+    }
+
+    @ApiOperation("查询指令处置流程以及最新记录")
+    @GetMapping(value = "/getZxjlList")
+    public ResponseResult<List<TbZlxxZxjlVo>> getNewZxjl(NewZxjlSearchDto dto) {
+        return ResponseResult.success(this.tbZlxxZxjlService.getNewZxjl(dto));
+    }
+
+    @ApiOperation("指令新增--第三方")
+    @PostMapping(value = "/addZlxx")
+    public ResponseResult<Void> addZlxx(@RequestBody TbZlxxInsertDto dto) {
+        this.tbZlxxService.addZlxx(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("指令处置流程")
+    @PostMapping(value = "/zlHandle")
+    public ResponseResult<Void> zlHandleOther(@RequestBody TbZlxxZtChangeDto dto) {
+        this.tbZlxxService.zlHandleOther(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("添加指令执行记录")
+    @PostMapping(value = "/addZxjl")
+    public ResponseResult<Void> addZxjlOther(@RequestBody TbZlxxZxjlInsertDto dto) {
+        this.tbZlxxService.addZxjlOther(dto);
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/OkHttpUtils.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/OkHttpUtils.java
new file mode 100644
index 0000000..3bcc7e1
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/OkHttpUtils.java
@@ -0,0 +1,400 @@
+package com.mosty.yjzl.utils;
+
+import com.alibaba.fastjson.JSON;
+import okhttp3.*;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+public class OkHttpUtils {
+    private static volatile OkHttpClient okHttpClient = null;
+    private static volatile Semaphore semaphore = null;
+    private Map<String, String> headerMap;
+    private Map<String, Object> paramMap;
+    private String url;
+    private Request.Builder request;
+
+    /**
+     * 初始化okHttpClient，并且允许https访问
+     */
+    private OkHttpUtils() {
+        if (okHttpClient == null) {
+            synchronized (OkHttpUtils.class) {
+                if (okHttpClient == null) {
+                    TrustManager[] trustManagers = buildTrustManagers();
+                    okHttpClient = new OkHttpClient.Builder().connectTimeout(15, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS).readTimeout(20, TimeUnit.SECONDS).sslSocketFactory(createSSLSocketFactory(trustManagers), (X509TrustManager) trustManagers[0]).hostnameVerifier((hostName, session) -> true).retryOnConnectionFailure(true).build();
+                    addHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36");
+                }
+            }
+        }
+    }
+
+    /**
+     * 用于异步请求时，控制访问线程数，返回结果
+     *
+     * @return
+     */
+    private static Semaphore getSemaphoreInstance() {
+        //只能1个线程同时访问
+        synchronized (OkHttpUtils.class) {
+            if (semaphore == null) {
+                semaphore = new Semaphore(0);
+            }
+        }
+        return semaphore;
+    }
+
+    /**
+     * 创建OkHttpUtils
+     *
+     * @return
+     */
+    public static OkHttpUtils builder() {
+        return new OkHttpUtils();
+    }
+
+    /**
+     * 添加url
+     *
+     * @param url
+     * @return
+     */
+    public OkHttpUtils url(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * 添加参数
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addParam(String key, Object value) {
+        if (paramMap == null) {
+            paramMap = new LinkedHashMap<>(16);
+        }
+        paramMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 添加请求头
+     *
+     * @param key   参数名
+     * @param value 参数值
+     * @return
+     */
+    public OkHttpUtils addHeader(String key, String value) {
+        if (headerMap == null) {
+            headerMap = new LinkedHashMap<>(16);
+        }
+        headerMap.put(key, value);
+        return this;
+    }
+
+    /**
+     * 初始化get方法
+     *
+     * @return
+     */
+    public OkHttpUtils get() {
+        request = new Request.Builder().get();
+        StringBuilder urlBuilder = new StringBuilder(url);
+        if (paramMap != null) {
+            urlBuilder.append("?");
+            try {
+                for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
+                    urlBuilder.append(URLEncoder.encode(entry.getKey(), "utf-8")).append("=").append(URLEncoder.encode(entry.getValue().toString(), "utf-8")).append("&");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            urlBuilder.deleteCharAt(urlBuilder.length() - 1);
+        }
+        request.url(urlBuilder.toString());
+        return this;
+    }
+
+    /**
+     * 初始化delet方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils delete(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().delete(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPost true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils post(boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    public OkHttpUtils post(Map<String, Object> data, boolean isJsonPost) {
+        RequestBody requestBody;
+        if (isJsonPost) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().post(requestBody).url(url);
+        return this;
+    }
+
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (paramMap != null) {
+                json = JSON.toJSONString(paramMap);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (paramMap != null) {
+                paramMap.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+    /**
+     * 初始化post方法
+     *
+     * @param isJsonPut true等于json的方式提交数据，类似postman里post方法的raw
+     *                   false等于普通的表单提交
+     * @return
+     */
+    public OkHttpUtils put(Map<String, Object> data, boolean isJsonPut) {
+        RequestBody requestBody;
+        if (isJsonPut) {
+            String json = "";
+            if (data != null) {
+                json = JSON.toJSONString(data);
+            }
+            requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), json);
+        } else {
+            FormBody.Builder formBody = new FormBody.Builder();
+            if (data != null) {
+                data.forEach((key,value) ->{
+                    formBody.add(key, String.valueOf(value));
+                });
+            }
+            requestBody = formBody.build();
+        }
+        request = new Request.Builder().put(requestBody).url(url);
+        return this;
+    }
+
+    public Headers syncHeader() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            System.out.println(response.headers());
+            return  response.headers();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 同步请求
+     *
+     * @return
+     */
+    public String sync() {
+        setHeader(request);
+        try {
+            Response response = okHttpClient.newCall(request.build()).execute();
+            assert response.body() != null;
+            return response.body().string();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "请求失败：" + e.getMessage();
+        }
+    }
+
+    /**
+     * 异步请求，有返回值
+     */
+    public String async() {
+        StringBuilder buffer = new StringBuilder("");
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                buffer.append("请求出错：").append(e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                buffer.append(response.body().string());
+                getSemaphoreInstance().release();
+            }
+        });
+        try {
+            getSemaphoreInstance().acquire();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return buffer.toString();
+    }
+
+    /**
+     * 异步请求，带有接口回调
+     *
+     * @param callBack
+     */
+    public void async(ICallBack callBack) {
+        setHeader(request);
+        okHttpClient.newCall(request.build()).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                callBack.onFailure(call, e.getMessage());
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                assert response.body() != null;
+                callBack.onSuccessful(call, response.body().string());
+            }
+        });
+    }
+
+    /**
+     * 为request添加请求头
+     *
+     * @param request
+     */
+    private void setHeader(Request.Builder request) {
+        if (headerMap != null) {
+            try {
+                for (Map.Entry<String, String> entry : headerMap.entrySet()) {
+                    request.addHeader(entry.getKey(), entry.getValue());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 生成安全套接字工厂，用于https请求的证书跳过
+     *
+     * @return
+     */
+    private static SSLSocketFactory createSSLSocketFactory(TrustManager[] trustAllCerts) {
+        SSLSocketFactory ssfFactory = null;
+        try {
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, trustAllCerts, new SecureRandom());
+            ssfFactory = sc.getSocketFactory();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ssfFactory;
+    }
+
+    private static TrustManager[] buildTrustManagers() {
+        return new TrustManager[]{new X509TrustManager() {
+            @Override
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
+            }
+
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[]{};
+            }
+        }};
+    }
+    /**
+     * 自定义一个接口回调
+     */
+    public interface ICallBack {
+
+        void onSuccessful(Call call, String data);
+
+        void onFailure(Call call, String errorMsg);
+
+    }
+}
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/YjAndZlRule.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/YjAndZlRule.java
new file mode 100644
index 0000000..22ca5d9
--- /dev/null
+++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/utils/YjAndZlRule.java
@@ -0,0 +1,143 @@
+package com.mosty.yjzl.utils;
+
+import com.mosty.base.model.entity.yjzl.TbYjxx;
+
+import java.util.Arrays;
+
+/**
+ * 预警等级规则和预警转指令的规则
+ */
+public class YjAndZlRule {
+
+    /**
+     * 高新人员预警等级设置
+     * 新益州信访人员	------------Y
+     * 2020年以来扒窃及盗窃电动车人员（刑侦）	------------Y
+     * 2020年以来扒窃及盗窃电动车-常住高新（刑侦）	------------Y
+     * 高新在逃	------------R
+     * 2022年1至6月有轨迹入盗前科人员库（刑侦）	------------Y
+     * 50人员库	------------Y
+     * 遂宁籍飞车抢夺前科人员（刑侦）	------------Y
+     * trs布控		------------不接入
+     * 盗车财前科人员（刑侦）	------------Y
+     * 普通盗窃前科人员（刑侦）	------------Y
+     * 06-07拓尔思布控		------------不接入
+     * 6.6演练	------------B
+     * 拓尔思111		-------------不接入
+     * 抢夺抢劫前科人员（前科）	------------O
+     * 成都涉毒人员专业库（刑侦）	------------Y
+     * 抢劫案（看守所）	------------O
+     * 全省ZDR	------------Y
+     * 非机动车犯罪嫌疑人	------------Y
+     * 盗窃（拘留所）	------------Y
+     * 盗窃汽车（看守所）	------------Y
+     * 扒窃前科人员专业库（刑侦）	------------Y
+     * 盗窃非机动车前科人员专业库（刑侦）	------------Y
+     * 房产纠纷	------------B
+     * 赔偿纠纷	------------B
+     * 涉法涉诉	------------B
+     * 抢夺、抢劫	------------O
+     * 七类前科	------------Y
+     * 2018年以来两族街面＋入盗前科人员（刑侦）	------------Y
+     * 2022年以来盗窃非机动车前科人员（刑侦）	------------Y
+     * 全市ZDR	------------Y
+     * 富士康员工人像库	------------B
+     */
+    public static boolean createYjjb(TbYjxx yjxx, String tar) {
+        // 不接入
+        String[] noPass = new String[]{"trs布控", "06-07拓尔思布控", "拓尔思111"};
+        if (Arrays.asList(noPass).contains(tar)) return false;
+        // 红色
+        String[] rPass = new String[]{"高新在逃"};
+        if (Arrays.asList(rPass).contains(tar)) {
+            yjxx.setYjJb("10");
+            return true;
+        }
+        // 蓝色
+        String[] bPass = new String[]{"房产纠纷", "50人员库", "富士康员工人像库", "涉法涉诉", "赔偿纠纷"};
+        if (Arrays.asList(bPass).contains(tar)) {
+            yjxx.setYjJb("40");
+            return true;
+        }
+        // 橙色
+        String[] oPass = new String[]{"抢劫案（看守所）", "抢夺抢劫前科人员（前科）", "抢夺、抢劫"};
+        if (Arrays.asList(oPass).contains(tar)) {
+            yjxx.setYjJb("20");
+            return true;
+        }
+        yjxx.setYjJb("30");
+        return true;
+    }
+
+    /**
+     * 高新人员预警转指令的规则(全部转为指令)
+     * 车辆：
+     * 左侧人员未系安全带
+     * 右侧人员未系安全带
+     * 套牌车---------------Y
+     * 假牌车---------------Y
+     * 左侧人员接打电话
+     * 其他规则后期在补充
+     */
+    public static boolean isSendZlFun(TbYjxx yjxx, String zllx) {
+        if ("03".equals(zllx)) {
+            String[] yes = new String[]{"套牌车", "假牌车"};
+            return Arrays.asList(yes).contains(yjxx.getYjbqmc());
+        } else return "02".equals(zllx);
+    }
+
+    /**
+     * 指令是否发送街面巡组
+     * 新益州信访人员  -----------------------
+     * 2020年以来扒窃及盗窃电动车人员（刑侦）  -----------------------Y
+     * 2020年以来扒窃及盗窃电动车-常住高新（刑侦）  -----------------------Y
+     * 高新在逃  -----------------------Y
+     * 2022年1至6月有轨迹入盗前科人员库（刑侦）  -----------------------Y
+     * 50人员库  -----------------------
+     * 遂宁籍飞车抢夺前科人员（刑侦）  -----------------------Y
+     * 盗车财前科人员（刑侦）  -----------------------Y
+     * 普通盗窃前科人员（刑侦）  -----------------------Y
+     * 6.6演练  -----------------------
+     * 抢夺抢劫前科人员（前科）  -----------------------Y
+     * 成都涉毒人员专业库（刑侦）  -----------------------Y
+     * 抢劫案（看守所）  -----------------------Y
+     * 全省ZDR  -----------------------
+     * 非机动车犯罪嫌疑人  -----------------------Y
+     * 盗窃（拘留所）  -----------------------Y
+     * 盗窃汽车（看守所）  -----------------------Y
+     * 扒窃前科人员专业库（刑侦）  -----------------------Y
+     * 盗窃非机动车前科人员专业库（刑侦）  -----------------------Y
+     * 房产纠纷  -----------------------
+     * 赔偿纠纷  -----------------------
+     * 涉法涉诉  -----------------------
+     * 抢夺、抢劫  -----------------------Y
+     * 七类前科  -----------------------
+     * 2018年以来两族街面＋入盗前科人员（刑侦）  -----------------------Y
+     * 2022年以来盗窃非机动车前科人员（刑侦）  -----------------------Y
+     * 全市ZDR  -----------------------
+     * 富士康员工人像库  -----------------------
+     * <p>
+     * <p>
+     * 车辆：
+     * 左侧人员未系安全带
+     * 右侧人员未系安全带
+     * 套牌车 ----------------Y
+     * 假牌车-----------------Y
+     * 左侧人员接打电话
+     */
+    public static boolean isSendJmxz(TbYjxx yjxx, String zllx) {
+        if ("02".equals(zllx)) {
+            String[] yes = new String[]{"2020年以来扒窃及盗窃电动车人员（刑侦）", "2020年以来扒窃及盗窃电动车-常住高新（刑侦）",
+                    "高新在逃", "2022年1至6月有轨迹入盗前科人员库（刑侦）", "遂宁籍飞车抢夺前科人员（刑侦）", "盗车财前科人员（刑侦）",
+                    "普通盗窃前科人员（刑侦）", "普通盗窃前科人员（刑侦）", "抢夺抢劫前科人员（前科）", "成都涉毒人员专业库（刑侦）",
+                    "抢劫案（看守所）", "非机动车犯罪嫌疑人", "盗窃（拘留所）", "盗窃汽车（看守所）", "扒窃前科人员专业库（刑侦）",
+                    "盗窃非机动车前科人员专业库（刑侦）", "抢夺、抢劫", "2018年以来两族街面＋入盗前科人员（刑侦）",
+                    "2022年以来盗窃非机动车前科人员（刑侦）"};
+            return Arrays.asList(yes).contains(yjxx.getYjbqmc());
+        } else if ("03".equals(zllx)) {
+            String[] yes = new String[]{"套牌车", "假牌车"};
+            return Arrays.asList(yes).contains(yjxx.getYjbqmc());
+        }
+        return false;
+    }
+}
diff --git a/mosty-yjzl/src/main/resources/application.yml b/mosty-yjzl/src/main/resources/application.yml
new file mode 100644
index 0000000..cfb8f49
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/application.yml
@@ -0,0 +1,78 @@
+ribbon:
+  ReadTimeout: 6000000
+  ConnectTimeout: 6000000
+spring:
+  kafka:
+    producer:
+      bootstrap-servers: 80.2.22.235:19092
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8010
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/resources/bootstrap.yml b/mosty-yjzl/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..1da5a57
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8015
+  servlet:
+    context-path: /mosty-yjzl/
+spring:
+  application:
+    name: mosty-yjzl
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-yjzl/src/main/resources/logback-spring.xml b/mosty-yjzl/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..7041b5a
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+<!--        <appender-ref ref="LOG_FILE_INFO" />-->
+<!--        <appender-ref ref="LOG_FILE_WARN" />-->
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/resources/mapper/TbFzyc.xml b/mosty-yjzl/src/main/resources/mapper/TbFzyc.xml
new file mode 100644
index 0000000..4fd5c44
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbFzyc.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbFzycMapper">
+    <select id="selectListBm" resultType="com.mosty.base.model.entity.yjzl.TbFzyc">
+        SELECT  *   FROM `tb_fzyc`  WHERE  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  id IN (  SELECT DISTINCT  fzyc_id  FROM tb_fzyc_jsdx  WHERE xt_scbz = '0'
+               and  ssbmdm  like concat(#{ssbmdm},'%')
+                <if test="keyWord != null and keyWord != ''">
+                    and (
+                        ssbm like concat('%',#{keyWord},'%')
+                      or  xfq_mc like concat('%',#{keyWord},'%')
+                    )
+                </if>
+            )
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and real_date >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and real_date &lt;= #{jssj}
+        </if>
+        <if test="gridType != null and gridType != ''">
+            and grid_type = #{gridType}
+        </if>
+        <if test="bc != null and bc != ''">
+            and bc = #{bc}
+        </if>
+        <if test="sfxl != null and sfxl != ''">
+            and sfxl = #{sfxl}
+        </if>
+        <if test="bcList != null and bcList.size() > 0">
+            and  bc in
+            <foreach collection="bcList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by real_date desc
+    </select>
+
+    <select id="getFzyjCount" resultType="int">
+
+        SELECT  count(1)  FROM `tb_fzyc`  WHERE  xt_sjzt = '1' and xt_scbz = '0'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and  id IN (  SELECT DISTINCT  fzyc_id  FROM tb_fzyc_jsdx  WHERE
+            ssbmdm  like concat(#{ssbmdm},'%')
+            )
+        </if>
+        <if test="kssj != null and kssj != ''">
+            and real_date >= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and real_date &lt;= #{jssj}
+        </if>
+        <if test="gridType != null and gridType != ''">
+            and grid_type = #{gridType}
+        </if>
+        <if test="bc != null and bc != ''">
+            and bc = #{bc}
+        </if>
+        <if test="sfxl != null and sfxl != ''">
+            and sfxl = #{sfxl}
+        </if>
+    </select>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbFzycXfxz.xml b/mosty-yjzl/src/main/resources/mapper/TbFzycXfxz.xml
new file mode 100644
index 0000000..873c6da
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbFzycXfxz.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbFzycXfxzMapper">
+
+    <delete id="updateSfqs">
+         update tb_fzyc_xfxz set sfqs = '1' where zl_id = #{zlid}
+    </delete>
+
+    <select id="selectQs" resultType="java.lang.String">
+        SELECT sfqs FROM `tb_fzyc_xfxz`    where xt_scbz = '0'
+        <if test="bbid != null and bbid != ''">
+            and   bb_id = #{bbid}
+        </if>
+        <if test="fzycid != null and fzycid != ''">
+            and   fzyc_id = #{fzycid}
+        </if>
+    </select>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbFzycXljl.xml b/mosty-yjzl/src/main/resources/mapper/TbFzycXljl.xml
new file mode 100644
index 0000000..7649c32
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbFzycXljl.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbFzycXljlMapper">
+
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbFzycXljl" id="TbWzXfwzMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="xlbbId" column="xlbb_id" jdbcType="VARCHAR"/>
+        <result property="fzyjyczlId" column="fzyjyczl_id" jdbcType="VARCHAR"/>
+        <result property="xlkssj" column="xlkssj" jdbcType="TIMESTAMP"/>
+        <result property="xljssj" column="xljssj" jdbcType="TIMESTAMP"/>
+
+         <result property="xfsc" column="xfsc" jdbcType="INTEGER"/>
+        <result property="xflc" column="xflc" jdbcType="INTEGER"/>
+        <result property="dqjd" column="dqjd" jdbcType="NUMERIC"/>
+        <result property="dqwd" column="dqwd" jdbcType="NUMERIC"/>
+        <result property="zxJl" column="zxJl" jdbcType="NUMERIC"/>
+
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.LineStringTypeHandler"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="xzmc" column="xzmc" jdbcType="VARCHAR"/>
+    </resultMap>
+
+
+    <sql id="base_column_list">
+       id, xlbb_id, fzyjyczl_id, xlkssj, xljssj,
+         dqjd, dqwd, zx_jl, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm,
+        ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm,
+        xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, xfsc, xflc, xzmc
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <!--新增所有列-->
+    <insert id="insertEntity" keyProperty="id" useGeneratedKeys="true">
+        insert into tb_fzyc_xljl(id, xlbb_id, fzyjyczl_id, xlkssj, xljssj,
+         dqjd, dqwd, zx_jl, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm,
+        ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm,
+        xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, xfsc, xflc, zb, xzmc)
+        values (#{id}, #{xlbbId}, #{fzyjyczlId}, #{xlkssj}, #{xljssj},
+         #{dqjd}, #{dqwd}, #{zxJl}, #{ssbm}, #{ssbmdm}, #{ssbmid}, #{ssxgaj}, #{ssxgajdm},
+         #{ssxgajid}, #{sssgaj}, #{sssgajdm}, #{sssgajid}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip},
+          #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm},
+         #{xtCjbmmc}, #{xtZhgxip},#{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{xfsc}, #{xflc},
+         ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}), #{xzmc})
+    </insert>
+
+
+    <!--通过主键修改数据-->
+    <update id="updateEntity">
+        update tb_fzyc_xljl
+        <set>
+            <if test="xlbbId != null and xlbbId != ''">
+                xlbb_id = #{xlbbId},
+            </if>
+            <if test="fzyjyczlId != null and fzyjyczlId != ''">
+                fzyjyczl_id = #{fzyjyczlId},
+            </if>
+            <if test="xlkssj != null">
+                xlkssj = #{xlkssj},
+            </if>
+            <if test="xljssj != null">
+                xljssj = #{xljssj},
+            </if>
+            <if test="dqjd != null">
+                dqjd = #{dqjd},
+            </if>
+            <if test="dqwd != null">
+                dqwd = #{dqwd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.LineStringTypeHandler}),
+            </if>
+
+            <if test="zxJl != null">
+                zx_jl = #{zxJl},
+            </if>
+
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="xfsc != null">
+                xfsc = #{xfsc},
+            </if>
+            <if test="xflc != null">
+                xflc = #{xflc},
+            </if>
+            <if test="xzmc != null and xzmc != ''">
+                xzmc = #{xzmc},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="selectByFzBb" resultMap="TbWzXfwzMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_fzyc_xljl
+        where xt_scbz = '0'
+        <if test="xlbbId != null and xlbbId != ''">
+          and   xlbb_id = #{xlbbId}
+        </if>
+        <if test="fzyjyczlId != null and fzyjyczlId != ''">
+          and   fzyjyczl_id = #{fzyjyczlId}
+        </if>
+        order by xt_cjsj desc
+        limit 1
+    </select>
+
+    <select id="qfzxl" resultMap="TbWzXfwzMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_fzyc_xljl
+        where xt_scbz = '0'
+        <if test="fzyjyczlId != null and fzyjyczlId != ''">
+            and   fzyjyczl_id = #{fzyjyczlId}
+        </if>
+        order by xljssj desc
+
+    </select>
+
+    <select id="pcrys" resultType="java.lang.Integer">
+         SELECT COUNT(1) FROM mosty_hczx.tb_hc_bpcry where  xt_scbz = '0'
+        <if test="bbid != null and bbid != ''">
+            and   bbid = #{bbid}
+        </if>
+    </select>
+
+    <select id="pccls" resultType="java.lang.Integer">
+         SELECT COUNT(1) FROM mosty_hczx.tb_hc_bpccl where  xt_scbz = '0'
+        <if test="bbid != null and bbid != ''">
+            and   bbid = #{bbid}
+        </if>
+    </select>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjDyyjxxMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjDyyjxxMapper.xml
new file mode 100644
index 0000000..231b123
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjDyyjxxMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjDyyjxxMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yj_dyyjxx set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjmxCsbMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjmxCsbMapper.xml
new file mode 100644
index 0000000..734fc4f
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjmxCsbMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjmxCsbMapper">
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjmxMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjmxMapper.xml
new file mode 100644
index 0000000..7463ecd
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjmxMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjmxMapper">
+
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjmxMapperCsb.xml b/mosty-yjzl/src/main/resources/mapper/TbYjmxMapperCsb.xml
new file mode 100644
index 0000000..734fc4f
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjmxMapperCsb.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjmxCsbMapper">
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxClBqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxClBqMapper.xml
new file mode 100644
index 0000000..90653a1
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxClBqMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxClBqMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_cl_bq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxClMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxClMapper.xml
new file mode 100644
index 0000000..9072200
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxClMapper.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxClMapper">
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbYjxxCl" id="tbYjxxcl">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="yjId" column="yj_id" jdbcType="VARCHAR"/>
+        <result property="sjId" column="sj_id" jdbcType="VARCHAR"/>
+        <result property="yjClbq" column="yj_clbq" jdbcType="VARCHAR"/>
+        <result property="yjClbqmc" column="yj_clbqmc" jdbcType="VARCHAR"/>
+        <result property="yjlyBqmc" column="yjly_bqmc" jdbcType="DATE"/>
+        <result property="yjFssj" column="yj_fssj" jdbcType="TIMESTAMP"/>
+        <result property="yjSj" column="yj_sj" jdbcType="TIMESTAMP"/>
+        <result property="yjJb" column="yj_jb" jdbcType="VARCHAR"/>
+        <result property="yjBt" column="yj_bt" jdbcType="VARCHAR"/>
+        <result property="yjNr" column="yj_nr" jdbcType="VARCHAR"/>
+        <result property="yjClcph" column="yj_clcph" jdbcType="VARCHAR"/>
+        <result property="yjCljdcsyrhm" column="yj_cljdcsyrhm" jdbcType="VARCHAR"/>
+        <result property="yjCljdcsyr" column="yj_cljdcsyr" jdbcType="VARCHAR"/>
+        <result property="yjCphys" column="yj_cphys" jdbcType="VARCHAR"/>
+        <result property="yjClys" column="yj_clys" jdbcType="VARCHAR"/>
+        <result property="yjClpp" column="yj_clpp" jdbcType="VARCHAR"/>
+        <result property="yjCllx" column="yj_cllx" jdbcType="VARCHAR"/>
+        <result property="yjClnk" column="yj_clnk" jdbcType="VARCHAR"/>
+        <result property="yjXsfx" column="yj_xsfx" jdbcType="VARCHAR"/>
+        <result property="yjXssd" column="yj_xssd" jdbcType="NUMERIC"/>
+        <result property="yjClrs" column="yj_clrs" jdbcType="INTEGER"/>
+        <result property="clCxsj" column="cl_cxsj" jdbcType="TIMESTAMP"/>
+        <result property="clXssj" column="cl_xssj" jdbcType="TIMESTAMP"/>
+        <result property="yjGzyid" column="yj_gzyid" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="yjDzXzqh" column="yj_dz_xzqh" jdbcType="VARCHAR"/>
+        <result property="yjDz" column="yj_dz" jdbcType="VARCHAR"/>
+        <result property="yjTp" column="yj_tp" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertEntity">
+
+                insert into mosty_yjzl.tb_yjxx_cl(id,yj_id,sj_id,yj_clbq,yj_clbqmc,yjly_bqmc,yj_fssj,yj_sj,yj_jb,yj_bt,yj_nr,
+                    yj_cphlx,yj_clcph,yj_cljdcsyrhm,yj_cljdcsyr,yj_cphys,yj_clys,yj_clpp,yj_cllx,yj_clnk,yj_xsfx,
+                    yj_xssd,yj_clrs,cl_cxsj,cl_xssj,yj_gzyid,jd,wd,zb,zbhash,yj_dz_xzqh,yj_dz,tp_id,yj_tp,
+                                                  ssbmid,ssxgajid,sssgajid,
+                        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+                values (#{id},#{yjId},#{sjId},#{yjClbq},#{yjClbqmc},#{yjlyBqmc},#{yjFssj},#{yjSj},#{yjJb},#{yjBt},#{yjNr},
+                    #{yjCphlx},#{yjClcph},#{yjCljdcsyrhm},#{yjCljdcsyr},#{yjCphys},#{yjClys},#{yjClpp},
+                    #{yjCllx},#{yjClnk},#{yjXsfx},#{yjXssd},#{yjClrs},#{clCxsj},#{clXssj},#{yjGzyid},#{jd},#{wd},
+                    ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                    #{zbhash},#{yjDzXzqh},#{yjDz},#{tpId},#{yjTp},#{ssbmid},#{ssxgajid},#{sssgajid},
+                    #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                    #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                    #{xtZhgxsj},#{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+
+    </insert>
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_cl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzClbqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzClbqMapper.xml
new file mode 100644
index 0000000..2e79245
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzClbqMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzClbqMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz_clbq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByDyid" resultType="com.mosty.base.model.entity.yjzl.TbYjxxDypzClbq">
+        select a.* from tb_yjxx_dypz_clbq a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByDyid">
+        delete from tb_yjxx_dypz_clbq where dy_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzGzyMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzGzyMapper.xml
new file mode 100644
index 0000000..1349793
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzGzyMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzGzyMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz_gzy set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByDyid" resultType="com.mosty.base.model.entity.yjzl.TbYjxxDypzGzy">
+        select a.* from tb_yjxx_dypz_gzy a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByDyid">
+        delete from tb_yjxx_dypz_gzy where dy_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzMapper.xml
new file mode 100644
index 0000000..cc412c1
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzRybqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzRybqMapper.xml
new file mode 100644
index 0000000..232c7d2
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzRybqMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzRybqMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz_rybq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByDyid" resultType="com.mosty.base.model.entity.yjzl.TbYjxxDypzRybq">
+        select a.* from tb_yjxx_dypz_rybq a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByDyid">
+        delete from tb_yjxx_dypz_rybq where dy_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzSjbqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzSjbqMapper.xml
new file mode 100644
index 0000000..b8dcc73
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzSjbqMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzSjbqMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz_sjbq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByDyid" resultType="com.mosty.base.model.entity.yjzl.TbYjxxDypzSjbq">
+        select a.* from tb_yjxx_dypz_sjbq a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByDyid">
+        delete from tb_yjxx_dypz_sjbq where dy_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzYjjbMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzYjjbMapper.xml
new file mode 100644
index 0000000..904c090
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDypzYjjbMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDypzYjjbMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dypz_yjjb set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByDyid" resultType="com.mosty.base.model.entity.yjzl.TbYjxxDypzYjjb">
+        select a.* from tb_yjxx_dypz_yjjb a
+        where a.xt_scbz = '0' and a.xt_sjzt = '1'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByDyid">
+        delete from tb_yjxx_dypz_yjjb where dy_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxDyyjxxMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxDyyjxxMapper.xml
new file mode 100644
index 0000000..cc74f8f
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxDyyjxxMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxDyyjxxMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_dyyjxx set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxMapper.xml
new file mode 100644
index 0000000..ed41d71
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxMapper.xml
@@ -0,0 +1,633 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxMapper">
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbYjxx" id="tbYjxx">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="yjLx" column="yj_lx" jdbcType="VARCHAR"/>
+        <result property="yjGzyid" column="yj_gzyid" jdbcType="VARCHAR"/>
+        <result property="yjGzymc" column="yj_gzymc" jdbcType="DATE"/>
+        <result property="yjFsnf" column="yj_fsnf" jdbcType="DATE"/>
+        <result property="yjFsyf" column="yj_fsyf" jdbcType="DATE"/>
+        <result property="yjFsny" column="yj_fsny" jdbcType="VARCHAR"/>
+        <result property="yjFszs" column="yj_fszs" jdbcType="NUMERIC"/>
+        <result property="yjFsxs" column="yj_fsxs" jdbcType="NUMERIC"/>
+        <result property="yjFsrq" column="yj_fsrq" jdbcType="INTEGER"/>
+        <result property="yjFssj" column="yj_fssj" jdbcType="INTEGER"/>
+        <result property="yjSj" column="yj_sj" jdbcType="INTEGER"/>
+        <result property="yjJb" column="yj_jb" jdbcType="INTEGER"/>
+        <result property="yjBt" column="yj_bt" jdbcType="INTEGER"/>
+        <result property="yjNr" column="yj_nr" jdbcType="INTEGER"/>
+        <result property="yjJrcs" column="yj_jrcs" jdbcType="INTEGER"/>
+        <result property="yjCs" column="yj_cs" jdbcType="INTEGER"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="yjDzXzqh" column="yj_dz_xzqh" jdbcType="VARCHAR"/>
+        <result property="yjDz" column="yj_dz" jdbcType="VARCHAR"/>
+        <result property="yjRyxm" column="yj_ryxm" jdbcType="VARCHAR"/>
+        <result property="yjRysfzh" column="yj_rysfzh" jdbcType="VARCHAR"/>
+        <result property="xsd" column="xsd" jdbcType="NUMERIC"/>
+        <result property="yjHplx" column="yj_hplx" jdbcType="VARCHAR"/>
+        <result property="yjClcph" column="yj_clcph" jdbcType="VARCHAR"/>
+        <result property="yjbq" column="yjbq" jdbcType="VARCHAR"/>
+        <result property="yjbqmc" column="yjbqxq" jdbcType="VARCHAR"/>
+        <result property="sfFszl" column="sf_fszl" jdbcType="VARCHAR"/>
+        <result property="sfWb" column="sf_wb" jdbcType="VARCHAR"/>
+        <result property="yjTp" column="yj_tp" jdbcType="VARCHAR"/>
+        <result property="yjXtp" column="yj_xtp" jdbcType="VARCHAR"/>
+        <result property="yjlyid" column="yjlyid" jdbcType="VARCHAR"/>
+        <result property="yjlyBqmc" column="yjly_bqmc" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="sfYjid" column="sf_yjid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+
+                id
+                        ,yj_lx,yj_gzyid,yj_gzymc,yj_fsnf,yj_fsyf,yj_fsny,yj_fszs,yj_fsxs,
+                        yj_fsrq, yj_fssj, yj_sj,ssbmid,ssxgajid,sssgajid,
+                        yj_jb,yj_bt,yj_nr,yj_jrcs,yj_cs,jd,wd,yj_dz_xzqh,yj_dz,yj_ryxm,xsd,
+                        yj_rysfzh,yj_hplx,yj_clcph,yjbq,yjbqmc,sf_fszl,sf_wb,yj_tp,yj_xtp,yjlyid,yjly_bqmc,
+                        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz,sf_yjid
+
+    </sql>
+
+    <!--获取预警总数-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="yjlxList != null and yjlxList.size > 0">
+            and yj_lx in
+            <foreach collection="yjlxList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="yjlyList != null and yjlyList.size > 0">
+            and yjlyid in
+            <foreach collection="yjlyList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="dto.bqfl != null and dto.bqfl != ''">
+            <choose>
+                <when test="dto.bqfl == '01' ">
+                    and (yjbq like '%ZT%' or yjbq like '%在逃%' )
+                </when>
+                <when test="dto.bqfl == '02' ">
+                    and (yjbq like '%抢%' or yjbq like '%盗%' or yjbq like '%侵财%' )
+                </when>
+                <otherwise>
+                    and (yjbq like '%抢%' or yjbq like '%盗%' or yjbq like '%侵财%' or yjbq like '%ZT%' or yjbq like '%在逃%'
+                    )
+                </otherwise>
+            </choose>
+        </if>
+
+        <if test="dto.yjGzyid != null and dto.yjGzyid != ''">
+            and yj_gzyid = #{dto.yjGzyid}
+        </if>
+        <if test="dto.yjJb != null and dto.yjJb != ''">
+            and yj_jb = #{dto.yjJb}
+        </if>
+        <if test="dto.yjBt != null and dto.yjBt != ''">
+            and yj_bt like concat('%',#{dto.yjBt},'%')
+        </if>
+        <if test="dto.yjNr != null and dto.yjNr != ''">
+            and yj_nr like concat('%',#{dto.yjNr},'%')
+        </if>
+        <if test="dto.yjRyxm != null and dto.yjRyxm != ''">
+            and yj_ryxm = #{dto.yjRyxm}
+        </if>
+        <if test="dto.yjRysfzh != null and dto.yjRysfzh != ''">
+            and yj_rysfzh = #{dto.yjRysfzh}
+        </if>
+        <if test="dto.yjClcph != null and dto.yjClcph != ''">
+            and yj_clcph = #{dto.yjClcph}
+        </if>
+        <if test="dto.sfFszl != null and dto.sfFszl != ''">
+            and sf_fszl = #{dto.sfFszl}
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and yj_fsrq &gt;= #{dto.startTime}
+            and yj_fsrq &lt;= #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+    </select>
+
+    <!--分页获取预警列表-->
+    <select id="getListPage" resultMap="tbYjxx" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="yjlxList != null and yjlxList.size > 0">
+            and yj_lx in
+            <foreach collection="yjlxList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+
+
+        <if test="yjlyList != null and yjlyList.size > 0">
+            and yjlyid in
+            <foreach collection="yjlyList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="dto.bqfl != null and dto.bqfl != ''">
+            <choose>
+                <when test="dto.bqfl == '01' ">
+                    and (yjbq like '%ZT%' or yjbq like '%在逃%' )
+                </when>
+                <when test="dto.bqfl == '02' ">
+                    and (yjbq like '%抢%' or yjbq like '%盗%' or yjbq like '%侵财%' )
+                </when>
+                <otherwise>
+                    and (yjbq like '%抢%' or yjbq like '%盗%' or yjbq like '%侵财%' or yjbq like '%ZT%' or yjbq like '%在逃%'
+                    )
+                </otherwise>
+            </choose>
+        </if>
+
+
+
+        <if test="dto.yjGzyid != null and dto.yjGzyid != ''">
+            and yj_gzyid = #{dto.yjGzyid}
+        </if>
+        <if test="dto.yjJb != null and dto.yjJb != ''">
+            and yj_jb = #{dto.yjJb}
+        </if>
+        <if test="dto.yjBt != null and dto.yjBt != ''">
+            and yj_bt like concat('%',#{dto.yjBt},'%')
+        </if>
+        <if test="dto.yjNr != null and dto.yjNr != ''">
+            and yj_nr like concat('%',#{dto.yjNr},'%')
+        </if>
+        <if test="dto.yjRyxm != null and dto.yjRyxm != ''">
+            and yj_ryxm = #{dto.yjRyxm}
+        </if>
+        <if test="dto.yjRysfzh != null and dto.yjRysfzh != ''">
+            and yj_rysfzh = #{dto.yjRysfzh}
+        </if>
+        <if test="dto.yjClcph != null and dto.yjClcph != ''">
+            and yj_clcph = #{dto.yjClcph}
+        </if>
+        <if test="dto.sfFszl != null and dto.sfFszl != ''">
+            and sf_fszl = #{dto.sfFszl}
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and yj_fsrq &gt;= #{dto.startTime}
+            and yj_fsrq &lt;= #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <!--        ${useSql}-->
+        order
+        by yj_sj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--获取所有预警列表-->
+    <select id="getList" resultMap="tbYjxx" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="yjlxList != null and yjlxList.size > 0">
+            and yj_lx in
+            <foreach collection="yjlxList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.yjGzyid != null and dto.yjGzyid != ''">
+            and yj_gzyid = #{dto.yjGzyid}
+        </if>
+        <if test="dto.yjJb != null and dto.yjJb != ''">
+            and yj_jb = #{dto.yjJb}
+        </if>
+        <if test="dto.yjRyxm != null and dto.yjRyxm != ''">
+            and yj_ryxm like concat('%',#{dto.yjRyxm},'%')
+        </if>
+        <if test="dto.yjBt != null and dto.yjBt != ''">
+            and yj_bt like concat('%',#{dto.yjBt},'%')
+        </if>
+        <if test="dto.yjNr != null and dto.yjNr != ''">
+            and yj_nr like concat('%',#{dto.yjNr},'%')
+        </if>
+        <if test="dto.sfFszl != null and dto.sfFszl != ''">
+            and sf_fszl = #{dto.sfFszl}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and yj_sj &gt;= #{dto.startTime}
+            and yj_sj &lt;= #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <!--        ${useSql}-->
+        order by yj_sj desc
+    </select>
+
+    <!--查询预警详情-->
+    <select id="getInfoById" resultMap="tbYjxx">
+        select
+        <include refid="base_column_list"/>
+        from tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <!--查询预警详情-->
+    <select id="queryTbYjxx" resultMap="tbYjxx">
+        select
+        <include refid="base_column_list"/>
+        from mosty_yjzl.tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        and yjlyid = #{yjlyid}
+    </select>
+
+    <select id="countBySfzhOrCph" resultType="java.lang.Integer">
+        select count(1) from mosty_yjzl.tb_yjxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="sfzh != null and sfzh != ''">
+            and yj_rysfzh = #{sfzh}
+        </if>
+        <if test="cphm != null and cphm != ''">
+            and yj_clcph = #{cphm}
+        </if>
+    </select>
+
+    <select id="countCurrentBySfzhOrCph" resultType="int">
+        select count(1) from mosty_yjzl.tb_yjxx where xt_sjzt = '1' and xt_scbz = '0' and yj_sj >= CURRENT_DATE
+        <if test="sfzh != null and sfzh != ''">
+            and yj_rysfzh = #{sfzh}
+        </if>
+        <if test="cphm != null and cphm != ''">
+            and yj_clcph = #{cphm}
+        </if>
+    </select>
+
+    <insert id="insertEntity">
+
+                insert into mosty_yjzl.tb_yjxx(id, yj_lylx, yj_lx, yj_gzyid, yj_gzymc, yj_fsnf, yj_fsyf, yj_fsny, yj_fszs,
+                                               yj_fsxs, ssbmid, ssxgajid, sssgajid,
+                                               yj_fsrq,
+                                               yj_fssj, yj_sj, yj_jb, yj_bt, yj_nr, yj_jrcs, yj_cs, jd, wd,
+                                               yj_dz_xzqh, yj_dz, yj_ryxm, yj_rysfzh, xsd,
+                                               yj_hplx, yj_clcph, yjbq, yjbqmc, sf_fszl, sf_wb, yj_tp, yj_xtp, yjlyid,
+                                               yjly_bqmc,
+                                               ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                               xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                                               xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, sf_yjid)
+                values (#{id}, #{yjLylx}, #{yjLx}, #{yjGzyid}, #{yjGzymc}, #{yjFsnf}, #{yjFsyf}, #{yjFsny}, #{yjFszs},
+                        #{yjFsxs}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                        #{yjFsrq},
+                        #{yjFssj}, #{yjSj}, #{yjJb}, #{yjBt}, #{yjNr}, #{yjJrcs}, #{yjCs}, #{jd}, #{wd},
+                        #{yjDzXzqh}, #{yjDz}, #{yjRyxm}, #{yjRysfzh}, #{xsd},
+                        #{yjHplx}, #{yjClcph}, #{yjbq}, #{yjbqmc}, #{sfFszl}, #{sfWb}, #{yjTp}, #{yjXtp}, #{yjlyid},
+                        #{yjlyBqmc},
+                        #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                        #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                        #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{sfYjid})
+
+    </insert>
+
+    <select id="getYjxxTj" resultType="java.util.Map">
+        select count(yj_jb) count, yj_jb
+        from tb_yjxx
+        where xt_scbz = '0'
+        and xt_sjzt = '1'
+        <if test="dto.yjGzyid != null and dto.yjGzyid != ''">
+            and yj_gzyid = #{dto.yjGzyid}
+        </if>
+        <if test="dto.yjRysfzh != null and dto.yjRysfzh != ''">
+            and yj_rysfzh = #{dto.yjRysfzh}
+        </if>
+        <if test="dto.yjRyxm != null and dto.yjRyxm != ''">
+            and yj_ryxm = #{dto.yjRyxm}
+        </if>
+        <if test="dto.yjClcph != null and dto.yjClcph != ''">
+            and yj_clcph = #{dto.yjClcph}
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_fsrq >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_fsrq &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+        group by yj_jb
+    </select>
+
+    <select id="getYjxxTjYjlx" resultType="java.util.Map">
+        select count(yj_lx) count, yj_lx
+        from tb_yjxx
+        where xt_scbz = '0'
+        and xt_sjzt = '1'
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != ''">
+            and yj_fsrq &gt;= #{kssj}
+            and yj_fsrq &lt;= #{jssj}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        <!--        ${useSql}-->
+        group by yj_lx
+    </select>
+
+    <select id="todayGsdyj" resultType="java.util.Map">
+
+                SELECT IFNULL(SUM(quantity), 0) total,
+                       '1'                      type,
+                       h
+                FROM (
+                             SELECT COUNT(1)                                    quantity,
+                                    yj_lx,
+                                    (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2) h
+                             FROM tb_yjxx
+                             WHERE date_format(yj_fssj, '%y-%m-%d') = DATE_FORMAT(now(), '%y-%m-%d')
+                             GROUP BY yj_lx,
+                                      (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ORDER BY (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ) s
+                WHERE yj_lx IN ('1', '3', '4')
+                GROUP BY h
+
+                UNION
+                SELECT IFNULL(SUM(quantity), 0) total,
+                       '2'                      type,
+                       h
+                FROM (
+                             SELECT COUNT(1)                                    quantity,
+                                    yj_lx,
+                                    (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2) h
+                             FROM tb_yjxx
+                             WHERE date_format(yj_fssj, '%y-%m-%d') = DATE_FORMAT(now(), '%y-%m-%d')
+                             GROUP BY yj_lx,
+                                      (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ORDER BY (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ) s
+                WHERE yj_lx IN ('2', '4')
+                GROUP BY h
+                UNION
+                SELECT IFNULL(SUM(quantity), 0) total,
+                       '3'                      type,
+                       h
+                FROM (
+                             SELECT COUNT(1)                                    quantity,
+                                    yj_lx,
+                                    (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2) h
+                             FROM tb_yjxx
+                             WHERE date_format(yj_fssj, '%y-%m-%d') = DATE_FORMAT(now(), '%y-%m-%d')
+                             GROUP BY yj_lx,
+                                      (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ORDER BY (FLOOR(DATE_FORMAT(yj_fssj, '%H') / 2) * 2)
+                             ) s
+                WHERE yj_lx = '5'
+                GROUP BY h
+
+    </select>
+
+    <update id="updateEntity">
+        update tb_yjxx
+        <set>
+            <if test="yjLx != null and yjLx != ''">
+                yj_lx = #{yjLx},
+            </if>
+            <if test="yjGzyid != null and yjGzyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="yjGzymc != null and yjGzymc != ''">
+                yj_gzymc = #{yjGzymc},
+            </if>
+            <if test="yjFsnf != null">
+                yj_fsnf = #{yjFsnf},
+            </if>
+            <if test="yjFsyf != null">
+                yj_fsyf = #{yjFsyf},
+            </if>
+            <if test="yjFsny != null">
+                yj_fsny = #{yjFsny},
+            </if>
+            <if test="yjFszs != null">
+                yj_fszs = #{yjFszs},
+            </if>
+            <if test="yjFsrq != null">
+                yj_fsrq = #{yjFsrq},
+            </if>
+            <if test="yjFssj != null">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="yjJb != null">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="yjBt != null and yjBt != ''">
+                yj_bt = #{yjBt},
+            </if>
+            <if test="yjNr != null and yjNr != ''">
+                yj_nr = #{yjNr},
+            </if>
+            <if test="yjJrcs != null">
+                yj_jrcs = #{yjJrcs},
+            </if>
+            <if test="yjCs != null">
+                yj_cs = #{yjCs},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+
+            <if test="yjDzXzqh != null and yjDzXzqh != ''">
+                yj_dz_xzqh = #{yjDzXzqh},
+            </if>
+            <if test="yjDz != null and yjDz != ''">
+                yj_dz = #{yjDz},
+            </if>
+            <if test="yjRyxm != null and yjRyxm != ''">
+                yj_ryxm = #{yjRyxm},
+            </if>
+            <if test="yjRysfzh != null and yjRysfzh != ''">
+                yj_rysfzh = #{yjRysfzh},
+            </if>
+            <if test="xsd != null">
+                xsd = #{xsd},
+            </if>
+            <if test="yjHplx != null and yjHplx != ''">
+                yj_hplx = #{yjHplx},
+            </if>
+            <if test="yjClcph != null and yjClcph != ''">
+                yj_clcph = #{yjClcph},
+            </if>
+            <if test="yjbq != null and yjbq != ''">
+                yjbq = #{yjbq},
+            </if>
+            <if test="yjbqmc != null and yjbqmc != ''">
+                yjbqmc = #{yjbqmc},
+            </if>
+            <if test="sfFszl != null and sfFszl != ''">
+                sf_fszl = #{sfFszl},
+            </if>
+            <if test="sfWb != null and sfWb != ''">
+                sf_wb = #{sfWb},
+            </if>
+            <if test="yjTp != null and yjTp != ''">
+                yj_tp = #{yjTp},
+            </if>
+            <if test="yjXtp != null and yjXtp != ''">
+                yj_xtp = #{yjXtp},
+            </if>
+            <if test="yjlyid != null and yjlyid != ''">
+                yjlyid = #{yjlyid},
+            </if>
+            <if test="yjlyBqmc != null and yjlyBqmc != ''">
+                yjly_bqmc = #{yjlyBqmc},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="sfYjid != null and sfYjid != ''">
+                sf_yjid = #{sfYjid},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--获取所有预警列表-->
+    <select id="queryJq" resultType="com.mosty.base.model.entity.sjzx.TbJq">
+        select
+        *
+        from mosty_sjzx.tb_jq where xt_sjzt = '1' and xt_scbz = '0' and jd is not null
+        and bjlb in (01000000,02000000,06000000,07000000,09000000,10000000,11000000)
+        <if test="kssj != null and kssj != ''">
+            and bjsj &gt;= #{kssj}
+        </if>
+        <if test="jssj != null and jssj != ''">
+            and bjsj &lt;= #{jssj}
+        </if>
+    </select>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxMxyjMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxMxyjMapper.xml
new file mode 100644
index 0000000..0a2b2de
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxMxyjMapper.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxMxyjMapper">
+    <insert id="insertEntity">
+        insert into mosty_yjzl.tb_yjxx_mxyj(id, yjid, mxid, yjids, yj_lx, yj_gzyid, yj_gzymc, yj_fsnf, yj_fsyf, yj_fsny,
+                                            yj_fszs,ssbmid,ssxgajid,sssgajid,
+                                            yj_fsxs,
+                                            yj_fsrq, yjsl,
+                                            yj_fssj, yj_sj, yj_jb, yj_bt, yj_nr, jd, wd, zb, zbhash,jl,
+                                            yj_dz_xzqh, yj_dz, yj_ryxm, yj_rysfzh, xsd,
+                                            yj_hplx, yj_clcph, yjbq, yjbqmc, sf_fszl, sf_wb, yjlyid,
+                                            yjly_bqmc,
+                                            ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                            xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                            xt_zhgxsj,
+                                            xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{yjid}, #{mxid}, #{yjids}, #{yjLx}, #{yjGzyid}, #{yjGzymc}, #{yjFsnf}, #{yjFsyf}, #{yjFsny},
+                #{yjFszs},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{yjFsxs},
+                #{yjFsrq}, #{yjsl},
+                #{yjFssj}, #{yjSj}, #{yjJb}, #{yjBt}, #{yjNr}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash},#{jl}, #{yjDzXzqh}, #{yjDz}, #{yjRyxm}, #{yjRysfzh}, #{xsd},
+                #{yjHplx}, #{yjClcph}, #{yjbq}, #{yjbqmc}, #{sfFszl}, #{sfWb}, #{yjlyid},
+                #{yjlyBqmc},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <update id="updateEntity">
+        update tb_yjxx_mxyj
+        <set>
+            <if test="yjLx != null and yjLx != ''">
+                yj_lx = #{yjLx},
+            </if>
+            <if test="jl != null">
+                jl = #{jl},
+            </if>
+            <if test="mxid != null and mxid != ''">
+                mxid = #{mxid},
+            </if>
+            <if test="yjid != null and yjid != ''">
+                yjid = #{yjid},
+            </if>
+            <if test="yjids != null and yjids != ''">
+                yjids = #{yjids},
+            </if>
+            <if test="yjGzyid != null and yjGzyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="yjGzymc != null and yjGzymc != ''">
+                yj_gzymc = #{yjGzymc},
+            </if>
+            <if test="yjFsnf != null">
+                yj_fsnf = #{yjFsnf},
+            </if>
+            <if test="yjFsyf != null">
+                yj_fsyf = #{yjFsyf},
+            </if>
+            <if test="yjFsny != null">
+                yj_fsny = #{yjFsny},
+            </if>
+            <if test="yjFszs != null">
+                yj_fszs = #{yjFszs},
+            </if>
+            <if test="yjsl != null">
+                yjsl = #{yjsl},
+            </if>
+            <if test="yjFsrq != null">
+                yj_fsrq = #{yjFsrq},
+            </if>
+            <if test="yjFssj != null">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="yjJb != null">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="yjBt != null and yjBt != ''">
+                yj_bt = #{yjBt},
+            </if>
+            <if test="yjNr != null and yjNr != ''">
+                yj_nr = #{yjNr},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="yjDzXzqh != null and yjDzXzqh != ''">
+                yj_dz_xzqh = #{yjDzXzqh},
+            </if>
+            <if test="yjDz != null and yjDz != ''">
+                yj_dz = #{yjDz},
+            </if>
+            <if test="yjRyxm != null and yjRyxm != ''">
+                yj_ryxm = #{yjRyxm},
+            </if>
+            <if test="yjRysfzh != null and yjRysfzh != ''">
+                yj_rysfzh = #{yjRysfzh},
+            </if>
+            <if test="xsd != null">
+                xsd = #{xsd},
+            </if>
+            <if test="yjHplx != null and yjHplx != ''">
+                yj_hplx = #{yjHplx},
+            </if>
+            <if test="yjClcph != null and yjClcph != ''">
+                yj_clcph = #{yjClcph},
+            </if>
+            <if test="yjbq != null and yjbq != ''">
+                yjbq = #{yjbq},
+            </if>
+            <if test="yjbqmc != null and yjbqmc != ''">
+                yjbqmc = #{yjbqmc},
+            </if>
+            <if test="sfFszl != null and sfFszl != ''">
+                sf_fszl = #{sfFszl},
+            </if>
+            <if test="sfWb != null and sfWb != ''">
+                sf_wb = #{sfWb},
+            </if>
+            <if test="yjlyid != null and yjlyid != ''">
+                yjlyid = #{yjlyid},
+            </if>
+            <if test="yjlyBqmc != null and yjlyBqmc != ''">
+                yjly_bqmc = #{yjlyBqmc},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="selectbyMxId" resultType="com.mosty.base.model.entity.yjzl.TbYjxxMxyj">
+        select * from tb_yjxx_mxyj a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and a.mxid = #{mxid}
+        <![CDATA[ and a.yj_fssj >= #{kssj} and a.yj_fssj <= #{jssj} ]]>
+        <![CDATA[ and st_distance_sphere(POINT(a.jd,a.wd),POINT(#{jd},#{wd})) <= #{radius} ]]>
+        order by st_distance_sphere(POINT(a.jd,a.wd),POINT(#{jd},#{wd})) asc
+        limit 1
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxRyBqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxRyBqMapper.xml
new file mode 100644
index 0000000..80a7978
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxRyBqMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxRyBqMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_ry_bq set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByYjryId" resultType="com.mosty.base.model.entity.yjzl.TbYjxxRyBq">
+        select a.* from tb_yjxx_ry_bq a
+        where a.xt_scbz = '0'
+        and a.yjry_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByYwid">
+        delete from tb_yjxx_ry_bq where yjry_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxRyMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxRyMapper.xml
new file mode 100644
index 0000000..5eab4ab
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxRyMapper.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxRyMapper">
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbYjxxRy" id="tbYjxxRy">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="yjId" column="yj_id" jdbcType="VARCHAR"/>
+        <result property="yjClid" column="yj_clid" jdbcType="VARCHAR"/>
+        <result property="sjId" column="sj_id" jdbcType="VARCHAR"/>
+        <result property="yjSjly" column="yj_sjly" jdbcType="VARCHAR"/>
+        <result property="yjGzyid" column="yj_gzyid" jdbcType="VARCHAR"/>
+        <result property="yjGzymc" column="yj_gzymc" jdbcType="VARCHAR"/>
+        <result property="yjFssj" column="yj_fssj" jdbcType="TIMESTAMP"/>
+        <result property="yjSj" column="yj_sj" jdbcType="TIMESTAMP"/>
+        <result property="yjJb" column="yj_jb" jdbcType="VARCHAR"/>
+        <result property="yjBt" column="yj_bt" jdbcType="VARCHAR"/>
+        <result property="yjNr" column="yj_nr" jdbcType="VARCHAR"/>
+        <result property="yjRybq" column="yj_rybq" jdbcType="VARCHAR"/>
+        <result property="yjRybqmc" column="yj_rybqmc" jdbcType="VARCHAR"/>
+        <result property="yjZjlx" column="yj_zjlx" jdbcType="VARCHAR"/>
+        <result property="yjZjhm" column="yj_zjhm" jdbcType="VARCHAR"/>
+        <result property="yjRyxm" column="yj_ryxm" jdbcType="VARCHAR"/>
+        <result property="yjRyxb" column="yj_ryxb" jdbcType="VARCHAR"/>
+        <result property="yjRynl" column="yj_rynl" jdbcType="VARCHAR"/>
+        <result property="yjRymz" column="yj_rymz" jdbcType="VARCHAR"/>
+        <result property="yjRyjg" column="yj_ryjg" jdbcType="VARCHAR"/>
+        <result property="yjRyhjdXzqh" column="yj_ryhjd_xzqh" jdbcType="VARCHAR"/>
+        <result property="yjRyhjd" column="yj_ryhjd" jdbcType="NUMERIC"/>
+        <result property="yjRyjzdXzqh" column="yj_ryjzd_xzqh" jdbcType="INTEGER"/>
+        <result property="yjRyjzd" column="yj_ryjzd" jdbcType="TIMESTAMP"/>
+        <result property="yjRygzdwid" column="yj_rygzdwid" jdbcType="TIMESTAMP"/>
+        <result property="yjRygzdw" column="yj_rygzdw" jdbcType="VARCHAR"/>
+        <result property="yjRylxdh" column="yj_rylxdh" jdbcType="VARCHAR"/>
+        <result property="yjXsd" column="yj_xsd" jdbcType="VARCHAR"/>
+        <result property="yjXwms" column="yj_xwms" jdbcType="VARCHAR"/>
+        <result property="ltx" column="ltx" jdbcType="VARCHAR"/>
+        <result property="lty" column="lty" jdbcType="VARCHAR"/>
+        <result property="rbx" column="rbx" jdbcType="VARCHAR"/>
+        <result property="rby" column="rby" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="yjDzxzqh" column="yj_dzxzqh" jdbcType="VARCHAR"/>
+        <result property="yjDz" column="yj_dz" jdbcType="VARCHAR"/>
+        <result property="tpId" column="tp_id" jdbcType="VARCHAR"/>
+        <result property="coverImage" column="cover_image" jdbcType="VARCHAR"/>
+        <result property="yjlyBqmc" column="yjly_bqmc" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertEntity">
+        insert into mosty_yjzl.tb_yjxx_ry(id, yj_id, yj_clid, sj_id, yj_sjly, yj_gzyid, yj_gzymc, yj_fssj, yj_sj, yj_jb,
+                                          yj_bt, ssbmid, ssxgajid, sssgajid,
+                                          yj_nr,
+                                          yj_rybq, yj_rybqmc, yj_zjlx, yj_zjhm, yj_ryxm, yj_ryxb, yj_rynl, yj_rymz,
+                                          yj_ryjg, yj_ryhjd_xzqh, yj_ryhjd,
+                                          yj_ryjzd_xzqh, yj_ryjzd, yj_rygzdwid, yj_rygzdw, yj_rylxdh, yj_xsd, yj_xwms,
+                                          ltx, lty, rbx, rby, jd, wd,
+                                          zb, zbhash, yj_dzxzqh, yj_dz, tp_id, cover_image, yjly_bqmc,
+                                          ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                                          xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                                          xt_zhgxsj,
+                                          xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{yjId}, #{yjClid}, #{sjId}, #{yjSjly}, #{yjGzyid}, #{yjGzymc}, #{yjFssj}, #{yjSj}, #{yjJb},
+                #{yjBt}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                #{yjNr},
+                #{yjRybq}, #{yjRybqmc}, #{yjZjlx}, #{yjZjhm}, #{yjRyxm}, #{yjRyxb}, #{yjRynl}, #{yjRymz}, #{yjRyjg},
+                #{yjRyhjdXzqh}, #{yjRyhjd},
+                #{yjRyjzdXzqh}, #{yjRyjzd}, #{yjRygzdwid}, #{yjRygzdw}, #{yjRylxdh}, #{yjXsd}, #{yjXwms}, #{ltx},
+                #{lty}, #{rbx},
+                #{rby}, #{jd}, #{wd}, ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{yjDzxzqh}, #{yjDz}, #{tpId}, #{coverImage}, #{yjlyBqmc},
+                #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                #{xtZhgxsj}, #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_ry set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (a.zb)
+                as zb
+    </sql>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxRySjajMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxRySjajMapper.xml
new file mode 100644
index 0000000..7707cd5
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxRySjajMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxRySjajMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_ry_sjaj set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="queryByYjryId" resultType="com.mosty.base.model.entity.yjzl.TbYjxxRySjaj">
+        select a.* from tb_yjxx_ry_sjaj a
+        where a.xt_scbz = '0'
+        and a.yjry_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="deleteByYwid">
+        delete from tb_yjxx_ry_sjaj where yjry_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxSjGlryclMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxSjGlryclMapper.xml
new file mode 100644
index 0000000..2932903
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxSjGlryclMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxSjGlryclMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_sj_glrycl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="deleteByYjId" resultType="com.mosty.base.model.entity.yjzl.TbYjxxSjGlrycl">
+        select a.* from tb_yjxx_sj_glrycl a
+        where a.xt_scbz = '0'
+        and a.dy_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <!--根据业务ID删除明细-->
+    <update id="queryByYjid">
+        delete from tb_yjxx_sj_glrycl where yj_id = #{dyid}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxSjMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxSjMapper.xml
new file mode 100644
index 0000000..7b4364f
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxSjMapper.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxSjMapper">
+
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbYjxxSj" id="tbYjxx">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="yjId" column="yj_id" jdbcType="VARCHAR"/>
+        <result property="yjGzyid" column="yj_gzyid" jdbcType="VARCHAR"/>
+        <result property="sjFl" column="sj_fl" jdbcType="VARCHAR"/>
+        <result property="sjFlmc" column="sj_flmc" jdbcType="DATE"/>
+        <result property="yjJb" column="yj_jb" jdbcType="DATE"/>
+        <result property="yjFssj" column="yj_fssj" jdbcType="DATE"/>
+        <result property="yjSj" column="yj_sj" jdbcType="VARCHAR"/>
+        <result property="yjBt" column="yj_bt" jdbcType="NUMERIC"/>
+        <result property="yjNr" column="yj_nr" jdbcType="NUMERIC"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="yjDzXzqh" column="yj_dz_xzqh" jdbcType="VARCHAR"/>
+        <result property="yjDz" column="yj_dz" jdbcType="VARCHAR"/>
+        <result property="yjTp" column="yj_tp" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_sj set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据指令ID删除明细-->
+    <update id="deleteByYjId">
+        update tb_yjxx_sj set xt_scbz = '1' where yj_id = #{yjid}
+    </update>
+
+    <insert id="insertEntity">
+        insert into mosty_yjzl.tb_yjxx_sj(id,yj_id,yj_gzyid,sj_fl,sj_flmc,yj_jb,yj_fssj,yj_sj,yj_bt,yj_nr,
+                        jd,wd,zb,zbhash,yj_dz_xzqh,yj_dz,yj_tp,ssbmid,ssxgajid,sssgajid,
+                        ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+                values (#{id},#{yjId},#{yjGzyid},#{sjFl},#{sjFlmc},#{yjJb},#{yjFssj},#{yjSj},#{yjBt},#{yjNr},#{jd},#{wd},
+                        ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                        #{zbhash},#{yjDzXzqh},#{yjDz},#{yjTp},#{ssbmid},#{ssxgajid},#{sssgajid},
+                        #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                        #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                        #{xtZhgxsj},#{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbYjxxYjczjlMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbYjxxYjczjlMapper.xml
new file mode 100644
index 0000000..a985f52
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbYjxxYjczjlMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjxxYjczjlMapper">
+
+    <!--根据ID删除-->
+    <update id="deleteByIds">
+        update tb_yjxx_sj_glrycl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlJqMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlJqMapper.xml
new file mode 100644
index 0000000..4338efc
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlJqMapper.xml
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlJqMapper">
+
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbZlJq" id="TbZlJq">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="zlId" column="zlId" jdbcType="VARCHAR"/>
+        <result property="jqId" column="jqId" jdbcType="VARCHAR"/>
+        <result property="jjdbh" column="jjdbh" jdbcType="VARCHAR"/>
+        <result property="gljjdbh" column="gljjdbh" jdbcType="VARCHAR"/>
+        <result property="bjsj" column="bjsj" jdbcType="TIMESTAMP"/>
+        <result property="jjsj" column="jjsj" jdbcType="TIMESTAMP"/>
+        <result property="jqfskssj" column="jqfskssj" jdbcType="TIMESTAMP"/>
+        <result property="jqfsjssj" column="jqfsjssj" jdbcType="TIMESTAMP"/>
+        <result property="bjdh" column="bjdh" jdbcType="VARCHAR"/>
+        <result property="bjdhYhxm" column="bjdhYhxm" jdbcType="VARCHAR"/>
+        <result property="bjdhYhdz" column="bjdhYhdz" jdbcType="VARCHAR"/>
+        <result property="bjrSfzh" column="bjrSfzh" jdbcType="VARCHAR"/>
+        <result property="bjrXm" column="bjrXm" jdbcType="VARCHAR"/>
+        <result property="bjrXb" column="bjrXb" jdbcType="VARCHAR"/>
+        <result property="bjrLxdh" column="bjrLxdh" jdbcType="VARCHAR"/>
+        <result property="bjrZzdw" column="bjrZzdw" jdbcType="VARCHAR"/>
+        <result property="sfdzxzqh" column="sfdzxzqh" jdbcType="VARCHAR"/>
+        <result property="sfdz" column="sfdz" jdbcType="VARCHAR"/>
+        <result property="ldgbh" column="ldgbh" jdbcType="VARCHAR"/>
+        <result property="bjnr" column="bjnr" jdbcType="VARCHAR"/>
+        <result property="jqjb" column="jqjb" jdbcType="VARCHAR"/>
+        <result property="ay" column="ay" jdbcType="VARCHAR"/>
+        <result property="bjlb" column="bjlb" jdbcType="VARCHAR"/>
+        <result property="bjlbmc" column="bjlbmc" jdbcType="VARCHAR"/>
+        <result property="bjlx" column="bjlx" jdbcType="VARCHAR"/>
+        <result property="bjlxmc" column="bjlxmc" jdbcType="VARCHAR"/>
+        <result property="bjxl" column="bjxl" jdbcType="VARCHAR"/>
+        <result property="bjxlmc" column="bjxlmc" jdbcType="VARCHAR"/>
+        <result property="bkrs" column="bkrs" jdbcType="NUMERIC"/>
+        <result property="ssrs" column="ssrs" jdbcType="NUMERIC"/>
+        <result property="swrs" column="swrs" jdbcType="NUMERIC"/>
+        <result property="ywwxwz" column="ywwxwz" jdbcType="VARCHAR"/>
+        <result property="ywbzxl" column="ywbzxl" jdbcType="VARCHAR"/>
+        <result property="ywbkry" column="ywbkry" jdbcType="VARCHAR"/>
+        <result property="sfsw" column="sfsw" jdbcType="VARCHAR"/>
+        <result property="sfswybj" column="sfswybj" jdbcType="VARCHAR"/>
+        <result property="sfzdjq" column="sfzdjq" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="zdjqtjlx" column="zdjqtjlx" jdbcType="VARCHAR"/>
+        <result property="zldj" column="zldj" jdbcType="VARCHAR"/>
+        <result property="qszt" column="qszt" jdbcType="VARCHAR"/>
+        <result property="qssj" column="qssj" jdbcType="TIMESTAMP"/>
+        <result property="qsyxsj" column="qsyxsj" jdbcType="TIMESTAMP"/>
+        <result property="ddxczt" column="ddxczt" jdbcType="VARCHAR"/>
+        <result property="ddxcyxsj" column="ddxcyxsj" jdbcType="VARCHAR"/>
+        <result property="ddxcsj" column="ddxcsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjzt" column="zlwjzt" jdbcType="VARCHAR"/>
+        <result property="zlwjyxsj" column="zlwjyxsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjsj" column="zlwjsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjsm" column="zlwjsm" jdbcType="VARCHAR"/>
+        <result property="zlzxzt" column="zlzxzt" jdbcType="VARCHAR"/>
+        <result property="czqk" column="czqk" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlJq">
+    insert into tb_zl_jq(id,zl_id,jq_id,jjdbh,gljjdbh,bjsj,jjsj,jqfskssj,jqfsjssj,bjdh,bjdh_yhxm,bjdh_yhdz,bjr_sfzh,bjr_xm,
+                        qsyxsj,ddxcyxsj,zlwjyxsj,
+                        bjr_xb,bjr_lxdh,bjr_zzdw,sfdzxzqh,sfdz,ldgbh,bjnr,jqjb,ay,bjlb,bjlbmc,bjlx,bjlxmc,bjxl,bjxlmc,bkrs,
+                        ssrs,swrs,ywwxwz,ywbzxl,ywbkry,sfsw,sfswybj,sfzdjq,jd,wd,zb,zbhash,zdjqtjlx,zldj,qszt,qssj,ddxczt,
+                        ddxcsj,zlwjzt,zlwjsj,zlwjsm,zlzxzt,czqk,ssbm,ssbmdm,ssbmid,ssxgaj,ssxgajdm,ssxgajid,sssgaj,sssgajdm,
+                        sssgajid,xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id,xt_cjr, xt_cjbmdm, xt_cjbmmc,
+                        xt_zhgxip, xt_zhgxsj, xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    )values (
+                    #{id},#{zlId},#{jqId},#{jjdbh},#{gljjdbh},#{bjsj},#{jjsj},#{jqfskssj},#{jqfsjssj},#{bjdh},
+                    #{bjdhYhxm},#{bjdhYhdz},#{bjrSfzh},#{bjrXm},#{qsyxsj},#{ddxcyxsj},#{zlwjyxsj},
+                    #{bjrXb},#{bjrLxdh},#{bjrZzdw},#{sfdzxzqh},
+                    #{sfdz},#{ldgbh},#{bjnr},#{jqjb},#{ay},#{bjlb},#{bjlbmc},#{bjlx},#{bjlxmc},#{bjxl},#{bjxlmc},#{bkrs},
+                    #{ssrs},#{swrs},#{ywwxwz},#{ywbzxl},#{ywbkry},#{sfsw},#{sfswybj},#{sfzdjq},#{jd},#{wd},
+                    ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                    ${zbhash},${zdjqtjlx},${zldj},${qszt},${qssj},${ddxczt},${ddxcsj},${zlwjzt},${zlwjsj},${zlwjsm},${zlzxzt},
+                    ${czqk},${ssbm},${ssbmdm},${ssbmid},${ssxgaj},${ssxgajdm},${ssxgajid},${sssgaj},${sssgajdm},
+                    ${sssgajid},${xtXjly},${xtSjzt},${xtScbz},${xtCjip},${xtCjsj},${xtCjrId},${xtCjr},${xtCjbmdm},${xtCjbmmc},
+                    ${xtZhgxip},${xtZhgxsj},${xtZhgxrid},${xtZhgxr},${xtZhgxbmdm},${xtZhgxbm},${bz}
+
+                )
+    </insert>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlJq">
+        update tb_zl_jq
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="jqId != null and jqId != ''">
+                jq_id = #{jqId},
+            </if>
+            <if test="jjdbh != null and jjdbh != ''">
+                jjdbh = #{jjdbh},
+            </if>
+            <if test="gljjdbh != null and gljjdbh != ''">
+                gljjdbh = #{gljjdbh},
+            </if>
+            <if test="bjsj != null">
+                bjsj = #{bjsj},
+            </if>
+            <if test="jjsj != null">
+                jjsj = #{jjsj},
+            </if>
+            <if test="jqfskssj != null">
+                jqfskssj = #{jqfskssj},
+            </if>
+            <if test="jqfsjssj != null">
+                jqfsjssj = #{jqfsjssj},
+            </if>
+            <if test="bjdh != null and bjdh != ''">
+                bjdh = #{bjdh},
+            </if>
+            <if test="bjdhYhxm != null and bjdhYhxm != ''">
+                bjdh_yhxm = #{bjdhYhxm},
+            </if>
+            <if test="bjdhYhdz != null and bjdhYhdz != ''">
+                bjdh_yhdz = #{bjdhYhdz},
+            </if>
+            <if test="bjrSfzh != null and bjrSfzh != ''">
+                bjr_sfzh = #{bjrSfzh},
+            </if>
+            <if test="bjrXm != null and bjrXm != ''">
+                bjr_xm = #{bjrXm},
+            </if>
+            <if test="bjrXb != null and bjrXb != ''">
+                bjr_xb = #{bjrXb},
+            </if>
+            <if test="bjrLxdh != null and bjrLxdh != ''">
+                bjr_lxdh = #{bjrLxdh},
+            </if>
+            <if test="bjrZzdw != null and bjrZzdw != ''">
+                bjr_zzdw = #{bjrZzdw},
+            </if>
+
+            <if test="sfdzxzqh != null and sfdzxzqh != ''">
+                sfdzxzqh = #{sfdzxzqh},
+            </if>
+            <if test="sfdz != null and sfdz != ''">
+                sfdz = #{sfdz},
+            </if>
+            <if test="ldgbh != null and ldgbh != ''">
+                ldgbh = #{ldgbh},
+            </if>
+            <if test="bjnr != null and bjnr != ''">
+                bjnr = #{bjnr},
+            </if>
+            <if test="jqjb != null and jqjb != ''">
+                jqjb = #{jqjb},
+            </if>
+            <if test="ay != null and ay != ''">
+                ay = #{ay},
+            </if>
+            <if test="bjlb != null and bjlb != ''">
+                bjlb = #{bjlb},
+            </if>
+            <if test="bjlbmc != null and bjlbmc != ''">
+                bjlbmc = #{bjlbmc},
+            </if>
+
+            <if test="bjlx != null and bjlx != ''">
+                bjlx = #{bjlx},
+            </if>
+            <if test="bjlxmc != null and bjlxmc != ''">
+                bjlxmc = #{bjlxmc},
+            </if>
+            <if test="bjxl != null and bjxl != ''">
+                bjxl = #{bjxl},
+            </if>
+            <if test="bjxlmc != null and bjxlmc != ''">
+                bjxlmc = #{bjxlmc},
+            </if>
+            <if test="bkrs != null">
+                bkrs = #{bkrs},
+            </if>
+            <if test="ssrs != null">
+                ssrs = #{ssrs},
+            </if>
+            <if test="swrs != null">
+                swrs = #{swrs},
+            </if>
+            <if test="ywwxwz != null and ywwxwz != ''">
+                ywwxwz = #{ywwxwz},
+            </if>
+            <if test="ywbzxl != null and ywbzxl != ''">
+                ywbzxl = #{ywbzxl},
+            </if>
+            <if test="ywbkry != null and ywbkry != ''">
+                ywbkry = #{ywbkry},
+            </if>
+            <if test="sfsw != null and sfsw != ''">
+                sfsw = #{sfsw},
+            </if>
+            <if test="sfswybj != null and sfswybj != ''">
+                sfswybj = #{sfswybj},
+            </if>
+            <if test="sfzdjq != null and sfzdjq != ''">
+                sfzdjq = #{sfzdjq},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb =   zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="zdjqtjlx != null and zdjqtjlx != ''">
+                zdjqtjlx = #{zdjqtjlx},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null">
+                qssj = #{qssj},
+            </if>
+            <if test="qsyxsj != null">
+                qsyxsj = #{qsyxsj},
+            </if>
+            <if test="ddxcyxsj != null">
+                ddxcyxsj = #{ddxcyxsj},
+            </if>
+            <if test="zlwjyxsj != null">
+                zlwjyxsj = #{zlwjyxsj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="czqk != null and czqk != ''">
+                czqk = #{czqk},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlRgMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlRgMapper.xml
new file mode 100644
index 0000000..fcd26c3
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlRgMapper.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlRgMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlRg">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="zl_id" property="zlId" jdbcType="VARCHAR"/>
+        <result column="yw_id" property="ywId" jdbcType="VARCHAR"/>
+        <result column="zllx" property="zllx" jdbcType="VARCHAR"/>
+        <result column="zlbt" property="zlbt" jdbcType="VARCHAR"/>
+        <result column="zlnr" property="zlnr" jdbcType="VARCHAR"/>
+        <result column="zlzxqk" property="zlzxqk" jdbcType="VARCHAR"/>
+        <result column="zlfqrq" property="zlfqrq" jdbcType="TIMESTAMP"/>
+        <result column="zlfqsj" property="zlfqsj" jdbcType="TIMESTAMP"/>
+        <result column="zldj" property="zldj" jdbcType="VARCHAR"/>
+        <result column="zljsdx" property="zljsdx" jdbcType="VARCHAR"/>
+        <result column="qsyxsj" property="qsyxsj" jdbcType="TIMESTAMP"/>
+        <result column="qssj" property="qssj" jdbcType="TIMESTAMP"/>
+        <result column="qszt" property="qszt" jdbcType="VARCHAR"/>
+        <result column="ddxcyxsj" property="ddxcyxsj" jdbcType="TIMESTAMP"/>
+        <result column="ddxcsj" property="ddxcsj" jdbcType="TIMESTAMP"/>
+        <result column="ddxczt" property="ddxczt" jdbcType="VARCHAR"/>
+        <result column="zlwjyxsj" property="zlwjyxsj" jdbcType="TIMESTAMP"/>
+        <result column="zlwjsj" property="zlwjsj" jdbcType="TIMESTAMP"/>
+        <result column="zlwjsm" property="zlwjsm" jdbcType="VARCHAR"/>
+        <result column="zlwjzt" property="zlwjzt" jdbcType="VARCHAR"/>
+        <result column="zlzxzt" property="zlzxzt" jdbcType="VARCHAR"/>
+        <result column="jd" property="jd" jdbcType="NUMERIC"/>
+        <result column="wd" property="wd" jdbcType="NUMERIC"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash" jdbcType="VARCHAR"/>
+        <result column="zlfsddxzqh" property="zlfsddxzqh" jdbcType="VARCHAR"/>
+        <result column="zlfsdd" property="zlfsdd" jdbcType="VARCHAR"/>
+        <result column="zlfqr_id" property="zlfqrId" jdbcType="VARCHAR"/>
+        <result column="zlfqr" property="zlfqr" jdbcType="VARCHAR"/>
+        <result column="zlfqr_sfzh" property="zlfqrSfzh" jdbcType="VARCHAR"/>
+        <result column="zlfqr_dh" property="zlfqrDh" jdbcType="VARCHAR"/>
+        <result column="fj_id" property="fjId" jdbcType="VARCHAR"/>
+        <result column="zljsrs" property="zljsrs" jdbcType="NUMERIC"/>
+        <result column="zltp" property="zltp" jdbcType="VARCHAR"/>
+        <result column="ssbm" property="ssbm" jdbcType="VARCHAR"/>
+        <result column="ssbmdm" property="ssbmdm" jdbcType="VARCHAR"/>
+        <result column="ssbmid" property="ssbmid" jdbcType="VARCHAR"/>
+        <result column="ssxgaj" property="ssxgaj" jdbcType="VARCHAR"/>
+        <result column="ssxgajdm" property="ssxgajdm" jdbcType="VARCHAR"/>
+        <result column="ssxgajid" property="ssxgajid" jdbcType="VARCHAR"/>
+        <result column="sssgaj" property="sssgaj" jdbcType="VARCHAR"/>
+        <result column="sssgajdm" property="sssgajdm" jdbcType="VARCHAR"/>
+        <result column="sssgajid" property="sssgajid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="TIMESTAMP"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="TIMESTAMP"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 无zb -->
+    <sql id="base_column_list">
+        id,zl_id,yw_id,zllx,zlbt,zlnr,zlzxqk,zlfqrq,zlfqsj,zldj,zljsdx,qsyxsj,qssj,qszt,ddxcyxsj,ddxcsj,ddxczt,
+        zlwjyxsj,zlwjsj,zlwjsm,zlwjzt,zlzxzt,jd,wd,zb,zbhash,zlfsddxzqh,zlfsdd,zlfqr_id,zlfqr,zlfqr_sfzh,
+        zlfqr_dh,fj_id,zljsrs,zltp,ssbm,ssbmdm,ssbmid,ssxgaj,ssxgajdm,ssxgajid,sssgaj,sssgajdm,sssgajid,
+        xt_sjly, xt_sjzt, xt_scbz,xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <!-- 通用查询结果列 无zb -->
+    <sql id="base_column_list_nozb">
+        id,zl_id,yw_id,zllx,zlbt,zlnr,zlzxqk,zlfqrq,zlfqsj,zldj,zljsdx,qsyxsj,qssj,qszt,ddxcyxsj,ddxcsj,ddxczt,
+        zlwjyxsj,zlwjsj,zlwjsm,zlwjzt,zlzxzt,jd,wd,zbhash,zlfsddxzqh,zlfsdd,zlfqr_id,zlfqr,zlfqr_sfzh,
+        zlfqr_dh,fj_id,zljsrs,zltp,ssbm,ssbmdm,ssbmid,ssxgaj,ssxgajdm,ssxgajid,sssgaj,sssgajdm,sssgajid,
+        xt_sjly, xt_sjzt, xt_scbz,xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT (zb) as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlRg">
+        insert into tb_zl_rg(<include refid="base_column_list"/>)
+        values (
+            #{id},#{zlId},#{ywId},#{zllx},#{zlbt},#{zlnr},#{zlzxqk},#{zlfqrq},#{zlfqsj},#{zldj},#{zljsdx},#{qsyxsj},
+        #{qssj},#{qszt},#{ddxcyxsj},#{ddxcsj},#{ddxczt},#{zlwjyxsj},#{zlwjsj},#{zlwjsm},#{zlwjzt},#{zlzxzt},#{jd},#{wd},
+        ST_GEOMFROMTEXT(#{zb, typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+        #{zbhash},#{zlfsddxzqh},#{zlfsdd},#{zlfqrId},#{zlfqr},#{zlfqrSfzh},#{zlfqrDh},#{fjId},#{zljsrs},#{zltp},
+        #{ssbm},#{ssbmdm},#{ssbmid},#{ssxgaj},#{ssxgajdm},#{ssxgajid},#{sssgaj},#{sssgajdm},#{sssgajid},#{xtSjly},
+        #{xtSjzt}, #{xtScbz},#{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+        #{xtZhgxrid},#{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}
+        )
+    </insert>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlRg">
+        update tb_zl_rg
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="ywId != null and ywId != ''">
+                yw_id = #{ywId},
+            </if>
+            <if test="zllx != null and zllx != ''">
+                zllx = #{zllx},
+            </if>
+            <if test="zlbt != null and zlbt != ''">
+                zlbt = #{zlbt},
+            </if>
+            <if test="zlnr != null and zlnr != ''">
+                zlnr = #{zlnr},
+            </if>
+            <if test="zlzxqk != null and zlzxqk != ''">
+                zlzxqk = #{zlzxqk},
+            </if>
+            <if test="zlfqrq != null">
+                zlfqrq = #{zlfqrq},
+            </if>
+            <if test="zlfqsj != null">
+                zlfqsj = #{zlfqsj},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="zljsdx != null and zljsdx != ''">
+                zljsdx = #{zljsdx},
+            </if>
+
+
+            <if test="qsyxsj != null">
+                qsyxsj = #{qsyxsj},
+            </if>
+            <if test="qssj != null">
+                qssj = #{qssj},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="ddxcyxsj != null">
+                ddxcyxsj = #{ddxcyxsj},
+            </if>
+            <if test="ddxcsj != null">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="zlwjyxsj != null">
+                zlwjyxsj = #{zlwjyxsj},
+            </if>
+            <if test="zlwjsj != null">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="zlfsddxzqh != null and zlfsddxzqh != ''">
+                zlfsddxzqh = #{zlfsddxzqh},
+            </if>
+            <if test="zlfsdd != null and zlfsdd != ''">
+                zlfsdd = #{zlfsdd},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrSfzh != null and zlfqrSfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="fjId != null and fjId != ''">
+                fj_id = #{fjId},
+            </if>
+            <if test="zljsrs != null">
+                zljsrs = #{zljsrs},
+            </if>
+            <if test="zltp != null and zltp != ''">
+                zltp = #{zltp},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdMapper.xml
new file mode 100644
index 0000000..82a561a
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdMapper.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlXlBxdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlXlBxd">
+        <id column="id" property="id" />
+        <result column="zl_id" property="zlId" />
+        <result column="zl_xl_id" property="zlXlId" />
+        <result column="bxd_id" property="bxdId" />
+        <result column="ss_xfqy_id" property="ssXfqyId" />
+        <result column="bxd_mc" property="bxdMc" />
+        <result column="bxd_lx" property="bxdLx" />
+        <result column="bxdlydm" property="bxdlydm" />
+        <result column="bxyy" property="bxyy" />
+        <result column="yqkssj" property="yqkssj" />
+        <result column="yqjssj" property="yqjssj" />
+        <result column="jd" property="jd" />
+        <result column="wd" property="wd" />
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash" />
+        <result column="xzqhdm" property="xzqhdm" />
+        <result column="yq_kssj" property="yqKssj" />
+        <result column="yq_jssj" property="yqJssj" />
+        <result column="yq_tlsc" property="yqTlsc" />
+        <result column="yq_sfpc" property="yqSfpc" />
+        <result column="yq_pcrysl" property="yqPcrysl" />
+        <result column="yq_pcclsl" property="yqPcclsl" />
+        <result column="yxq" property="yxq" />
+        <result column="sfxl" property="sfxl" />
+        <result column="sj_xlcs" property="sjXlcs" />
+        <result column="sj_kssj" property="sjKssj" />
+        <result column="sj_lksj" property="sjLksj" />
+        <result column="sj_tlsc" property="sjTlsc" />
+        <result column="sj_pcrysl" property="sjPcrysl" />
+        <result column="sj_pcclsl" property="sjPcclsl" />
+        <result column="zlwjzt" property="zlwjzt" />
+        <result column="zlwjsj" property="zlwjsj" />
+        <result column="zlwjsm" property="zlwjsm" />
+        <result column="ssbm" property="ssbm" />
+        <result column="ssbmdm" property="ssbmdm" />
+        <result column="ssbmid" property="ssbmid" />
+        <result column="ssxgaj" property="ssxgaj" />
+        <result column="ssxgajdm" property="ssxgajdm" />
+        <result column="ssxgajid" property="ssxgajid" />
+        <result column="sssgaj" property="sssgaj" />
+        <result column="sssgajdm" property="sssgajdm" />
+        <result column="sssgajid" property="sssgajid" />
+        <result column="xt_sjly" property="xtSjly" />
+        <result column="xt_sjzt" property="xtSjzt" />
+        <result column="xt_scbz" property="xtScbz" />
+        <result column="xt_cjip" property="xtCjip" />
+        <result column="xt_cjsj" property="xtCjsj" />
+        <result column="xt_cjr_id" property="xtCjrId" />
+        <result column="xt_cjr" property="xtCjr" />
+        <result column="xt_cjbmdm" property="xtCjbmdm" />
+        <result column="xt_cjbmmc" property="xtCjbmmc" />
+        <result column="xt_zhgxip" property="xtZhgxip" />
+        <result column="xt_zhgxsj" property="xtZhgxsj" />
+        <result column="xt_zhgxrid" property="xtZhgxrid" />
+        <result column="xt_zhgxr" property="xtZhgxr" />
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm" />
+        <result column="xt_zhgxbm" property="xtZhgxbm" />
+        <result column="bz" property="bz" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, zl_id, zl_xl_id, bxd_id, ss_xfqy_id, bxd_mc, bxd_lx, bxdlydm, bxyy, yqkssj, yqjssj, jd, wd, zb, zbhash, xzqhdm, yq_kssj, yq_jssj, yq_tlsc, yq_sfpc, yq_pcrysl, yq_pcclsl, yxq, sfxl, sj_xlcs, sj_kssj, sj_lksj, sj_tlsc, sj_pcrysl, sj_pcclsl, zlwjzt, zlwjsj, zlwjsm, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlXlBxd">
+        insert into tb_zl_xl_bxd(<include refid="Base_Column_List"></include>)values (
+        #{id},#{ zlId},#{ zlXlId},#{ bxdId},#{ ssXfqyId},#{ bxdMc},#{ bxdLx},#{ bxdlydm},#{ bxyy},#{ yqkssj},
+        #{yqjssj},#{ jd},#{ wd},
+        ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+        #{zbhash},#{ xzqhdm},#{ yqKssj},#{ yqJssj},#{ yqTlsc},#{ yqSfpc},#{ yqPcrysl},#{ yqPcclsl},#{ yxq},#{ sfxl},#{ sjXlcs},
+        #{sjKssj},#{ sjLksj},#{ sjTlsc},#{ sjPcrysl},#{ sjPcclsl},#{ zlwjzt},#{ zlwjsj},#{ zlwjsm},#{ ssbm},#{ ssbmdm},#{ ssbmid},#{ ssxgaj},
+        #{ssxgajdm},#{ ssxgajid},#{ sssgaj},#{ sssgajdm},#{ sssgajid},#{ xtSjly},#{ xtSjzt},#{ xtScbz},#{ xtCjip},#{ xtCjsj},#{ xtCjrId},#{ xtCjr},
+        #{xtCjbmdm},#{ xtCjbmmc},#{ xtZhgxip},#{ xtZhgxsj},#{ xtZhgxrid},#{ xtZhgxr},#{ xtZhgxbmdm},#{ xtZhgxbm},#{ bz}
+        )
+    </insert>
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlXlBxd">
+        update tb_zl_xl_bxd
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="zlXlId != null and zlXlId != ''">
+                zl_xl_id = #{zlXlId},
+            </if>
+            <if test="bxdId != null and bxdId != ''">
+                bxd_id = #{bxdId},
+            </if>
+            <if test="ssXfqyId != null and ssXfqyId != ''">
+                ss_xfqy_id = #{ssXfqyId},
+            </if>
+            <if test="bxdMc != null and bxdMc != ''">
+                bxd_mc = #{bxdMc},
+            </if>
+            <if test="bxdLx != null and bxdLx != ''">
+                bxd_lx = #{bxdLx},
+            </if>
+            <if test="bxdlydm != null and bxdlydm != ''">
+                bxdlydm = #{bxdlydm},
+            </if>
+            <if test="bxyy != null and bxyy != ''">
+                bxyy = #{bxyy},
+            </if>
+            <if test="yqkssj != null and yqkssj != ''">
+                yqkssj = #{yqkssj},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zb != null and zb != ''">
+                zb =   zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="yqKssj != null and yqKssj != ''">
+                yq_kssj = #{yqKssj},
+            </if>
+            <if test="yqJssj != null and yqJssj != ''">
+                yq_jssj = #{yqJssj},
+            </if>
+            <if test="yqTlsc != null and yqTlsc != ''">
+                yq_tlsc = #{yqTlsc},
+            </if>
+            <if test="yqSfpc != null and yqSfpc != ''">
+                yq_sfpc = #{yqSfpc},
+            </if>
+            <if test="yqPcrysl != null and yqPcrysl != ''">
+                yq_pcrysl = #{yqPcrysl},
+            </if>
+            <if test="yqPcclsl != null and yqPcclsl != ''">
+                yq_pcclsl = #{yqPcclsl},
+            </if>
+            <if test="yxq != null and yxq != ''">
+                yxq = #{yxq},
+            </if>
+            <if test="sfxl null and sfxl != ''">
+                sfxl = #{sfxl},
+            </if>
+            <if test="sjKlcs null and sjKlcs != ''">
+                sj_xlcs = #{sjXlcs},
+            </if>
+            <if test="sjKssj null and sjKssj != ''">
+                sj_kssj = #{sjKssj},
+            </if>
+            <if test="sjLksj null and sjLksj != ''">
+                sj_lksj = #{sjLksj},
+            </if>
+            <if test="sjTlsc null and sjTlsc != ''">
+                sj_tlsc = #{sjTlsc},
+            </if>
+            <if test="sjPcrysl null and sjPcrysl != ''">
+                sj_pcrysl = #{sjPcrysl},
+            </if>
+            <if test="sjPcclsl null and sjPcclsl != ''">
+                sj_pcclsl = #{sjPcclsl},
+            </if>
+            <if test="zlwjzt null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj null and zlwjsj != ''">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="ssbm null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdXljlMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdXljlMapper.xml
new file mode 100644
index 0000000..c197836
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlXlBxdXljlMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlXlBxdXljlMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlXlBxdXljl">
+        <id column="id" property="id" />
+        <result column="zl_id" property="zlId" />
+        <result column="zl_xl_id" property="zlXlId" />
+        <result column="zl_xl_bxd_id" property="zlXlBxdId" />
+        <result column="bxd_id" property="bxdId" />
+        <result column="ss_xfqy_id" property="ssXfqyId" />
+        <result column="sj_kssj" property="sjKssj" />
+        <result column="sj_lksj" property="sjLksj" />
+        <result column="sj_tlsc" property="sjTlsc" />
+        <result column="sj_pcrysl" property="sjPcrysl" />
+        <result column="sj_pcclsl" property="sjPcclsl" />
+        <result column="ssbm" property="ssbm" />
+        <result column="ssbmdm" property="ssbmdm" />
+        <result column="ssbmid" property="ssbmid" />
+        <result column="ssxgaj" property="ssxgaj" />
+        <result column="ssxgajdm" property="ssxgajdm" />
+        <result column="ssxgajid" property="ssxgajid" />
+        <result column="sssgaj" property="sssgaj" />
+        <result column="sssgajdm" property="sssgajdm" />
+        <result column="sssgajid" property="sssgajid" />
+        <result column="xt_sjly" property="xtSjly" />
+        <result column="xt_sjzt" property="xtSjzt" />
+        <result column="xt_scbz" property="xtScbz" />
+        <result column="xt_cjip" property="xtCjip" />
+        <result column="xt_cjsj" property="xtCjsj" />
+        <result column="xt_cjr_id" property="xtCjrId" />
+        <result column="xt_cjr" property="xtCjr" />
+        <result column="xt_cjbmdm" property="xtCjbmdm" />
+        <result column="xt_cjbmmc" property="xtCjbmmc" />
+        <result column="xt_zhgxip" property="xtZhgxip" />
+        <result column="xt_zhgxsj" property="xtZhgxsj" />
+        <result column="xt_zhgxrid" property="xtZhgxrid" />
+        <result column="xt_zhgxr" property="xtZhgxr" />
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm" />
+        <result column="xt_zhgxbm" property="xtZhgxbm" />
+        <result column="bz" property="bz" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, zl_id, zl_xl_id, zl_xl_bxd_id, bxd_id, ss_xfqy_id, sj_kssj, sj_lksj, sj_tlsc, sj_pcrysl, sj_pcclsl, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlXlMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlXlMapper.xml
new file mode 100644
index 0000000..2a1e317
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlXlMapper.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlXlMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlXl">
+        <id column="id" property="id" />
+        <result column="zl_id" property="zlId" />
+        <result column="xlfa_id" property="xlfaId" />
+        <result column="zldj" property="zldj" />
+        <result column="zlbt" property="zlbt" />
+        <result column="zlnr" property="zlnr" />
+        <result column="zlfsrq" property="zlfsrq" />
+        <result column="zlfssj" property="zlfssj" />
+        <result column="zlzxrq" property="zlzxrq" />
+        <result column="zlzxjssj" property="zlzxjssj" />
+        <result column="xfdws" property="xfdws" />
+        <result column="yxdws" property="yxdws" />
+        <result column="qszt" property="qszt" />
+        <result column="qssj" property="qssj" />
+        <result column="zlwjzt" property="zlwjzt" />
+        <result column="zlwjsj" property="zlwjsj" />
+        <result column="zlwjsm" property="zlwjsm" />
+        <result column="zlzxzt" property="zlzxzt" />
+        <result column="zlfqr_id" property="zlfqrId" />
+        <result column="zlfqr" property="zlfqr" />
+        <result column="zlfqr_sfzh" property="zlfqrSfzh" />
+        <result column="zlfqr_dh" property="zlfqrDh" />
+        <result column="fj_id" property="fjId" />
+        <result column="ssbm" property="ssbm" />
+        <result column="ssbmdm" property="ssbmdm" />
+        <result column="ssbmid" property="ssbmid" />
+        <result column="ssxgaj" property="ssxgaj" />
+        <result column="ssxgajdm" property="ssxgajdm" />
+        <result column="ssxgajid" property="ssxgajid" />
+        <result column="sssgaj" property="sssgaj" />
+        <result column="sssgajdm" property="sssgajdm" />
+        <result column="sssgajid" property="sssgajid" />
+        <result column="xt_sjly" property="xtSjly" />
+        <result column="xt_sjzt" property="xtSjzt" />
+        <result column="xt_scbz" property="xtScbz" />
+        <result column="xt_cjip" property="xtCjip" />
+        <result column="xt_cjsj" property="xtCjsj" />
+        <result column="xt_cjr_id" property="xtCjrId" />
+        <result column="xt_cjr" property="xtCjr" />
+        <result column="xt_cjbmdm" property="xtCjbmdm" />
+        <result column="xt_cjbmmc" property="xtCjbmmc" />
+        <result column="xt_zhgxip" property="xtZhgxip" />
+        <result column="xt_zhgxsj" property="xtZhgxsj" />
+        <result column="xt_zhgxrid" property="xtZhgxrid" />
+        <result column="xt_zhgxr" property="xtZhgxr" />
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm" />
+        <result column="xt_zhgxbm" property="xtZhgxbm" />
+        <result column="bz" property="bz" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, zl_id, xlfa_id, zldj, zlbt, zlnr, zlfsrq, zlfssj, zlzxrq, zlzxjssj, xfdws, yxdws, qszt, qssj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, zlfqr_id, zlfqr, zlfqr_sfzh, zlfqr_dh, fj_id, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlYjClCnryMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlYjClCnryMapper.xml
new file mode 100644
index 0000000..c46697b
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlYjClCnryMapper.xml
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlYjClCnryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlYjClCnry">
+        <id column="id" property="id" />
+        <result column="zl_id" property="zlId" />
+        <result column="zl_clid" property="zlClid" />
+        <result column="yj_id" property="yjId" />
+        <result column="ryyj_id" property="ryyjId" />
+        <result column="yj_fssj" property="yjFssj" />
+        <result column="yj_sj" property="yjSj" />
+        <result column="yj_jb" property="yjJb" />
+        <result column="zlfsrq" property="zlfsrq" />
+        <result column="zlfssj" property="zlfssj" />
+        <result column="zl_bt" property="zlBt" />
+        <result column="zl_nr" property="zlNr" />
+        <result column="zl_rybq" property="zlRybq" />
+        <result column="zl_rybqxq" property="zlRybqxq" />
+        <result column="zl_zjlx" property="zlZjlx" />
+        <result column="zl_zjhm" property="zlZjhm" />
+        <result column="zl_ryxm" property="zlRyxm" />
+        <result column="zl_ryxb" property="zlRyxb" />
+        <result column="zl_rynl" property="zlRynl" />
+        <result column="zl_rymz" property="zlRymz" />
+        <result column="zl_ryjg" property="zlRyjg" />
+        <result column="zl_ryhjd_xzqh" property="zlRyhjdXzqh" />
+        <result column="zl_ryhjd" property="zlRyhjd" />
+        <result column="zl_ryjzd_xzqh" property="zlRyjzdXzqh" />
+        <result column="zl_ryjzd" property="zlRyjzd" />
+        <result column="zl_rygzdwid" property="zlRygzdwid" />
+        <result column="zl_rygzdw" property="zlRygzdw" />
+        <result column="zl_rylxdh" property="zlRylxdh" />
+        <result column="zl_xsd" property="zlXsd" />
+        <result column="zl_xwms" property="zlXwms" />
+        <result column="ltx" property="ltx" />
+        <result column="lty" property="lty" />
+        <result column="rbx" property="rbx" />
+        <result column="rby" property="rby" />
+        <result column="yj_gzyid" property="yjGzyid" />
+        <result column="jd" property="jd" />
+        <result column="wd" property="wd" />
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler" />
+        <result column="zbhash" property="zbhash" />
+        <result column="yj_dzxzqh" property="yjDzxzqh" />
+        <result column="yj_dz" property="yjDz" />
+        <result column="tp_id" property="tpId" />
+        <result column="cover_image" property="coverImage" />
+        <result column="yjly_bqmc" property="yjlyBqmc" />
+        <result column="qszt" property="qszt" />
+        <result column="qssj" property="qssj" />
+        <result column="ddxczt" property="ddxczt" />
+        <result column="ddxcsj" property="ddxcsj" />
+        <result column="zlwjzt" property="zlwjzt" />
+        <result column="zlwjsj" property="zlwjsj" />
+        <result column="zlwjsm" property="zlwjsm" />
+        <result column="zlzxzt" property="zlzxzt" />
+        <result column="zlfqr_id" property="zlfqrId" />
+        <result column="zlfqr" property="zlfqr" />
+        <result column="zlfqr_sfzh" property="zlfqrSfzh" />
+        <result column="zlfqr_dh" property="zlfqrDh" />
+        <result column="hczt" property="hczt" />
+        <result column="hcid" property="hcid" />
+        <result column="ssbm" property="ssbm" />
+        <result column="ssbmdm" property="ssbmdm" />
+        <result column="ssbmid" property="ssbmid" />
+        <result column="ssxgaj" property="ssxgaj" />
+        <result column="ssxgajdm" property="ssxgajdm" />
+        <result column="ssxgajid" property="ssxgajid" />
+        <result column="sssgaj" property="sssgaj" />
+        <result column="sssgajdm" property="sssgajdm" />
+        <result column="sssgajid" property="sssgajid" />
+        <result column="xt_sjly" property="xtSjly" />
+        <result column="xt_sjzt" property="xtSjzt" />
+        <result column="xt_scbz" property="xtScbz" />
+        <result column="xt_cjip" property="xtCjip" />
+        <result column="xt_cjsj" property="xtCjsj" />
+        <result column="xt_cjr_id" property="xtCjrId" />
+        <result column="xt_cjr" property="xtCjr" />
+        <result column="xt_cjbmdm" property="xtCjbmdm" />
+        <result column="xt_cjbmmc" property="xtCjbmmc" />
+        <result column="xt_zhgxip" property="xtZhgxip" />
+        <result column="xt_zhgxsj" property="xtZhgxsj" />
+        <result column="xt_zhgxrid" property="xtZhgxrid" />
+        <result column="xt_zhgxr" property="xtZhgxr" />
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm" />
+        <result column="xt_zhgxbm" property="xtZhgxbm" />
+        <result column="bz" property="bz" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, zl_id, zl_clid, yj_id, ryyj_id, yj_fssj, yj_sj, yj_jb, zlfsrq, zlfssj, zl_bt, zl_nr, zl_rybq, zl_rybqxq, zl_zjlx, zl_zjhm, zl_ryxm, zl_ryxb, zl_rynl, zl_rymz, zl_ryjg, zl_ryhjd_xzqh, zl_ryhjd, zl_ryjzd_xzqh, zl_ryjzd, zl_rygzdwid, zl_rygzdw, zl_rylxdh, zl_xsd, zl_xwms, ltx, lty, rbx, rby, yj_gzyid, jd, wd, zb, zbhash, yj_dzxzqh, yj_dz, tp_id, cover_image, yjly_bqmc, qszt, qssj, ddxczt, ddxcsj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, zlfqr_id, zlfqr, zlfqr_sfzh, zlfqr_dh, hczt, hcid, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjClCnry">
+        insert into tb_zl_yj_cl_cnry(<include refid="Base_Column_List"></include>
+        )values (
+        ${id},${ zlId},${ zlClid},${ yjId},${ ryyjId},${ yjFssj},${ yjSj},${ yjJb},${ zlfsrq},${ zlfssj},${ zlBt},${ zlNr},
+        ${zlRybq},${ zlRybqxq},${ zlZjlx},${ zlZjhm},${ zlRyxm},${ zlRyxb},${ zlRynl},${ zlRymz},${ zlRyjg},${ zlRyhjdXzqh},
+        ${zlRyhjd},${ zlRyjzdXzqh},${ zlRyjzd},${ zlRygzdwid},${ zlRygzdw},${ zlRylxdh},${ zlXsd},${ zlXwms},${ ltx},${ lty},${ rbx},${ rby},
+        ${yjGzyid},${ jd},${ wd},ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+        ${ zbhash},${ yjDzxzqh},${ yjDz},${ tpId},${ coverImage},${ yjlyBqmc$},${ qszt},
+        ${ qssj},${ ddxczt},${ ddxcsj},${ zlwjzt},${ zlwjsj},${ zlwjsm},${ zlzxzt},${ zlfqrId},${ zlfqr},${ zlfqrSfzh},${ zlfqrDh},
+        ${hczt},${ hcid},${ ssbm},${ ssbmdm},${ ssbmid},${ ssxgaj},${ ssxgajdm},${ ssxgajid},${ sssgaj},${ sssgajdm},${ sssgajid}
+        ${xtSjly},${xtSjzt},${xtScbz},${xtCjip},${xtCjsj},${xtCjr_id},${xtCjr},${xtCjbmdm},${xtCjbmmc},
+        ${xtZhgxip},${xtZhgxsj},${xtZhgxrid},${xtZhgxr},${xtZhgxbmdm},${xtZhgxbm},${bz})
+
+    </insert>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjClCnry">
+        update tb_zl_yj_cl_cnry
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="zlClid != null and zlClid != ''">
+                zl_clid = #{zlClid},
+            </if>
+            <if test="yjId != null and yjId != ''">
+                yj_id = #{yjId},
+            </if>
+            <if test="ryyjId != null and ryyjId != ''">
+                ryyj_id = #{ryyjId},
+            </if>
+            <if test="yjFssj != null and yjFssj != ''">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null and yjSj != ''">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="yjJb != null and yjJb != ''">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="zlfsrq != null and zlfsrq != ''">
+                zlfsrq = #{zlfsrq},
+            </if>
+            <if test="zlfssj != null and zlfssj != ''">
+                zlfssj = #{zlfssj},
+            </if>
+            <if test="zlBt != null and zlBt != ''">
+                zl_bt = #{zlBt},
+            </if>
+            <if test="zlNr != null and zlNr != ''">
+                zl_nr = #{zlNr},
+            </if>
+            <if test="zlRybq != null and zlRybq != ''">
+                zl_rybq = #{zlRybq},
+            </if>
+            <if test="zlRybqxq != null and zlRybqxq != ''">
+                zl_rybqxq = #{zlRybqxq},
+            </if>
+            <if test="zlZjlx != null and zlZjlx != ''">
+                zl_zjlx = #{zlZjlx},
+            </if>
+            <if test="zlZjhm != null and zlZjhm != ''">
+                zl_zjhm = #{zlZjhm},
+            </if>
+            <if test="zlRyxm != null and zlRyxm != ''">
+                zl_ryxm = #{zlRyxm},
+            </if>
+            <if test="zlRyxb != null and zlRyxb != ''">
+                zl_ryxb = #{zlRyxb},
+            </if>
+            <if test="zlRynl != null and zlRynl != ''">
+                zl_rynl = #{zlRynl},
+            </if>
+            <if test="zlRymz != null and zlRymz != ''">
+                zl_rymz = #{zlRymz},
+            </if>
+            <if test="zlRyjg != null and zlRyjg != ''">
+                zl_ryjg = #{zlRyjg},
+            </if>
+            <if test="zlRyhjdXzqh != null and zlRyhjdXzqh != ''">
+                zl_ryhjd_xzqh = #{zlRyhjdXzqh},
+            </if>
+            <if test="zlRyhjd != null and zlRyhjd != ''">
+                zl_ryhjd = #{zlRyhjd},
+            </if>
+            <if test="zlRyjzdXzqh != null and zlRyjzdXzqh != ''">
+                zl_ryjzd_xzqh = #{zlRyjzdXzqh},
+            </if>
+            <if test="zlRyjzd != null and zlRyjzd != ''">
+                zl_ryjzd = #{zlRyjzd},
+            </if>
+            <if test="zlRygzdwid != null and zlRygzdwid != ''">
+                zl_rygzdwid = #{zlRygzdwid},
+            </if>
+            <if test="zlRygzdw != null and zlRygzdw != ''">
+                zl_rygzdw = #{zlRygzdw},
+            </if>
+            <if test="zlRylxdh != null and zlRylxdh != ''">
+                zl_rylxdh = #{zlRylxdh},
+            </if>
+            <if test="zlXsd != null and zlXsd != ''">
+                zl_xsd = #{zlXsd},
+            </if>
+            <if test="zlXwms != null and zlXwms != ''">
+                zl_xwms = #{zlXwms},
+            </if>
+            <if test="ltx != null and ltx != ''">
+                ltx = #{ltx},
+            </if>
+            <if test="lty != null and lty != ''">
+                lty = #{lty},
+            </if>
+            <if test="rbx != null and rbx != ''">
+                rbx = #{rbx},
+            </if>
+            <if test="rby != null and rby != ''">
+                rby = #{rby},
+            </if>
+            <if test="yjGzyid != null and yjGzyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zb != null and zb != ''">
+             zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="yjDzxzqh != null and yjDzxzqh != ''">
+                yj_dzxzqh = #{yjDzxzqh},
+            </if>
+            <if test="yjDz != null and yjDz != ''">
+                yj_dz = #{yjDz},
+            </if>
+            <if test="tpId != null and tpId != ''">
+                tp_id = #{tpId},
+            </if>
+            <if test="coverImage != null and coverImage != ''">
+                cover_image = #{coverImage},
+            </if>
+            <if test="yjlyBqmc != null and yjlyBqmc != ''">
+                yjly_bqmc = #{yjlyBqmc},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null and qssj != ''">
+                qssj = #{qssj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null and ddxcsj != ''">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null and zlwjsj != ''">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrSfzh != null and zlfqrSfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="hczt != null and hczt != ''">
+                hczt = #{hczt},
+            </if>
+            <if test="hcid != null and hcid != ''">
+                hcid = #{hcid},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlYjClMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlYjClMapper.xml
new file mode 100644
index 0000000..56e5ddc
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlYjClMapper.xml
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlYjClMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlYjCl">
+        <id column="id" property="id"/>
+        <result column="zl_id" property="zlId"/>
+        <result column="yj_id" property="yjId"/>
+        <result column="yjcl_id" property="yjclId"/>
+        <result column="yj_clbq" property="yjClbq"/>
+        <result column="yj_clbqmc" property="yjClbqmc"/>
+        <result column="yjly_bqmc" property="yjlyBqmc"/>
+        <result column="yj_clyjlx" property="yjClyjlx"/>
+        <result column="yj_fssj" property="yjFssj"/>
+        <result column="yj_sj" property="yjSj"/>
+        <result column="yj_jb" property="yjJb"/>
+        <result column="zldj" property="zldj"/>
+        <result column="zl_bt" property="zlBt"/>
+        <result column="zl_nr" property="zlNr"/>
+        <result column="zl_cphlx" property="zlCphlx"/>
+        <result column="zl_clcph" property="zlClcph"/>
+        <result column="zl_cljdcsyrhm" property="zlCljdcsyrhm"/>
+        <result column="zl_cljdcsyr" property="zlCljdcsyr"/>
+        <result column="zl_cphys" property="zlCphys"/>
+        <result column="zl_clys" property="zlClys"/>
+        <result column="zl_clpp" property="zlClpp"/>
+        <result column="zl_cllx" property="zlCllx"/>
+        <result column="zl_clnk" property="zlClnk"/>
+        <result column="zl_xsfx" property="zlXsfx"/>
+        <result column="zl_xssd" property="zlXssd"/>
+        <result column="zl_clrs" property="zlClrs"/>
+        <result column="cl_cxsj" property="clCxsj"/>
+        <result column="cl_xssj" property="clXssj"/>
+        <result column="yj_gzyid" property="yjGzyid"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="zl_dz_xzqh" property="zlDzXzqh"/>
+        <result column="zl_dz" property="zlDz"/>
+        <result column="tp_id" property="tpId"/>
+        <result column="qszt" property="qszt"/>
+        <result column="qssj" property="qssj"/>
+        <result column="qsyxsj" property="qsyxsj"/>
+        <result column="ddxcyxsj" property="ddxcyxsj"/>
+        <result column="zlwjyxsj" property="zlwjyxsj"/>
+        <result column="ddxczt" property="ddxczt"/>
+        <result column="ddxcsj" property="ddxcsj"/>
+        <result column="zlwjzt" property="zlwjzt"/>
+        <result column="zlwjsj" property="zlwjsj"/>
+        <result column="zlwjsm" property="zlwjsm"/>
+        <result column="zlzxzt" property="zlzxzt"/>
+        <result column="zlfqr_id" property="zlfqrId"/>
+        <result column="zlfqr" property="zlfqr"/>
+        <result column="zlfqr_sfzh" property="zlfqrSfzh"/>
+        <result column="zlfqr_dh" property="zlfqrDh"/>
+        <result column="hczt" property="hczt"/>
+        <result column="hcid" property="hcid"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="xt_sjly" property="xtSjly"/>
+        <result column="xt_sjzt" property="xtSjzt"/>
+        <result column="xt_scbz" property="xtScbz"/>
+        <result column="xt_cjip" property="xtCjip"/>
+        <result column="xt_cjsj" property="xtCjsj"/>
+        <result column="xt_cjr_id" property="xtCjrId"/>
+        <result column="xt_cjr" property="xtCjr"/>
+        <result column="xt_cjbmdm" property="xtCjbmdm"/>
+        <result column="xt_cjbmmc" property="xtCjbmmc"/>
+        <result column="xt_zhgxip" property="xtZhgxip"/>
+        <result column="xt_zhgxsj" property="xtZhgxsj"/>
+        <result column="xt_zhgxrid" property="xtZhgxrid"/>
+        <result column="xt_zhgxr" property="xtZhgxr"/>
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm"/>
+        <result column="xt_zhgxbm" property="xtZhgxbm"/>
+        <result column="bz" property="bz"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+
+                id, zl_id, yj_id, yjcl_id, yj_clbq,yj_clbqmc, yjly_bqmc, yj_clyjlx, yj_fssj, yj_sj, yj_jb, zldj, zl_bt, zl_nr,
+                zl_cphlx, zl_clcph, zl_cljdcsyrhm, zl_cljdcsyr, zl_cphys, zl_clys, zl_clpp, zl_cllx, zl_clnk,
+                zl_xsfx, zl_xssd, zl_clrs, cl_cxsj, cl_xssj, yj_gzyid, jd, wd,qsyxsj,ddxcyxsj,zlwjyxsj,
+                zb, zbhash, zl_dz_xzqh, zl_dz,
+                tp_id, qszt, qssj, ddxczt, ddxcsj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, zlfqr_id, zlfqr, zlfqr_sfzh,
+                zlfqr_dh, hczt, hcid, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid,
+                xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip,
+                xt_zhgxsj, xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjCl">
+        insert into tb_zl_yj_cl(<include refid="Base_Column_List"/>)values (
+        #{id},#{ zlId},#{ yjId},#{ yjclId},#{ yjClbq},#{yjClbqmc},#{ yjlyBqmc},#{ yjClyjlx},#{ yjFssj},#{ yjSj},#{ yjJb},
+        #{zldj},#{ zlBt},#{ zlNr},#{ zlCphlx},#{ zlClcph},#{ zlCljdcsyrhm},#{ zlCljdcsyr},#{ zlCphys},#{ zlClys},
+        #{ zlClpp},#{ zlCllx},#{ zlClnk},#{ zlXsfx},#{ zlXssd},#{ zlClrs},#{ clCxsj},#{ clXssj},#{ yjGzyid},#{ jd},#{ wd},
+        #{qsyxsj},#{ddxcyxsj},#{zlwjyxsj},
+        ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+        #{zbhash},#{ zlDzXzqh},#{ zlDz},#{ tpId},#{ qszt},#{ qssj},#{ ddxczt},#{ ddxcsj},#{ zlwjzt},#{ zlwjsj},
+        #{ zlwjsm},#{ zlzxzt},#{zlfqrId},#{ zlfqr},#{ zlfqrSfzh},#{ zlfqrDh},#{ hczt},#{ hcid},#{ ssbm},#{ ssbmdm},
+        #{ ssbmid},#{ ssxgaj},#{ ssxgajdm},#{ ssxgajid},#{ sssgaj},#{sssgajdm},#{ sssgajid},#{ xtSjly},
+        #{xtSjzt},#{ xtScbz},#{ xtCjip},#{ xtCjsj},#{ xtCjrId},#{ xtCjr},#{ xtCjbmdm},#{ xtCjbmmc},#{ xtZhgxip},
+        #{ xtZhgxsj},#{ xtZhgxrid},#{xtZhgxr},#{ xtZhgxbmdm},#{ xtZhgxbm},#{ bz}
+        )
+    </insert>
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjCl">
+        update tb_zl_yj_cl
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="yjId != null and yjId != ''">
+                yj_id = #{yjId},
+            </if>
+            <if test="yjclId != null and yjclId != ''">
+                yjcl_id = #{yjcl_id},
+            </if>
+            <if test="yjClbq != null and yjClbq != ''">
+                yj_clbq = #{yjClbq},
+            </if>
+            <if test="yjlyBqmc != null and yjlyBqmc != ''">
+                yjly_bqmc = #{yjlyBqmc},
+            </if>
+            <if test="yjClyjlx != null and yjClyjlx != ''">
+                yj_clyjlx = #{yjClyjlx},
+            </if>
+            <if test="yjFssj != null and yjFssj != ''">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null and yjSj != ''">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="yjJb != null and yjJb != ''">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="zlBt != null and zlBt != ''">
+                zl_bt = #{zlBt},
+            </if>
+            <if test="zlNr != null and zlNr != ''">
+                zl_nr = #{zlNr},
+            </if>
+            <if test="zlCphlx != null and zlCphlx != ''">
+                zl_cphlx = #{zlCphlx},
+            </if>
+            <if test="zlClcph != null and zlClcph != ''">
+                zl_clcph = #{zlClcph},
+            </if>
+            <if test="zlCljdcsyrhm != null and zlCljdcsyrhm != ''">
+                zl_cljdcsyrhm = #{zlCljdcsyrhm},
+            </if>
+            <if test="zlCljdcsyr != null and zlCljdcsyr != ''">
+                zl_cljdcsyr = #{zlCljdcsyr},
+            </if>
+            <if test="zlCphys != null and zlCphys != ''">
+                zl_cphys = #{zlCphys},
+            </if>
+            <if test="zlClys != null and zlClys != ''">
+                zl_clys = #{zlClys},
+            </if>
+            <if test="zlClpp != null and zlClpp != ''">
+                zl_clpp = #{zlClpp},
+            </if>
+            <if test="zlCllx != null and zlCllx != ''">
+                zl_cllx = #{zlCllx},
+            </if>
+            <if test="zlClnk != null and zlClnk != ''">
+                zl_clnk = #{zlClnk},
+            </if>
+            <if test="zlXsfx != null and zlXsfx != ''">
+                zl_xsfx = #{zlXsfx},
+            </if>
+            <if test="zlXssd != null and zlXssd != ''">
+                zl_xssd = #{zlXssd},
+            </if>
+            <if test="zlClrs != null and zlClrs != ''">
+                zl_clrs = #{zlClrs},
+            </if>
+            <if test="clCxsj != null and clCxsj != ''">
+                cl_cxsj = #{clCxsj},
+            </if>
+            <if test="clXssj != null and clXssj != ''">
+                cl_xssj = #{clXssj},
+            </if>
+            <if test="yjGzyid != null and yjGzyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zb != null and zb != ''">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="zlDzXzqh != null and zlDzXzqh != ''">
+                zl_dz_xzqh = #{zlDzXzqh},
+            </if>
+            <if test="zlDz != null and zlDz != ''">
+                zl_dz = #{zlDz},
+            </if>
+
+            <if test="tpId != null and tpId != ''">
+                tp_id = #{tpId},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null and qssj != ''">
+                qssj = #{qssj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null and ddxcsj != ''">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null and zlwjsj != ''">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrIfzh != null and zlfqrIfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="hczt != null and hczt != ''">
+                hczt = #{hczt},
+            </if>
+            <if test="hcid != null and hcid != ''">
+                hcid = #{hcid},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlYjRyMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlYjRyMapper.xml
new file mode 100644
index 0000000..b61f4b1
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlYjRyMapper.xml
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlYjRyMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlYjRy">
+        <id column="id" property="id"/>
+        <result column="zl_id" property="zlId"/>
+        <result column="yj_id" property="yjId"/>
+        <result column="ryyj_id" property="ryyjId"/>
+        <result column="yj_fssj" property="yjFssj"/>
+        <result column="yj_sj" property="yjSj"/>
+        <result column="yj_jb" property="yjJb"/>
+        <result column="zldj" property="zldj"/>
+        <result column="zlfsrq" property="zlfsrq"/>
+        <result column="qsyxsj" property="qsyxsj"/>
+        <result column="ddxcyxsj" property="ddxcyxsj"/>
+        <result column="zlwjyxsj" property="zlwjyxsj"/>
+        <result column="zl_bt" property="zlBt"/>
+        <result column="zl_nr" property="zlNr"/>
+        <result column="zl_rybq" property="zlRybq"/>
+        <result column="zl_rybqmc" property="zlRybqmc"/>
+        <result column="zl_zjlx" property="zlZjlx"/>
+        <result column="zl_zjhm" property="zlZjhm"/>
+        <result column="zl_ryxm" property="zlRyxm"/>
+        <result column="zl_ryxb" property="zlRyxb"/>
+        <result column="zl_rynl" property="zlRynl"/>
+        <result column="zl_rymz" property="zlRymz"/>
+        <result column="zl_ryjg" property="zlRyjg"/>
+        <result column="zl_ryhjd_xzqh" property="zlRyhjdXzqh"/>
+        <result column="zl_ryhjd" property="zlRyhjd"/>
+        <result column="zl_ryjzd_xzqh" property="zlRyjzdXzqh"/>
+        <result column="zl_ryjzd" property="zlRyjzd"/>
+        <result column="zl_rygzdwid" property="zlRygzdwid"/>
+        <result column="zl_rygzdw" property="zlRygzdw"/>
+        <result column="zl_rylxdh" property="zlRylxdh"/>
+        <result column="zl_xsd" property="zlXsd"/>
+        <result column="zl_xwms" property="zlXwms"/>
+        <result column="ltx" property="ltx"/>
+        <result column="lty" property="lty"/>
+        <result column="rbx" property="rbx"/>
+        <result column="rby" property="rby"/>
+        <result column="yj_gzyid" property="yjGzyid"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="yj_dzxzqh" property="yjDzxzqh"/>
+        <result column="yj_dz" property="yjDz"/>
+        <result column="tp_id" property="tpId"/>
+        <result column="cover_image" property="coverImage"/>
+        <result column="yjly_bqmc" property="yjlyBqmc"/>
+        <result column="qszt" property="qszt"/>
+        <result column="qssj" property="qssj"/>
+        <result column="ddxczt" property="ddxczt"/>
+        <result column="ddxcsj" property="ddxcsj"/>
+        <result column="zlwjzt" property="zlwjzt"/>
+        <result column="zlwjsj" property="zlwjsj"/>
+        <result column="zlwjsm" property="zlwjsm"/>
+        <result column="zlzxzt" property="zlzxzt"/>
+        <result column="zlfqr_id" property="zlfqrId"/>
+        <result column="zlfqr" property="zlfqr"/>
+        <result column="zlfqr_sfzh" property="zlfqrSfzh"/>
+        <result column="zlfqr_dh" property="zlfqrDh"/>
+        <result column="hczt" property="hczt"/>
+        <result column="hcid" property="hcid"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="xt_sjly" property="xtSjly"/>
+        <result column="xt_sjzt" property="xtSjzt"/>
+        <result column="xt_scbz" property="xtScbz"/>
+        <result column="xt_cjip" property="xtCjip"/>
+        <result column="xt_cjsj" property="xtCjsj"/>
+        <result column="xt_cjr_id" property="xtCjrId"/>
+        <result column="xt_cjr" property="xtCjr"/>
+        <result column="xt_cjbmdm" property="xtCjbmdm"/>
+        <result column="xt_cjbmmc" property="xtCjbmmc"/>
+        <result column="xt_zhgxip" property="xtZhgxip"/>
+        <result column="xt_zhgxsj" property="xtZhgxsj"/>
+        <result column="xt_zhgxrid" property="xtZhgxrid"/>
+        <result column="xt_zhgxr" property="xtZhgxr"/>
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm"/>
+        <result column="xt_zhgxbm" property="xtZhgxbm"/>
+        <result column="bz" property="bz"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+
+                id, zl_id, yj_id, ryyj_id, yj_fssj, yj_sj, yj_jb, zldj, zlfsrq, zlfssj, zl_bt, zl_nr,
+                zl_rybq, zl_rybqmc, zl_zjlx, zl_zjhm, zl_ryxm, zl_ryxb, zl_rynl, zl_rymz, zl_ryjg,
+                zl_ryhjd_xzqh, zl_ryhjd, zl_ryjzd_xzqh, zl_ryjzd, zl_rygzdwid, zl_rygzdw, zl_rylxdh,
+                zl_xsd, zl_xwms, ltx, lty, rbx, rby, yj_gzyid, jd, wd, qsyxsj,ddxcyxsj,zlwjyxsj,
+                zb, zbhash, yj_dzxzqh, yj_dz,
+                tp_id, cover_image, yjly_bqmc, qszt, qssj, ddxczt, ddxcsj, zlwjzt, zlwjsj, zlwjsm,
+                zlzxzt, zlfqr_id, zlfqr, zlfqr_sfzh, zlfqr_dh, hczt, hcid, ssbm, ssbmdm, ssbmid,
+                ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz,
+                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjRy">
+        insert into tb_zl_yj_ry(<include refid="Base_Column_List">
+    </include>)values (
+        #{id},#{ zlId},#{ yjId},#{ ryyjId},#{ yjFssj},#{ yjSj},#{ yjJb},#{ zldj},#{ zlfsrq},#{ zlfssj},#{ zlBt},#{ zlNr},
+        #{zlRybq},#{ zlRybqmc},#{ zlZjlx},#{ zlZjhm},#{ zlRyxm},#{ zlRyxb},#{ zlRynl},#{ zlRymz},#{ zlRyjg},#{ zlRyhjdXzqh},
+        #{zlRyhjd},#{ zlRyjzdXzqh},#{ zlRyjzd},#{ zlRygzdwid},#{ zlRygzdw},#{ zlRylxdh},#{ zlXsd},#{ zlXwms},#{ ltx},
+        #{ lty},#{ rbx},#{ rby},#{yjGzyid},#{ jd},#{ wd}, #{qsyxsj},#{ddxcyxsj},#{zlwjyxsj},
+        ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+        #{ zbhash},#{ yjDzxzqh},#{ yjDz},#{ tpId},#{ coverImage},#{ yjlyBqmc},#{ qszt},#{ qssj},#{ ddxczt},#{ ddxcsj},
+        #{zlwjzt},
+        #{zlwjsj},#{ zlwjsm},#{ zlzxzt},#{ zlfqrId},#{ zlfqr},#{ zlfqrSfzh},#{ zlfqrDh},#{ hczt},#{ hcid},#{ ssbm},#{ ssbmdm},
+        #{ssbmid},#{ ssxgaj},#{ ssxgajdm},#{ ssxgajid},#{ sssgaj},#{ sssgajdm},#{ sssgajid},
+        #{ xtSjly},#{xtSjzt},#{ xtScbz},#{ xtCjip},#{ xtCjsj},#{ xtCjrId},#{ xtCjr},#{ xtCjbmdm},#{ xtCjbmmc},
+        #{ xtZhgxip},#{ xtZhgxsj},#{ xtZhgxrid},#{xtZhgxr},#{ xtZhgxbmdm},#{ xtZhgxbm},#{ bz}
+        )
+    </insert>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjRy">
+        update tb_zl_yj_ry
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="yjId != null and yjId != ''">
+                yj_id = #{yjId},
+            </if>
+            <if test="ryyjId != null and ryyjId != ''">
+                ryyj_id = #{ryyjId},
+            </if>
+            <if test="yjFssj != null and yjFssj != ''">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null and yjSj != ''">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="yjJb != null and yjJb != ''">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="zlfsrq != null and zlfsrq != ''">
+                zlfsrq = #{zlfsrq},
+            </if>
+            <if test="zlfssj != null and zlfssj != ''">
+                zlfssj = #{zlfssj},
+            </if>
+            <if test="zlBt != null and zlBt != ''">
+                zl_bt = #{zlBt},
+            </if>
+            <if test="zlNr != null and zlNr != ''">
+                zl_nr = #{zlNr},
+            </if>
+            <if test="zlRybq != null and zlRybq != ''">
+                zl_rybq = #{zlRybq},
+            </if>
+            <if test="zlRybqxq != null and zlRybqxq != ''">
+                zl_rybqxq = #{zlRybqxq},
+            </if>
+            <if test="zlZjlx != null and zlZjlx != ''">
+                zl_zjlx = #{zlZjlx},
+            </if>
+            <if test="zlZjhm != null and zlZjhm != ''">
+                zl_zjhm = #{zlZjhm},
+            </if>
+            <if test="zlRyxm != null and zlRyxm != ''">
+                zl_ryxm = #{zlRyxm},
+            </if>
+            <if test="zlRyxb != null and zlRyxb != ''">
+                zl_ryxb = #{zlRyxb},
+            </if>
+            <if test="zlRynl != null and zlRynl != ''">
+                zl_rynl = #{zlRynl},
+            </if>
+            <if test="zlRymz != null and zlRymz != ''">
+                zl_rymz = #{zlRymz},
+            </if>
+            <if test="zlRyjg != null and zlRyjg != ''">
+                zl_ryjg = #{zlRyjg},
+            </if>
+            <if test="zlRyhjdXzqh != null and zlRyhjdXzqh != ''">
+                zl_ryhjd_xzqh = #{zlRyhjdXzqh},
+            </if>
+            <if test="zlRyhjd != null and zlRyhjd != ''">
+                zl_ryhjd = #{zlRyhjd},
+            </if>
+            <if test="zlRyjzdXzqh != null and zlRyjzdXzqh != ''">
+                zl_ryjzd_xzqh = #{zlRyjzdXzqh},
+            </if>
+            <if test="zlRyjzd != null and zlRyjzd != ''">
+                zl_ryjzd = #{zlRyjzd},
+            </if>
+            <if test="zlRygzdwid != null and zlRygzdwid != ''">
+                zl_rygzdwid = #{zlRygzdwid},
+            </if>
+            <if test="zlRygzdw != null and zlRygzdw != ''">
+                zl_rygzdw = #{zlRygzdw},
+            </if>
+            <if test="zlRylxdh != null and zlRylxdh != ''">
+                zl_rylxdh = #{zlRylxdh},
+            </if>
+            <if test="zlXsd != null and zlXsd != ''">
+                zl_xsd = #{zlXsd},
+            </if>
+            <if test="zlXwms != null and zlXwms != ''">
+                zl_xwms = #{zlXwms},
+            </if>
+            <if test="ltx != null and ltx != ''">
+                ltx = #{ltx},
+            </if>
+            <if test="lty != null and lty != ''">
+                lty = #{lty},
+            </if>
+            <if test="rbx != null and rbx != ''">
+                rbx = #{rbx},
+            </if>
+            <if test="rby != null and rby != ''">
+                rby = #{rby},
+            </if>
+            <if test="yjGzyid != null and yj_gzyjGzyidyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zb != null and zb != ''">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="yjDzxzqh != null and yjDzxzqh != ''">
+                yj_dzxzqh = #{yjDzxzqh},
+            </if>
+            <if test="yjDz != null and yjDz != ''">
+                yj_dz = #{yjDz},
+            </if>
+            <if test="tpId != null and tpId != ''">
+                tp_id = #{tpId},
+            </if>
+            <if test="coverImage != null and coverImage != ''">
+                cover_image = #{coverImage},
+            </if>
+            <if test="yjlyBqmc != null and yjlyBqmc != ''">
+                yjly_bqmc = #{yjlyBqmc},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null and qssj != ''">
+                qssj = #{qssj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null and ddxcsj != ''">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null and zlwjsj != ''">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrSfzh != null and zlfqrSfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="hczt != null and hczt != ''">
+                hczt = #{hczt},
+            </if>
+            <if test="hcid != null and hcid != ''">
+                hcid = #{hcid},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlYjSjMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlYjSjMapper.xml
new file mode 100644
index 0000000..8582c9c
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlYjSjMapper.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlYjSjMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlYjSj">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="zl_id" property="zlId" jdbcType="VARCHAR"/>
+        <result column="yj_id" property="yjId" jdbcType="VARCHAR"/>
+        <result column="yj_sjid" property="yjSjid" jdbcType="VARCHAR"/>
+        <result column="yj_gzyid" property="yjGzyid" jdbcType="VARCHAR"/>
+        <result column="sj_fl" property="sjFl" jdbcType="VARCHAR"/>
+        <result column="sj_flmc" property="sjFlmc" jdbcType="VARCHAR"/>
+        <result column="yj_jb" property="yjJb" jdbcType="VARCHAR"/>
+        <result column="zldj" property="zldj" jdbcType="VARCHAR"/>
+        <result column="yj_fssj" property="yjFssj" jdbcType="TIMESTAMP"/>
+        <result column="yj_sj" property="yjSj" jdbcType="TIMESTAMP"/>
+        <result column="zlfsrq" property="zlfsrq" jdbcType="TIMESTAMP"/>
+        <result column="zlfssj" property="zlfssj" jdbcType="TIMESTAMP"/>
+        <result column="zl_bt" property="zlBt" jdbcType="VARCHAR"/>
+        <result column="zl_nr" property="zlNr" jdbcType="VARCHAR"/>
+        <result column="jd" property="jd" jdbcType="NUMERIC"/>
+        <result column="wd" property="wd" jdbcType="NUMERIC"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash" jdbcType="VARCHAR"/>
+        <result column="yj_dzxzqh" property="yjDzxzqh" jdbcType="VARCHAR"/>
+        <result column="yj_dz" property="yjDz" jdbcType="VARCHAR"/>
+        <result column="tp_id" property="tpId" jdbcType="VARCHAR"/>
+        <result column="zlfqr_id" property="zlfqrId" jdbcType="VARCHAR"/>
+        <result column="zlfqr" property="zlfqr" jdbcType="VARCHAR"/>
+        <result column="zlfqr_sfzh" property="zlfqrSfzh" jdbcType="VARCHAR"/>
+        <result column="zlfqr_dh" property="zlfqrDh" jdbcType="VARCHAR"/>
+        <result column="qszt" property="qszt" jdbcType="VARCHAR"/>
+        <result column="qssj" property="qssj" jdbcType="TIMESTAMP"/>
+        <result column="ddxczt" property="ddxczt" jdbcType="VARCHAR"/>
+        <result column="ddxcsj" property="ddxcsj" jdbcType="TIMESTAMP"/>
+        <result column="zlwjzt" property="zlwjzt" jdbcType="VARCHAR"/>
+        <result column="zlwjsj" property="zlwjsj" jdbcType="TIMESTAMP"/>
+        <result column="zlwjsm" property="zlwjsm" jdbcType="VARCHAR"/>
+        <result column="zlzxzt" property="zlzxzt" jdbcType="VARCHAR"/>
+        <result column="czqk" property="czqk" jdbcType="VARCHAR"/>
+        <result column="ssbm" property="ssbm" jdbcType="VARCHAR"/>
+        <result column="ssbmdm" property="ssbmdm" jdbcType="VARCHAR"/>
+        <result column="ssbmid" property="ssbmid" jdbcType="VARCHAR"/>
+        <result column="ssxgaj" property="ssxgaj" jdbcType="VARCHAR"/>
+        <result column="ssxgajdm" property="ssxgajdm" jdbcType="VARCHAR"/>
+        <result column="ssxgajid" property="ssxgajid" jdbcType="VARCHAR"/>
+        <result column="sssgaj" property="sssgaj" jdbcType="VARCHAR"/>
+        <result column="sssgajdm" property="sssgajdm" jdbcType="VARCHAR"/>
+        <result column="sssgajid" property="sssgajid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="qsyxsj" column="qsyxsj" jdbcType="TIMESTAMP"/>
+        <result property="ddxcyxsj" column="ddxcyxsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjyxsj" column="zlwjyxsj" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, zl_id, yj_id, yj_sjid, yj_gzyid, sj_fl,sj_flmc, yj_jb, zldj, yj_fssj, yj_sj, zlfsrq, zlfssj,qsyxsj,ddxcyxsj,zlwjyxsj,
+        zl_bt, zl_nr, jd, wd, zb, zbhash, yj_dzxzqh, yj_dz, tp_id, zlfqr_id, zlfqr, zlfqr_sfzh,
+        zlfqr_dh, qszt, qssj, ddxczt, ddxcsj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, czqk, ssbm, ssbmdm,
+        ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjSj">
+        insert into tb_zl_yj_sj(<include refid="Base_Column_List">
+    </include>)values (
+        #{id},#{ zlId},#{ yjId},#{ yjSjid},#{ yjGzyid},#{ sjFl},#{ sjFlmc},#{ yjJb},#{ zldj},#{ yjFssj},#{ yjSj},#{ zlfsrq},#{ zlfssj},
+        #{qsyxsj},#{ddxcyxsj},#{zlwjyxsj},
+        #{zlBt},#{ zlNr},#{ jd},#{ wd},
+        ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+        #{zbhash},#{ yjDzxzqh},#{ yjDz},#{ tpId},#{ zlfqrId},#{ zlfqr},#{ zlfqrSfzh},#{ zlfqrDh},#{ qszt},#{ qssj},#{ ddxczt},
+        #{ddxcsj},#{ zlwjzt},#{ zlwjsj},#{ zlwjsm},#{ zlzxzt},#{ czqk},#{ ssbm},#{ ssbmdm},#{ ssbmid},#{ ssxgaj},#{ ssxgajdm},
+        #{ssxgajid},#{ sssgaj},#{ sssgajdm},#{ sssgajid},
+        #{ xtSjly},#{xtSjzt},#{ xtScbz},#{ xtCjip},#{ xtCjsj},#{ xtCjrId},#{ xtCjr},#{ xtCjbmdm},#{ xtCjbmmc},
+        #{ xtZhgxip},#{ xtZhgxsj},#{ xtZhgxrid},#{xtZhgxr},#{ xtZhgxbmdm},#{ xtZhgxbm},#{ bz}
+        )
+    </insert>
+
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlYjSj">
+        update tb_zl_yj_sj
+        <set>
+            <if test="zlId != null and zlId != ''">
+                zl_id = #{zlId},
+            </if>
+            <if test="yjId != null and yjId != ''">
+                yj_id = #{yjId},
+            </if>
+            <if test="yjSjid != null and yjSjid != ''">
+                yj_sjid = #{yjSjid},
+            </if>
+            <if test="yjGzyid != null and yjGzyid != ''">
+                yj_gzyid = #{yjGzyid},
+            </if>
+            <if test="sjFl != null and sjFl != ''">
+                sj_fl = #{sjFl},
+            </if>
+            <if test="yjJb != null and yjJb != ''">
+                yj_jb = #{yjJb},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="yjFssj != null and yjFssj != ''">
+                yj_fssj = #{yjFssj},
+            </if>
+            <if test="yjSj != null and yjSj != ''">
+                yj_sj = #{yjSj},
+            </if>
+            <if test="zlfsrq != null and zlfsrq != ''">
+                zlfsrq = #{zlfsrq},
+            </if>
+            <if test="zlfssj != null and zlfssj != ''">
+                zlfssj = #{zlfssj},
+            </if>
+            <if test="zlBt != null and zlBt != ''">
+                zl_bt = #{zlBt},
+            </if>
+            <if test="zlNr != null and zlNr != ''">
+                zl_nr = #{zlNr},
+            </if>
+            <if test="jd != null and jd != ''">
+                jd = #{jd},
+            </if>
+            <if test="wd != null and wd != ''">
+                wd = #{wd},
+            </if>
+            <if test="zb != null and zb != ''">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="yjDzxzqh != null and yjDzxzqh != ''">
+                yj_dzxzqh = #{yjDzxzqh},
+            </if>
+            <if test="yjDz != null and yjDz != ''">
+                yj_dz = #{yjDz},
+            </if>
+            <if test="tpId != null and tpId != ''">
+                tp_id = #{tpId},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrSfzh != null and zlfqrSfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null and qssj != ''">
+                qssj = #{qssj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null and ddxcsj != ''">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null and zlwjsj != ''">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="czqk != null and czqk != ''">
+                czqk = #{czqk},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlxxMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlxxMapper.xml
new file mode 100644
index 0000000..481971e
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlxxMapper.xml
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlxxMapper">
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbZlxx" id="tbZlxx">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ywId" column="yw_id" jdbcType="VARCHAR"/>
+        <result property="zllx" column="zllx" jdbcType="VARCHAR"/>
+        <result property="zlly" column="zlly" jdbcType="VARCHAR"/>
+        <result property="zlzxlx" column="zlzxlx" jdbcType="VARCHAR"/>
+        <result property="zlbt" column="zlbt" jdbcType="VARCHAR"/>
+        <result property="zlnr" column="zlnr" jdbcType="VARCHAR"/>
+        <result property="zlzxqk" column="zlzxqk" jdbcType="VARCHAR"/>
+        <result property="zlfqrq" column="zlfqrq" jdbcType="TIMESTAMP"/>
+        <result property="zlfqsj" column="zlfqsj" jdbcType="TIMESTAMP"/>
+        <result property="zldj" column="zldj" jdbcType="VARCHAR"/>
+        <result property="qsyxsj" column="qsyxsj" jdbcType="TIMESTAMP"/>
+        <result property="zljsdx" column="zljsdx" jdbcType="VARCHAR"/>
+        <result property="qszt" column="qszt" jdbcType="VARCHAR"/>
+        <result property="qssj" column="qssj" jdbcType="TIMESTAMP"/>
+        <result property="ddxczt" column="ddxczt" jdbcType="VARCHAR"/>
+        <result property="ddxcsj" column="ddxcsj" jdbcType="TIMESTAMP"/>
+        <result property="ddxcyxsj" column="ddxcyxsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjzt" column="zlwjzt" jdbcType="VARCHAR"/>
+        <result property="zlwjsj" column="zlwjsj" jdbcType="TIMESTAMP"/>
+        <result property="zlwjsm" column="zlwjsm" jdbcType="VARCHAR"/>
+        <result property="zlwjyxsj" column="zlwjyxsj" jdbcType="TIMESTAMP"/>
+        <result property="zlzxzt" column="zlzxzt" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="zlfsddxzqh" column="zlfsddxzqh" jdbcType="VARCHAR"/>
+        <result property="zlfsdd" column="zlfsdd" jdbcType="VARCHAR"/>
+        <result property="zlfqrId" column="zlfqr_id" jdbcType="VARCHAR"/>
+        <result property="zlfqr" column="zlfqr" jdbcType="VARCHAR"/>
+        <result property="zlfqrSfzh" column="zlfqr_sfzh" jdbcType="VARCHAR"/>
+        <result property="zlfqrDh" column="zlfqr_dh" jdbcType="VARCHAR"/>
+        <result property="fjId" column="fj_id" jdbcType="VARCHAR"/>
+        <result property="zljsrs" column="zljsrs" jdbcType="INTEGER"/>
+        <result property="zltp" column="zltp" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="zlxflx" column="zlxflx" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id,yw_id,zllx,zlly,zlzxlx,zlbt,zlnr,zlzxqk,zlfqrq,zlfqsj,zldj,qsyxsj,zljsdx,qszt,qssj,ddxcyxsj,zlwjyxsj,
+                        ddxczt,ddxcsj,zlwjzt,zlwjsj,zlwjsm,zlzxzt,jd,wd,zbhash,zlfsddxzqh,zlfsdd,zlfqr_id,
+                        zlfqr,zlfqr_sfzh,zlfqr_dh,fj_id,zljsrs,zltp,ssbm,ssbmdm,ssbmid,ssxgaj, ssxgajdm,ssxgajid,
+                        sssgaj,sssgajdm,sssgajid,xt_sjly, xt_sjzt, xt_scbz,
+                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                        xt_zhgxrid,xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz,zlxflx
+    </sql>
+
+    <sql id="Blob_Column_List">
+        ST_ASWKT
+                (zb)
+                as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlxx">
+        insert into tb_zlxx(id, yw_id, zllx, zlly, zlzxlx, zlbt, zlnr, zlzxqk, zlfqrq, zlfqsj, zldj, qsyxsj, zljsdx,
+                            qszt, qssj,
+                            ddxczt, ddxcsj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, jd, wd, zb, zbhash, zlfsddxzqh, zlfsdd,
+                            zlfqr_id, ddxcyxsj, zlwjyxsj,
+                            zlfqr, zlfqr_sfzh, zlfqr_dh, fj_id, zljsrs, zltp, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm,
+                            ssxgajid,
+                            sssgaj, sssgajdm, sssgajid, xt_sjly, xt_sjzt, xt_scbz,
+                            xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                            xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, zlxflx)
+        values (#{id}, #{ywId}, #{zllx}, #{zlly}, #{zlzxlx}, #{zlbt}, #{zlnr}, #{zlzxqk}, #{zlfqrq}, #{zlfqsj}, #{zldj},
+                #{qsyxsj}, #{zljsdx}, #{qszt}, #{qssj},
+                #{ddxczt}, #{ddxcsj}, #{zlwjzt}, #{zlwjsj}, #{zlwjsm}, #{zlzxzt}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{zlfsddxzqh}, #{zlfsdd}, #{zlfqrId}, #{ddxcyxsj}, #{zlwjyxsj},
+                #{zlfqr}, #{zlfqrSfzh}, #{zlfqrDh}, #{fjId}, #{zljsrs}, #{zltp}, #{ssbm}, #{ssbmdm}, #{ssbmid},
+                #{ssxgaj}, #{ssxgajdm}, #{ssxgajid},
+                #{sssgaj}, #{sssgajdm}, #{sssgajid}, #{xtSjly}, #{ xtSjzt}, #{ xtScbz},
+                #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+                #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{zlxflx})
+    </insert>
+
+    <!--查询指令数量-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.zllx != null and dto.zllx != ''">
+            and zllx = #{dto.zllx}
+        </if>
+        <if test="dto.zlly != null and dto.zlly != ''">
+            and zlly = #{dto.zlly}
+        </if>
+        <if test="dto.zlbt != null and dto.zlbt != ''">
+            and zlbt like concat('%',#{dto.zlbt},'%')
+        </if>
+        <if test="dto.zlnr != null and dto.zlnr != ''">
+            and zlnr like concat('%',#{dto.zlnr},'%')
+        </if>
+        <if test="dto.zldj != null and dto.zldj != ''">
+            and zldj = #{dto.zldj}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+        <if test="dto.sfcl != null and dto.sfcl != ''">
+            and sfcl = #{dto.sfcl}
+        </if>
+
+        <if test="dto.zlxflx != null and dto.zlxflx != ''">
+            and zlxflx = #{dto.zlxflx}
+        </if>
+
+        <if test="dto.zlwjzt != null and dto.zlwjzt != ''">
+            and zlwjzt = #{dto.zlwjzt}
+        </if>
+
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and zlfqrq between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+    </select>
+
+    <!--查询指令列表-->
+    <select id="getListPage" resultMap="tbZlxx" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.zllx != null and dto.zllx != ''">
+            and zllx = #{dto.zllx}
+        </if>
+        <if test="dto.zlly != null and dto.zlly != ''">
+            and zlly = #{dto.zlly}
+        </if>
+        <if test="dto.zlbt != null and dto.zlbt != ''">
+            and zlbt like concat('%',#{dto.zlbt},'%')
+        </if>
+        <if test="dto.zlnr != null and dto.zlnr != ''">
+            and zlnr like concat('%',#{dto.zlnr},'%')
+        </if>
+        <if test="dto.zldj != null and dto.zldj != ''">
+            and zldj = #{dto.zldj}
+        </if>
+        <if test="dto.sfcl != null and dto.sfcl != ''">
+            and sfcl = #{dto.sfcl}
+        </if>
+        <if test="dto.ssbmid != null and dto.ssbmid != ''">
+            and ssbmid = #{dto.ssbmid}
+        </if>
+
+        <if test="dto.zlxflx != null and dto.zlxflx != ''">
+            and zlxflx = #{dto.zlxflx}
+        </if>
+
+        <if test="dto.zlwjzt != null and dto.zlwjzt != ''">
+            and zlwjzt = #{dto.zlwjzt}
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and zlfqrq between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+<!--        ${useSql}-->
+        order by zlfqsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectInstructCount" resultType="java.util.Map">
+        SELECT count(*) zlzs,(SELECT count(*) zlzs FROM `tb_zlxx`
+        where xt_sjzt = '1' and xt_scbz = '0'
+        and zlwjzt = '91'
+        <if test="startTime != null and endTime != null">
+            and zlfqrq between #{startTime} and #{endTime}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        ) zlzxs
+        FROM `tb_zlxx`
+        where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="startTime != null and endTime != null">
+            and zlfqrq between #{startTime} and #{endTime}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+    </select>
+
+    <!--修改-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlxx">
+        update tb_zlxx
+        <set>
+            <if test="ywId != null and ywId != ''">
+                yw_id = #{ywId},
+            </if>
+            <if test="zllx != null and zllx != ''">
+                zllx = #{zllx},
+            </if>
+            <if test="zlly != null and zlly != ''">
+                zlly = #{zlly},
+            </if>
+            <if test="zlzxlx != null and zlzxlx != ''">
+                zlzxlx = #{zlzxlx},
+            </if>
+            <if test="zlbt != null and zlbt != ''">
+                zlbt = #{zlbt},
+            </if>
+            <if test="zlnr != null and zlnr != ''">
+                zlnr = #{zlnr},
+            </if>
+            <if test="zlzxqk != null and zlzxqk != ''">
+                zlzxqk = #{zlzxqk},
+            </if>
+            <if test="zlfqrq != null">
+                zlfqrq = #{zlfqrq},
+            </if>
+            <if test="zlfqsj != null">
+                zlfqsj = #{zlfqsj},
+            </if>
+            <if test="zldj != null and zldj != ''">
+                zldj = #{zldj},
+            </if>
+            <if test="qsyxsj != null">
+                qsyxsj = #{qsyxsj},
+            </if>
+            <if test="ddxcyxsj != null">
+                ddxcyxsj = #{ddxcyxsj},
+            </if>
+            <if test="zlwjyxsj != null">
+                zlwjyxsj = #{zlwjyxsj},
+            </if>
+            <if test="zljsdx != null and zljsdx != ''">
+                zljsdx = #{zljsdx},
+            </if>
+            <if test="qszt != null and qszt != ''">
+                qszt = #{qszt},
+            </if>
+            <if test="qssj != null">
+                qssj = #{qssj},
+            </if>
+            <if test="ddxczt != null and ddxczt != ''">
+                ddxczt = #{ddxczt},
+            </if>
+            <if test="ddxcsj != null">
+                ddxcsj = #{ddxcsj},
+            </if>
+            <if test="zlwjzt != null and zlwjzt != ''">
+                zlwjzt = #{zlwjzt},
+            </if>
+            <if test="zlwjsj != null">
+                zlwjsj = #{zlwjsj},
+            </if>
+            <if test="zlwjsm != null and zlwjsm != ''">
+                zlwjsm = #{zlwjsm},
+            </if>
+            <if test="zlzxzt != null and zlzxzt != ''">
+                zlzxzt = #{zlzxzt},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="zlfsddxzqh != null and zlfsddxzqh != ''">
+                zlfsddxzqh = #{zlfsddxzqh},
+            </if>
+            <if test="zlfsdd != null and zlfsdd != ''">
+                zlfsdd = #{zlfsdd},
+            </if>
+            <if test="zlfqrId != null and zlfqrId != ''">
+                zlfqr_id = #{zlfqrId},
+            </if>
+            <if test="zlfqr != null and zlfqr != ''">
+                zlfqr = #{zlfqr},
+            </if>
+            <if test="zlfqrSfzh != null and zlfqrSfzh != ''">
+                zlfqr_sfzh = #{zlfqrSfzh},
+            </if>
+            <if test="zlfqrDh != null and zlfqrDh != ''">
+                zlfqr_dh = #{zlfqrDh},
+            </if>
+            <if test="fjId != null and fjId != ''">
+                fj_id = #{fjId},
+            </if>
+            <if test="zljsrs != null">
+                zljsrs = #{zljsrs},
+            </if>
+            <if test="zltp != null and zltp != ''">
+                zltp = #{zltp},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="zlxflx != null and zlxflx != ''">
+                zlxflx = #{zlxflx},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getMyZlCount" resultType="Map" parameterType="Map">
+        select count(1) count, zllx
+        from mosty_yjzl.tb_zlxx_zxr a
+        where a.xt_sjzt = '1'
+          and a.xt_scbz = '0'
+          and case
+                when a.zxr_lx = '01' then
+                        a.zxr_sfz = #{sfz}
+                when a.zxr_lx = '03' then
+                        a.zxr_xzid in (select b.id
+                                       from mosty_qwgl.tb_qw_xfbb b,
+                                            mosty_qwgl.tb_qw_jl c
+                                       where b.id = c.ywid
+                                         and b.xt_sjzt = '1'
+                                         and b.xt_scbz = '0'
+                                         and c.xt_sjzt = '1'
+                                         and c.xt_scbz = '0'
+                                         and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+                when a.zxr_lx = '02' then
+                        a.ssbmid = #{ssbmid}
+                end
+        group by a.zllx
+    </select>
+
+    <select id="getMyZlCountBy" resultType="Integer">
+        select count(1) from tb_zlxx_zxr a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        <if test="zlnr != null and zlnr != ''">
+            <!-- and match(a.zlnr) against (#{zlnr})-->
+            and a.zlnr like concat('%',#{zlnr},'%')
+        </if>
+        <if test="kssj != null and jssj != null and kssj != '' and jssj != ''">
+            and DATE_FORMAT(a.zlfqsj,'%Y-%m-%d %H:%i:%s') between #{kssj} and #{jssj}
+        </if>
+
+        <if test="time != null and time != null">
+            and a.zlfqsj > #{time}
+        </if>
+        <if test="ztList != null and ztList.size > 0">
+            and a.zlzxzt in
+            <foreach collection="ztList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="lxList != null and lxList.size > 0">
+            and a.zllx in
+            <foreach collection="lxList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        and case
+        when a.zxr_lx = '01' then
+        a.zxr_sfz = #{sfz}
+        when a.zxr_lx = '03' then
+        a.zxr_xzid in (select b.id from mosty_qwgl.tb_qw_xfbb b,mosty_qwgl.tb_qw_jl c where b.id = c.ywid and b.xt_sjzt
+        = '1'
+        and b.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0' and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+        when a.zxr_lx = '02' then
+        a.ssbmid = #{ssbmid}
+        end
+    </select>
+
+    <select id="getMyZlList" resultType="com.mosty.base.model.vo.yjzl.TbZlxxZxrVo" parameterType="Map">
+        select * from tb_zlxx_zxr a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        <if test="zlnr != null and zlnr != ''">
+            <!-- and match(a.zlnr) against (#{zlnr})-->
+            and a.zlnr like concat('%',#{zlnr},'%')
+        </if>
+        <if test="kssj != null and jssj != null and kssj != '' and jssj != ''">
+            and DATE_FORMAT(a.zlfqsj,'%Y-%m-%d %H:%i:%s') between #{kssj} and #{jssj}
+        </if>
+        <if test="time != null and time != null">
+            and a.zlfqsj > #{time}
+        </if>
+        <if test="ztList != null and ztList.size > 0">
+            and a.dqzt in
+            <foreach collection="ztList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="lxList != null and lxList.size > 0">
+            and a.zllx in
+            <foreach collection="lxList" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        and case
+        when a.zxr_lx = '01' then
+        a.zxr_sfz = #{sfz}
+        when a.zxr_lx = '03' then
+        a.zxr_xzid in (select b.id from mosty_qwgl.tb_qw_xfbb b,mosty_qwgl.tb_qw_jl c where b.id = c.ywid and b.xt_sjzt
+        = '1'
+        and b.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0' and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+        when a.zxr_lx = '02' then
+        a.ssbmid = #{ssbmid}
+        end
+        order by a.zlfqsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectZxr" resultType="com.mosty.base.model.entity.yjzl.TbZlxxZxr">
+        select *
+        from mosty_yjzl.tb_zlxx_zxr a
+        where a.xt_sjzt = '1'
+          and a.xt_scbz = '0'
+          and zl_id = #{zlId}
+          and case
+                when a.zxr_lx = '01' then
+                        a.zxr_sfz = #{sfz}
+                when a.zxr_lx = '03' then
+                        a.zxr_xzid in (select b.id
+                                       from mosty_qwgl.tb_qw_xfbb b,
+                                            mosty_qwgl.tb_qw_jl c
+                                       where b.id = c.ywid
+                                         and b.xt_sjzt
+                                               = '1'
+                                         and b.xt_scbz = '0'
+                                         and c.xt_sjzt = '1'
+                                         and c.xt_scbz = '0'
+                                         and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+                when a.zxr_lx = '02' then
+                        a.ssbmid = #{ssbmid}
+                end
+    </select>
+
+    <select id="getTjOfZllx" resultType="java.util.Map">
+        select count(zllx) count, zllx
+        from tb_zlxx
+        where xt_scbz = '0'
+        and xt_sjzt = '1'
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != jssj">
+            zlfqrq &gt;= #{kssj} and zlfqrq &lt;= #{jssj}
+        </if>
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm},'%')
+        </if>
+        group by zllx
+    </select>
+
+    <select id="getStatisticsByStatus" resultType="int">
+        select count(1) from tb_zlxx d where d.xt_sjzt = '1' and d.xt_scbz = '0'
+        and d.id in (
+        select zl_id from mosty_yjzl.tb_zlxx_zxr a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+        and case
+        when a.zxr_lx = '01' then
+        a.zxr_sfz = #{sfz}
+        when a.zxr_lx = '03' then
+        a.zxr_xzid in (select b.id from mosty_qwgl.tb_qw_xfbb b,mosty_qwgl.tb_qw_jl c where b.id = c.ywid and b.xt_sjzt
+        = '1'
+        and b.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0' and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+        when a.zxr_lx = '02' then
+        a.ssbmid = #{ssbmid}
+        end
+        <if test='type == "2"'>
+            and dqzt != '92' and dqzt != '93'
+        </if>
+        )
+    </select>
+
+    <select id="getStatistics" resultType="java.util.Map">
+        select count(1) count, zlzxzt
+        from mosty_yjzl.tb_zlxx_zxr a
+        where a.xt_sjzt = '1'
+          and a.xt_scbz = '0'
+          and case
+                when a.zxr_lx = '01' then
+                        a.zxr_sfz = #{sfz}
+                when a.zxr_lx = '03' then
+                        a.zxr_xzid in (select b.id
+                                       from mosty_qwgl.tb_qw_xfbb b,
+                                            mosty_qwgl.tb_qw_jl c
+                                       where b.id = c.ywid
+                                         and b.xt_sjzt = '1'
+                                         and b.xt_scbz = '0'
+                                         and c.xt_sjzt = '1'
+                                         and c.xt_scbz = '0'
+                                         and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+                when a.zxr_lx = '02' then
+                        a.ssbmid = #{ssbmid}
+                end
+        group by a.zlzxzt
+    </select>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlxxPcryclMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlxxPcryclMapper.xml
new file mode 100644
index 0000000..ee65487
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlxxPcryclMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlxxPcryclMapper">
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlxxZxjlMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlxxZxjlMapper.xml
new file mode 100644
index 0000000..a952f01
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlxxZxjlMapper.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlxxZxjlMapper">
+
+    <resultMap type="com.mosty.base.model.entity.yjzl.TbZlxxZxjl" id="tbZlZxjl">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="zlId" column="zl_id" jdbcType="VARCHAR"/>
+        <result property="zxsj" column="zxsj" jdbcType="TIMESTAMP"/>
+        <result property="zlzxzt" column="zlzxzt" jdbcType="VARCHAR"/>
+        <result property="zxnr" column="zxnr" jdbcType="VARCHAR"/>
+        <result property="yysc" column="yysc" jdbcType="INTEGER"/>
+        <result property="sptpid" column="sptpid" jdbcType="VARCHAR"/>
+        <result property="zlzxddXzqhdm" column="zlzxdd_xzqhdm" jdbcType="VARCHAR"/>
+        <result property="zlzxdd" column="zlzxdd" jdbcType="TIMESTAMP"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="zlzxrXzid" column="zlzxr_xzid" jdbcType="VARCHAR"/>
+        <result property="zlzxrId" column="zlzxr_id" jdbcType="VARCHAR"/>
+        <result property="zlzxrXm" column="zlzxr_xm" jdbcType="INTEGER"/>
+        <result property="zlzxrSfz" column="zlzxr_sfz" jdbcType="VARCHAR"/>
+        <result property="zlzxrDh" column="zlzxr_dh" jdbcType="VARCHAR"/>
+        <result property="fjid" column="fjid" jdbcType="TIMESTAMP"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id,zl_id,zxsj,zlzxzt,zxnr,zlzxdd_xzqhdm,zlzxdd,jd,wd,zb,zbhash,zlzxr_xzid,
+        zlzxr_id,zlzxr_xm,zlzxr_sfz,zlzxr_dh,fjid,zxfj,yysc,sptpid
+    </sql>
+
+    <sql id="Blob_Column_List">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yjzl.TbZlxxZxjl">
+        insert into tb_zlxx_zxjl(id,zl_id,zxsj,zlzxzt,zxnr,zlzxdd_xzqhdm,zlzxdd,jd,wd,zb,zbhash,zlzxr_xzid,
+                          zlzxr_id,zlzxr_xm,zlzxr_sfz,zlzxr_dh,fjid,zxfj,yysc,sptpid,
+                          ssbm, ssbmdm,ssbmid, ssxgaj, ssxgajdm,ssxgajid, sssgaj, sssgajdm,sssgajid,
+                           xt_sjly, xt_sjzt, xt_scbz,
+                          xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                          xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id},#{zlId},#{zxsj},#{zlzxzt},#{zxnr},#{zlzxddXzqhdm},#{zlzxdd},#{jd},#{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash},#{zlzxrXzid},#{zlzxrId},#{zlzxrXm},#{zlzxrSfz},#{zlzxrDh},#{fjid},#{zxfj},#{yysc},#{sptpid},
+                #{ssbm}, #{ssbmdm},#{ssbmid}, #{ssxgaj}, #{ssxgajdm},#{ssxgajid}, #{sssgaj}, #{sssgajdm},#{sssgajid},
+                #{xtSjly}, #{xtSjzt}, #{xtScbz},
+                #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj},
+                #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--查询指令数量-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.zllx != null and dto.zllx != ''">
+            and zllx = #{dto.zllx}
+        </if>
+        <if test="dto.zlly != null and dto.zlly != ''">
+            and zlly = #{dto.zlly}
+        </if>
+
+        <if test="dto.zlbt != null and dto.zlbt != ''">
+            and zlbt like concat('%',#{dto.zlbt},'%')
+        </if>
+        <if test="dto.zlnr != null and dto.zlnr != ''">
+            and zlnr like concat('%',#{dto.zlnr},'%')
+        </if>
+        <if test="dto.zldj != null and dto.zldj != ''">
+            and zldj = #{dto.zldj}
+        </if>
+        <if test="dto.sfcl != null and dto.sfcl != ''">
+            and sfcl = #{dto.sfcl}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and zlrq between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+    </select>
+
+    <!--查询指令列表-->
+    <select id="getListPage" resultMap="tbZlZxjl" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.zllx != null and dto.zllx != ''">
+            and zllx = #{dto.zllx}
+        </if>
+        <if test="dto.zlly != null and dto.zlly != ''">
+            and zlly = #{dto.zlly}
+        </if>
+
+        <if test="dto.zlbt != null and dto.zlbt != ''">
+            and zlbt like concat('%',#{dto.zlbt},'%')
+        </if>
+        <if test="dto.zlnr != null and dto.zlnr != ''">
+            and zlnr like concat('%',#{dto.zlnr},'%')
+        </if>
+        <if test="dto.zldj != null and dto.zldj != ''">
+            and zldj = #{dto.zldj}
+        </if>
+        <if test="dto.sfcl != null and dto.sfcl != ''">
+            and sfcl = #{dto.sfcl}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
+            and zlrq between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        order by zlfssj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <select id="selectInstructCount" resultType="java.util.Map">
+        SELECT count(*) zlzs,
+        (SELECT count(*) zlzs
+        FROM `tb_zlxx`
+        where and xt_sjzt = '1' and xt_scbz = '0'
+        <if test="startTime != null and endTime != null">
+            and zlrq between #{startTime} and #{endTime}
+        </if>
+        ) zlzxs
+        FROM `tb_zlxx`
+        where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="startTime != null and endTime != null">
+            and zlrq between #{startTime} and #{endTime}
+        </if>
+    </select>
+
+
+    <!--根据ID删除-->
+    <update id="deleteZxjl">
+        update tb_zlxx_zxjl set xt_scbz = '1' where id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <!--根据指令ID删除明细-->
+    <delete id="deleteByZlid">
+        delete from tb_zlxx_zxjl where zl_id = #{zlid}
+    </delete>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZlxxZxrMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZlxxZxrMapper.xml
new file mode 100644
index 0000000..46bfe02
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZlxxZxrMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZlxxZxrMapper">
+
+    <!--删除指令执行人信息-->
+    <delete id="deleteByZlid">
+        delete from tb_zlxx_zxr where zl_id = #{zlid}
+    </delete>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbZxzbMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbZxzbMapper.xml
new file mode 100644
index 0000000..c58288e
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbZxzbMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbZxzbMapper">
+
+    <delete id="deleteAll">
+            delete from tb_zxzb where zblx = #{zblx}
+    </delete>
+
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/TbyjzktjMapper.xml b/mosty-yjzl/src/main/resources/mapper/TbyjzktjMapper.xml
new file mode 100644
index 0000000..4e9ab6b
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/TbyjzktjMapper.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yjzl.mapper.TbYjzltjMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mosty.base.model.entity.yjzl.TbZlxx">
+        <id column="id" property="id"/>
+        <result column="yw_id" property="ywId"/>
+        <result column="zllx" property="zllx"/>
+        <result column="zlly" property="zlly"/>
+        <result column="zlzxlx" property="zlzxlx"/>
+        <result column="zlbt" property="zlbt"/>
+        <result column="zlnr" property="zlnr"/>
+        <result column="zlzxqk" property="zlzxqk"/>
+        <result column="zlfqrq" property="zlfqrq"/>
+        <result column="zlfqsj" property="zlfqsj"/>
+        <result column="zldj" property="zldj"/>
+        <result column="zlyxsj" property="zlyxsj"/>
+        <result column="zljsdx" property="zljsdx"/>
+        <result column="qszt" property="qszt"/>
+        <result column="qssj" property="qssj"/>
+        <result column="ddxczt" property="ddxczt"/>
+        <result column="ddxcsj" property="ddxcsj"/>
+        <result column="zlwjzt" property="zlwjzt"/>
+        <result column="zlwjsj" property="zlwjsj"/>
+        <result column="zlwjsm" property="zlwjsm"/>
+        <result column="zlzxzt" property="zlzxzt"/>
+        <result column="jd" property="jd"/>
+        <result column="wd" property="wd"/>
+        <result column="zb" property="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result column="zbhash" property="zbhash"/>
+        <result column="zlfsddxzqh" property="zlfsddxzqh"/>
+        <result column="zlfsdd" property="zlfsdd"/>
+        <result column="zlfqr_id" property="zlfqrId"/>
+        <result column="zlfqr" property="zlfqr"/>
+        <result column="zlfqr_sfzh" property="zlfqrSfzh"/>
+        <result column="zlfqr_dh" property="zlfqrDh"/>
+        <result column="fj_id" property="fjId"/>
+        <result column="zljsrs" property="zljsrs"/>
+        <result column="zltp" property="zltp"/>
+        <result column="ssbm" property="ssbm"/>
+        <result column="ssbmdm" property="ssbmdm"/>
+        <result column="ssbmid" property="ssbmid"/>
+        <result column="ssxgaj" property="ssxgaj"/>
+        <result column="ssxgajdm" property="ssxgajdm"/>
+        <result column="ssxgajid" property="ssxgajid"/>
+        <result column="sssgaj" property="sssgaj"/>
+        <result column="sssgajdm" property="sssgajdm"/>
+        <result column="sssgajid" property="sssgajid"/>
+        <result column="xt_sjly" property="xtSjly"/>
+        <result column="xt_sjzt" property="xtSjzt"/>
+        <result column="xt_scbz" property="xtScbz"/>
+        <result column="xt_cjip" property="xtCjip"/>
+        <result column="xt_cjsj" property="xtCjsj"/>
+        <result column="xt_cjr_id" property="xtCjrId"/>
+        <result column="xt_cjr" property="xtCjr"/>
+        <result column="xt_cjbmdm" property="xtCjbmdm"/>
+        <result column="xt_cjbmmc" property="xtCjbmmc"/>
+        <result column="xt_zhgxip" property="xtZhgxip"/>
+        <result column="xt_zhgxsj" property="xtZhgxsj"/>
+        <result column="xt_zhgxrid" property="xtZhgxrid"/>
+        <result column="xt_zhgxr" property="xtZhgxr"/>
+        <result column="xt_zhgxbmdm" property="xtZhgxbmdm"/>
+        <result column="xt_zhgxbm" property="xtZhgxbm"/>
+        <result column="bz" property="bz"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id
+        , yw_id, zllx, zlly, zlzxlx, zlbt, zlnr, zlzxqk, zlfqrq, zlfqsj, zldj, zlyxsj, zljsdx, qszt, qssj, ddxczt,
+        ddxcsj, zlwjzt, zlwjsj, zlwjsm, zlzxzt, jd, wd, zb, zbhash, zlfsddxzqh, zlfsdd, zlfqr_id, zlfqr, zlfqr_sfzh,
+        zlfqr_dh, fj_id, zljsrs, zltp, ssbm, ssbmdm, ssbmid, ssxgaj, ssxgajdm, ssxgajid, sssgaj, sssgajdm, sssgajid,
+        xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+        xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <select id="rwzttjxx" resultType="com.mosty.base.model.vo.yjzl.TbYjzltjxxVo">
+        select count(1) total,zlwjzt from tb_zlxx c where c.xt_sjzt = '1' and c.xt_scbz = '0' and c.id in (
+            select zl_id from tb_zlxx_zxr a where a.xt_sjzt = '1' and a.xt_scbz = '0'
+                and case
+                when a.zxr_lx = '01' then
+                a.zxr_sfz = #{sfz}
+                when a.zxr_lx = '03' then
+                a.zxr_xzid in (select b.id from mosty_qwgl.tb_qw_xfbb b,mosty_qwgl.tb_qw_jl c where b.id = c.ywid and b.xt_sjzt
+                = '1'
+                and b.xt_scbz = '0' and c.xt_sjzt = '1' and c.xt_scbz = '0' and (b.fzr_sfzh = #{sfz} or c.sfzh = #{sfz}))
+                when a.zxr_lx = '02' then
+                a.ssbmid = #{ssbmid}
+                end
+            )
+            GROUP BY zlwjzt
+    </select>
+
+    <select id="rwphtjxx" resultType="com.mosty.base.model.vo.yjzl.TbYjzltjphVo">
+        select count,ssbmdm,ssbm name,YTotal,NTotal,(IFNULL(YTotal, 0) / (IFNULL(YTotal, 0) + IFNULL(NTotal, 0))) wcl
+        from (
+        select count(1) count,a.ssbmdm,a.ssbm,
+        (select count(1) from tb_zlxx_zxr b ,tb_zlxx d where b.zl_id = d.id
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != jssj">
+            d.zlfqrq &gt;= #{kssj} and zlfqrq &lt;= #{jssj}
+        </if>
+        and a.ssbmdm = b.ssbmdm and b.dqzt in ('92','93')) YTotal,
+        (select count(1) from tb_zlxx_zxr b ,tb_zlxx d where b.zl_id = d.id
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != jssj">
+            d.zlfqrq &gt;= #{kssj} and zlfqrq &lt;= #{jssj}
+        </if>
+        and a.ssbmdm = b.ssbmdm and b.dqzt not in ('92','93')) NTotal
+        from tb_zlxx_zxr a ,tb_zlxx c where a.zl_id = c.id
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != jssj">
+            c.zlfqrq &gt;= #{kssj} and zlfqrq &lt;= #{jssj}
+        </if>
+        group by a.ssbmdm,a.ssbm
+        ) t
+        limit 10
+    </select>
+
+    <select id="zlZqtjxx" resultType="Map" parameterType="map">
+        select IFNULL(count(1),0) count,zllx
+        from tb_zlxx
+        where xt_sjzt = '1'
+        and xt_scbz = '0'
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != ''">
+            and zlfqsj &gt;= #{kssj} and zlfqsj &lt;= #{jssj}
+        </if>
+        <if test="start != null and start != '' and end != null and end != ''">
+            and zlfqrq &gt;= #{start} and zlfqrq &lt;= #{end}
+        </if>
+        group by zllx
+    </select>
+
+    <select id="zlDjtjxx" resultType="com.mosty.base.model.vo.yjzl.TbYzzlDjtjVo" parameterType="map">
+        SELECT count(1) total,
+        zldj
+        FROM tb_zlxx
+        WHERE xt_sjzt = '1'
+        AND xt_scbz = '0'
+        <if test="kssj != null and kssj != '' and jssj != null and jssj != ''">
+            AND zlfqrq &gt;= #{kssj} and zlfqsj &lt;= #{jssj}
+        </if>
+        GROUP BY zldj
+    </select>
+</mapper>
diff --git a/mosty-yjzl/src/main/resources/mapper/YjzlStatisticsMapper.xml b/mosty-yjzl/src/main/resources/mapper/YjzlStatisticsMapper.xml
new file mode 100644
index 0000000..6ace872
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/mapper/YjzlStatisticsMapper.xml
@@ -0,0 +1,1008 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yjzl.mapper.YjzlStatisticsMapper">
+    <select id="clyjlb" resultType="java.util.Map">
+        select * from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        and yj_clcph in
+        (
+        select yj_clcph from (
+        select yj_clcph, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+
+
+<!--        ${useSql}-->
+        group by yj_clcph order by sl desc limit 20
+        ) a
+        )
+    </select>
+
+    <select id="queryBycCphm" resultType="java.util.Map">
+        select a.*, b.yj_clbq from tb_yjxx a left join tb_yjxx_cl b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '2' and a.xt_scbz= '0' and b.xt_scbz= '0'
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and a.yj_clcph = #{dto.hphm}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        order by a.yj_sj desc limit 1
+    </select>
+
+    <select id="queryBycCphmlb" resultType="java.util.Map">
+        select a.*, b.yj_clbq from tb_yjxx a left join tb_yjxx_cl b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '2' and a.xt_scbz= '0' and b.xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and a.yj_clcph = #{dto.hphm}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.bqmc != null and dto.bqmc != ''">
+            and a.yjly_bqmc = #{dto.bqmc}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+
+
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="yqueryBycCphmlb" resultType="java.util.Map">
+        select a.*, b.yj_clbq from tb_yjxx a left join tb_yjxx_cl b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '2' and a.xt_scbz= '0' and b.xt_scbz= '0'
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and a.yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and a.yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and a.yj_clcph = #{dto.hphm}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        <!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="zqueryBycCphmlb" resultType="java.util.Map">
+        select a.*, b.yj_clbq from tb_yjxx a left join tb_yjxx_cl b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '2' and a.xt_scbz= '0' and b.xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.hphm != null and dto.hphm != ''">
+            and a.yj_clcph = #{dto.hphm}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="yjcltj" resultType="java.util.Map">
+        select yj_clcph, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_clcph order by sl desc limit 20
+    </select>
+
+    <select id="yjbqtj" resultType="java.util.Map">
+        select yjly_bqmc as bqmc, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        and yjly_bqmc is not null
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by bqmc order by sl desc
+    </select>
+
+    <select id="yjjbtj" resultType="java.util.Map">
+        select yj_jb as yjjb, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yjjb order by sl desc
+    </select>
+
+    <select id="yyjcltj" resultType="java.util.Map">
+        select yj_clcph, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_clcph order by sl desc limit 20
+    </select>
+
+    <select id="zyjcltj" resultType="java.util.Map">
+        select yj_clcph, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '2' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_clcph order by sl desc limit 20
+    </select>
+
+    <select id="queryBySfzh" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        order by a.yj_sj desc limit 1
+    </select>
+
+    <select id="queryBySfzhlb" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="queryBySfzhlbsc" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        and (a.yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or a.yj_nr
+        like '%遂宁籍飞车抢夺前科人员（刑侦）%' or a.yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="yqueryBySfzhlb" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and a.yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and a.yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="yqueryBySfzhlbsc" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        and (a.yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or a.yj_nr
+        like '%遂宁籍飞车抢夺前科人员（刑侦）%' or a.yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and a.yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and a.yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="zqueryBySfzhlb" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{jssj}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="zqueryBySfzhlbsc" resultType="java.util.Map">
+        select a.*, b.yj_rybq, b.yj_xsd, b.cover_image from tb_yjxx a left join tb_yjxx_ry b on a.id = b.yj_id
+        where a.xt_sjzt = '1' and a.yj_lx = '1' and a.xt_scbz= '0'
+        and (a.yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or a.yj_nr like
+        '%遂宁籍飞车抢夺前科人员（刑侦）%' or a.yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and a.yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and a.yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.sfzh != null and dto.sfzh != ''">
+            and a.yj_rysfzh = #{dto.sfzh}
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and a.ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+        <if test="dto.yjjb != null and dto.yjjb != ''">
+            and a.yj_jb = #{dto.yjjb}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and a.ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by a.yj_sj desc
+    </select>
+
+    <select id="ryyjlb" resultType="java.util.Map">
+        select * from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        and yj_rysfzh in
+        (
+        select yj_rysfzh from (
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+        ) a
+        )
+    </select>
+
+    <select id="yjjbtjRy" resultType="java.util.Map">
+        select yj_jb as yjjb, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yjjb order by sl
+    </select>
+
+    <select id="jbtj" resultType="java.util.Map">
+        select yj_jb as yjjb, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yjjb order by sl desc
+    </select>
+
+    <select id="yjrytj" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="yjrytjsc" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        and (yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or yj_nr like '%遂宁籍飞车抢夺前科人员（刑侦）%'
+        or yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="yyjrytj" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="yyjrytjsc" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        and (yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or yj_nr like '%遂宁籍飞车抢夺前科人员（刑侦）%'
+        or yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.ksny != null and dto.ksny != ''">
+            and yj_fsny >= #{dto.ksny}
+        </if>
+        <if test="dto.jsny != null and dto.jsny != ''">
+            and yj_fsny &lt;= #{dto.jsny}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="zyjrytj" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="zyjrytjsc" resultType="java.util.Map">
+        select yj_rysfzh, count(1) as sl from tb_yjxx
+        where xt_sjzt = '1' and yj_lx = '1' and xt_scbz= '0'
+        and (yj_nr like '%2020年以来扒窃及盗窃电动车人员（刑侦）%' or yj_nr like '%遂宁籍飞车抢夺前科人员（刑侦）%'
+        or yj_nr like '%盗窃非机动车前科人员专业库（刑侦）%')
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        <if test="dto.ssbmid != null and dto.ssbmid != ''">-->
+<!--            and ssbmid = #{dto.ssbmid}-->
+<!--        </if>-->
+<!--        ${useSql}-->
+        group by yj_rysfzh order by sl desc limit 20
+    </select>
+
+    <select id="zbyjbfylb" resultType="java.util.Map">
+        select * from mosty_yjzl.tb_yjxx
+        where xt_sjzt='1' and xt_scbz='0' and yj_lx = '1'
+        <if test="dto.rysfzh != null and dto.rysfzh != ''">
+            and yj_rysfzh like concat('%',#{dto.rysfzh},'%')
+        </if>
+        <if test="dto.yjlx != null and dto.yjlx == 1">
+            and yj_lx = '1'
+        </if>
+        <if test="dto.yjlx != null and dto.yjlx == 2">
+            and yj_lx = '2'
+        </if>
+        <if test="dto.yjlx != null and dto.yjlx == 3">
+            and yjbq = '8'
+        </if>
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        order by yj_sj desc
+    </select>
+
+    <select id="zbyjtj" resultType="java.util.Map">
+        select a.sl as ryyj,b.sl as clyj,c.sl as swsl from
+        (
+        select count(1) as sl from mosty_yjzl.tb_yjxx
+        where xt_sjzt='1' and xt_scbz='0' and yj_lx = '1'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        ) a,
+        (
+        select count(1) as sl from mosty_yjzl.tb_yjxx
+        where xt_sjzt='1' and xt_scbz='0' and yj_lx = '2'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        ) b,
+        (
+        select count(1) as sl from mosty_yjzl.tb_yjxx
+        where xt_sjzt='1' and xt_scbz='0' and yj_lx = '1'
+        and yjbq = '8'
+        <if test="dto.kssj != null and dto.kssj != ''">
+            and yj_sj >= #{dto.kssj}
+        </if>
+        <if test="dto.jssj != null and dto.jssj != ''">
+            and yj_sj &lt;= #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        ) c
+    </select>
+
+    <select id="gzyyjpm" resultType="java.util.Map">
+        select count(1) total ,yj_gzymc from tb_yjxx
+        where yj_gzymc is not null and yj_gzymc != '未知'
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and yj_fsrq between #{dto.kssj} and #{dto.jssj}
+        </if>
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_gzymc order by count(1) DESC LIMIT 0,10
+    </select>
+
+    <select id="pcsyjpm" resultType="java.util.Map">
+        select count(1) total ,ssbmdm,ssbm from tb_yjxx where ssbm is not null and ssbmdm is not null
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and yj_fsrq between #{dto.kssj} and #{dto.jssj}
+        </if>
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY ssbmdm,ssbm order by count(1) DESC LIMIT 0,10
+    </select>
+
+    <select id="ryyjpm" resultType="java.util.Map">
+        select yj_rysfzh,yj_ryxm,count(1) total from tb_yjxx
+        where yj_rysfzh is not null and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.kssj != null and dto.kssj != '' and dto.jssj != null and dto.jssj != ''">
+            and yj_fsrq between #{dto.kssj} and #{dto.jssj}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_rysfzh,yj_ryxm order by count(1) DESC LIMIT 0,20
+    </select>
+
+    <select id="ycyjtj" resultType="java.util.Map">
+        SELECT
+        IFNULL( sum( quantity ), 0 ) total,
+        "total" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE
+        xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.startDate!=null and dto.startDate!=''">
+            and yj_fssj >= #{dto.startDate}
+        </if>
+        <if test="dto.endDate!=null and dto.endDate!=''">
+            and yj_fssj &lt;= #{dto.endDate}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_lx ) s
+        union
+        SELECT
+        IFNULL( sum( quantity ), 0 ) total,
+        "personnel" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.startDate!=null and dto.startDate!=''">
+            and yj_fssj >= #{dto.startDate}
+        </if>
+        <if test="dto.endDate!=null and dto.endDate!=''">
+            and yj_fssj &lt;= #{dto.endDate}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx IN ( '1', '3', '4' )
+        union
+        SELECT
+        IFNULL( sum( quantity ), 0 ) total,
+        "car" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.startDate!=null and dto.startDate!=''">
+            and yj_fssj >= #{dto.startDate}
+        </if>
+        <if test="dto.endDate!=null and dto.endDate!=''">
+            and yj_fssj &lt;= #{dto.endDate}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx IN ( '2', '4' )
+        union
+        SELECT
+        IFNULL( sum( quantity ), 0 ) total,
+        "event" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.startDate!=null and dto.startDate!=''">
+            and yj_fssj >= #{dto.startDate}
+        </if>
+        <if test="dto.endDate!=null and dto.endDate!=''">
+            and yj_fssj &lt;= #{dto.endDate}
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and  ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+<!--        ${useSql}-->
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx = '5'
+    </select>
+
+    <select id="yjtj" resultType="java.util.Map">
+        SELECT IFNULL(sum(quantity), 0) total,
+        "today" date,
+        "personnel" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE TO_DAYS( yj_fsrq ) = TO_DAYS( now()) and
+        xt_scbz = '0' and xt_sjzt = '1'
+
+
+
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx IN ( '1'
+        , '3'
+        , '4' )
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "yesterday" date,
+        "personnel" type
+        FROM
+        (
+        SELECT
+        count( 1 ) quantity,
+        yj_lx
+        FROM
+        tb_yjxx
+        WHERE
+        TO_DAYS( yj_fsrq ) = TO_DAYS(
+        date_sub( now(), INTERVAL 1 DAY ))
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <!--                        ${useSql}-->
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY
+        yj_lx
+        ) s
+        WHERE
+        yj_lx IN ( '1'
+        , '3'
+        , '4' )
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "today" date,
+        "car" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE TO_DAYS( yj_fsrq ) = TO_DAYS( now())
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx IN ( '2'
+        , '4' )
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "yesterday" date,
+        "car" type
+        FROM
+        (
+        SELECT
+        count( 1 ) quantity,
+        yj_lx
+        FROM
+        tb_yjxx
+        WHERE
+        TO_DAYS( yj_fsrq ) = TO_DAYS(
+        date_sub( now(), INTERVAL 1 DAY ))
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <!--                        ${useSql}-->
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY
+        yj_lx
+        ) s
+        WHERE
+        yj_lx IN ( '2'
+        , '4' )
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "today" date,
+        "event" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE TO_DAYS( yj_fsrq ) = TO_DAYS( now())
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+        GROUP BY yj_lx ) s
+        WHERE
+        yj_lx = '5'
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "yesterday" date,
+        "event" type
+        FROM
+        (
+        SELECT
+        count( 1 ) quantity,
+        yj_lx
+        FROM
+        tb_yjxx
+        WHERE
+        TO_DAYS( yj_fsrq ) = TO_DAYS(
+        date_sub( now(), INTERVAL 1 DAY ))
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <!--                        ${useSql}-->
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY
+        yj_lx
+        ) s
+        WHERE
+        yj_lx = '5'
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "today" date,
+        "total" type
+        FROM
+        ( SELECT count( 1 ) quantity, yj_lx FROM tb_yjxx WHERE TO_DAYS( yj_fsrq ) = TO_DAYS( now())
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY yj_lx ) s
+        UNION
+        SELECT IFNULL(sum(quantity), 0) total,
+        "yesterday" date,
+        "total" type
+        FROM
+        (
+        SELECT
+        count( 1 ) quantity,
+        yj_lx
+        FROM
+        tb_yjxx
+        WHERE
+        TO_DAYS( yj_fsrq ) = TO_DAYS(
+        date_sub( now(), INTERVAL 1 DAY ))
+        and xt_scbz = '0' and xt_sjzt = '1'
+        <!--                        ${useSql}-->
+        <if test="ssbmdm != null and ssbmdm != ''">
+            and ssbmdm like concat(#{ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        GROUP BY
+        yj_lx
+        ) s
+    </select>
+
+    <select id="getYjsl" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_yjxx where yj_fsrq &lt;= #{jssj} and yj_fsrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj, ssxgajid
+    </select>
+
+    <select id="getZls" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="getZxs" resultType="java.util.Map">
+        select count(1) count,ssxgaj,ssxgajid from tb_zlxx where zlfqrq &lt;= #{jssj} and zlfqrq >= #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        and zlwjzt = '92' or zlwjzt = '93'
+        group by ssxgaj,ssxgajid
+    </select>
+
+    <select id="getJqTj" resultType="java.util.Map">
+        select count(1) count,jqfsksxs time from mosty_sjzx.tb_jq where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') = #{kssj}
+        group by jqfsksxs order by jqfsksxs
+    </select>
+
+<!-- =================================================================================================================================-->
+    <select id="getYjsl1" resultType="java.util.Map">
+        select count(1) count,date_format(yj_fssj,'%H') time from tb_yjxx where yj_fssj = #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by date_format(yj_fssj,'%H') order by date_format(yj_fssj,'%H')
+    </select>
+
+    <select id="getZls1" resultType="java.util.Map">
+        select count(1) count,date_format(zlfqsj,'%H') time from tb_zlxx where xt_sjzt = '1' and xt_scbz = '0'
+        and zlfqsj = #{kssj}
+        group by date_format(zlfqsj,'%H') order by date_format(zlfqsj,'%H')
+    </select>
+
+    <select id="getZxs1" resultType="java.util.Map">
+        select count(1) count,date_format(zlfqsj,'%H') time from tb_zlxx where zlfqsj = #{kssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        and zlwjzt = '92' or zlwjzt = '93'
+        group by date_format(zlfqsj,'%H') order by date_format(zlfqsj,'%H')
+    </select>
+
+    <select id="getJqTjByTime" resultType="java.util.Map">
+        select count(1) count,bjrq time from mosty_sjzx.tb_jq  where xt_sjzt = '1' and xt_scbz = '0'
+        and bjxl in ("01110200", "01110300", "01120300", "01120400", "01120700", "01120800", "01121000","01130100",
+                     "01140100", "01149900", "02030200", "02030300", "02030400", "02030500", "02040100", "02050100",
+                     "02050400","02121700", "02130000")
+        and date_format(bjrq,'%Y-%m-%d') >= #{kssj} and date_format(bjrq,'%Y-%m-%d') &lt;= #{jssj}
+        group by bjrq order by bjrq
+    </select>
+
+    <select id="getYjslByTime" resultType="java.util.Map">
+        select count(1) count,yj_fsrq time from tb_yjxx where date_format(yj_fsrq,'%Y-%m-%d') >= #{kssj} and date_format(yj_fsrq,'%Y-%m-%d') &lt;= #{jssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by yj_fsrq order by yj_fsrq
+    </select>
+
+    <select id="getZlsByTime" resultType="java.util.Map">
+        select count(1) count,zlfqrq time from tb_zlxx where date_format(zlfqrq,'%Y-%m-%d') >= #{kssj} and date_format(zlfqrq,'%Y-%m-%d') &lt;= #{jssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        group by zlfqrq order by zlfqrq
+    </select>
+
+    <select id="getZxsByTime" resultType="java.util.Map">
+        select count(1) count,zlfqrq time from tb_zlxx where date_format(zlfqrq,'%Y-%m-%d') >= #{kssj} and date_format(zlfqrq,'%Y-%m-%d') &lt;= #{jssj}
+        and xt_sjzt = '1' and xt_scbz = '0'
+        and zlwjzt = '92' or zlwjzt = '93'
+        group by zlfqrq order by zlfqrq
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-yjzl/src/main/resources/rebel.xml b/mosty-yjzl/src/main/resources/rebel.xml
new file mode 100644
index 0000000..2d40292
--- /dev/null
+++ b/mosty-yjzl/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-yjzl</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-yjzl/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/mosty-yszx/mosty-yszx.iml b/mosty-yszx/mosty-yszx.iml
new file mode 100644
index 0000000..09c9f35
--- /dev/null
+++ b/mosty-yszx/mosty-yszx.iml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1721024353927" />
+          </map>
+        </option>
+        <option name="version" value="2" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.12.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.6" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.3.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:29.0-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.vividsolutions:jts:1.13" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-magic-api-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-base-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.3" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.14" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.caspar-chen:swagger-ui-layer:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.20" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-spring-boot-starter:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-script:1.8.5" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-editor:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ssssssss:magic-api-plugin-swagger:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-token-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:transmittable-thread-local:2.11.5" level="project" />
+    <orderEntry type="library" name="Maven: com.auth0:java-jwt:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-redis-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="module" module-name="mosty-base-feign-sdk" />
+    <orderEntry type="library" name="Maven: com.netflix.feign:feign-slf4j:8.14.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.feign:feign-core:8.14.4" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-core-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:common-config-starter:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.11" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.2.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.30" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.github.penggle:kaptcha:2.3.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.6" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.mosty:operation-log-aspect-starter:1.0.0-SNAPSHOT" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/mosty-yszx/pom.xml b/mosty-yszx/pom.xml
new file mode 100644
index 0000000..9b0d71a
--- /dev/null
+++ b/mosty-yszx/pom.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>mosty-dyga-cloud</artifactId>
+        <groupId>com.mosty</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mosty-yszx</artifactId>
+    <description>要素中心</description>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.0.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vividsolutions</groupId>
+            <artifactId>jts</artifactId>
+            <version>1.13</version>
+        </dependency>
+
+        <!--magicAPI-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-magic-api-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--登录jar包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-token-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--redis包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>common-redis-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--base-feign-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>mosty-base-feign-sdk</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <!--日志包-->
+        <dependency>
+            <groupId>com.mosty</groupId>
+            <artifactId>operation-log-aspect-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.geotools</groupId>-->
+<!--            <artifactId>gt-shapefile</artifactId>-->
+<!--            <version>24-SNAPSHOT</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.geotools</groupId>-->
+<!--            <artifactId>gt-swing</artifactId>-->
+<!--            <version>24-SNAPSHOT</version>-->
+<!--        </dependency>-->
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- 这个插件，可以将应用打包成一个可执行的jar包；-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/MostyYszxApplication.java b/mosty-yszx/src/main/java/com/mosty/yszx/MostyYszxApplication.java
new file mode 100644
index 0000000..2bc736d
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/MostyYszxApplication.java
@@ -0,0 +1,29 @@
+package com.mosty.yszx;
+
+import com.mosty.common.base.timeconsume.EnableTimeConsume;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ *	要素中心 微服务
+ * @author zengbo
+ * @date 2022/7/11 19:43 PM[
+ * @since 1.0.0
+ */
+@EnableTimeConsume
+//@ComponentScan("com.mosty")
+@EnableFeignClients(basePackages = "com.mosty.base.feign.service")
+@MapperScan("com.mosty.yszx.mapper")
+@EnableDiscoveryClient
+@SpringBootApplication
+public class MostyYszxApplication {
+
+	public static void main(String[] args) {
+
+		SpringApplication.run(MostyYszxApplication.class, args);
+	}
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/config/FeignConfig.java b/mosty-yszx/src/main/java/com/mosty/yszx/config/FeignConfig.java
new file mode 100644
index 0000000..5527b02
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/config/FeignConfig.java
@@ -0,0 +1,23 @@
+package com.mosty.yszx.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attr != null) {
+            HttpServletRequest request = attr.getRequest();
+            // 添加token
+            requestTemplate.header("Authorization", request.getHeader("Authorization"));
+        }
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/config/GlobalYmlConfig.java b/mosty-yszx/src/main/java/com/mosty/yszx/config/GlobalYmlConfig.java
new file mode 100644
index 0000000..2ed0746
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/config/GlobalYmlConfig.java
@@ -0,0 +1,25 @@
+package com.mosty.yszx.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ *  全局配置
+ * @author kevin
+ * @date 2022/5/25 1:56 上午
+ * @since 1.0.0
+ */
+@Data
+@Configuration
+@ConfigurationProperties("exclude.path-patterns")
+public class GlobalYmlConfig {
+
+    /**
+     * swagger 静态文件的放行列表
+     */
+    private List<String> swagger;
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/config/WebMvcConfig.java b/mosty-yszx/src/main/java/com/mosty/yszx/config/WebMvcConfig.java
new file mode 100644
index 0000000..1ca34d7
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/config/WebMvcConfig.java
@@ -0,0 +1,120 @@
+package com.mosty.yszx.config;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.mosty.common.token.SysUserInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ *  单体服务拦截器
+ * @author kevin
+ * @date 2022/3/21 11:17 PM
+ * @since 1.0.0
+ */
+@Configuration
+@Slf4j
+public class WebMvcConfig implements WebMvcConfigurer, InitializingBean {
+
+    private static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+    private static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    private static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    @Value("${server.servlet.context-path:/}")
+    private String contextPath;
+
+    @Autowired
+    private GlobalYmlConfig globalYmlConfig;
+
+    @Override
+    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = converter.getObjectMapper();
+        // 生成JSON时,将所有Long转换成String
+        SimpleModule simpleModule = new SimpleModule();
+        //日期格式化
+        simpleModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        simpleModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        simpleModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(simpleModule);
+        // 时间格式化
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN, true);
+        objectMapper.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, true);
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 设置格式化内容
+        converter.setObjectMapper(objectMapper);
+        converters.add(0, converter);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        log.info("当前服务的 contextPath={}", contextPath);
+        log.info("当前服务的 swaggerExcludePathPatterns={}", JSON.toJSONString(globalYmlConfig.getSwagger()));
+    }
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(userInfoInterceptor()).addPathPatterns("/**")
+                .excludePathPatterns(globalYmlConfig.getSwagger());
+        log.info("初始化WebMvcConfig 监控拦截器SysUserInterceptor");
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        if (!registry.hasMappingForPattern("/template/**")) {
+            registry.addResourceHandler("/template/**").addResourceLocations("classpath:/template/");
+        }
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("docs.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
+
+    @Bean
+    public SysUserInterceptor userInfoInterceptor() {
+        log.info("初始化WebMvcConfig 拦截器SysUserInterceptor");
+        return new SysUserInterceptor();
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsAjController.java b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsAjController.java
new file mode 100644
index 0000000..58bec54
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsAjController.java
@@ -0,0 +1,96 @@
+package com.mosty.yszx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.yszx.TbYsAjDelDto;
+import com.mosty.base.model.dto.yszx.TbYsAjDto;
+import com.mosty.base.model.query.yszx.TbYsAjNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsAjQuery;
+import com.mosty.base.model.vo.yszx.TbYsAjVo;
+import com.mosty.yszx.service.TbYsAjService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素中心-案件接口
+ **/
+@Api(tags = "要素中心-案件接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbYsAj")
+public class TbYsAjController {
+
+    private final TbYsAjService tbYsAjService;
+
+    @ApiOperation("案件新增")
+    @JwtSysUser
+    @Log(title = "案件新增", businessType = BusinessType.INSERT)
+    @PostMapping("addAj")
+    public ResponseResult<Void> addAj(@RequestBody TbYsAjDto dto) {
+        this.tbYsAjService.addAj(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("案件修改")
+    @JwtSysUser
+    @Log(title = "案件修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updateAj")
+    public ResponseResult<Void> updateAj(@RequestBody TbYsAjDto dto) {
+        this.tbYsAjService.updateAj(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("案件查询-分页")
+    @JwtSysUser
+    @GetMapping("getPageList")
+    public ResponseResult<IPage<TbYsAjVo>> getPageList(TbYsAjQuery dto) {
+        return ResponseResult.success(this.tbYsAjService.getPageList(dto));
+    }
+
+    @ApiOperation("案件查询-不分页")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<List<TbYsAjVo>> getList(TbYsAjNoPageQuery dto) {
+        return ResponseResult.success(this.tbYsAjService.getList(dto));
+    }
+
+    @ApiOperation("删除案件信息")
+    @JwtSysUser
+    @DeleteMapping("delAj")
+    public ResponseResult<Void> delAj(TbYsAjDelDto dto) {
+        this.tbYsAjService.delAj(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("获取案件信息的数据--热力图")
+    @JwtSysUser
+    @GetMapping("getAjHotMap")
+    public ResponseResult<List<Map<String,Object>>> getAjHotMap(TbYsAjNoPageQuery dto) {
+        return ResponseResult.success(this.tbYsAjService.getAjHotMap(dto));
+    }
+
+    @ApiOperation("查询案件案件详情")
+    @JwtSysUser
+    @GetMapping("getInfo")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "ID", required = true),
+            @ApiImplicitParam(name = "ajfl", value = "--D_BB_AJLB（案件类别）案件分类：1-刑事案件，2-行政案件", required = true)
+    })
+    public ResponseResult<TbYsAjVo> getInfo(String id, String ajfl) {
+        return ResponseResult.success(this.tbYsAjService.getInfo(id, ajfl));
+    }
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsDlController.java b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsDlController.java
new file mode 100644
index 0000000..db331e6
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsDlController.java
@@ -0,0 +1,95 @@
+package com.mosty.yszx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.base.model.vo.yszx.TbYsDlVo;
+import com.mosty.common.base.domain.BaseController;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.vo.yszx.TbYsDlDto;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import com.mosty.yszx.service.TbYsDlService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素中心-地理要素
+ **/
+@Api(tags = "要素中心-地理要素")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbYsDl")
+public class TbYsDlController extends BaseController {
+
+    @Resource
+    private TbYsDlService tbYsDlService;
+
+    @RequestMapping(value = "/selectGeography", method = {RequestMethod.GET, RequestMethod.POST})
+    @ApiOperation(value = "大屏-地图-地理要素(社会资源),pageNum参数不传则查询所有数据")
+    @JwtSysUser
+    public ResponseResult<IPage<TbYsDlVo>> queryAll(@RequestBody TbYsDlQuery dto) {
+        return ResponseResult.success(this.tbYsDlService.queryAll(dto));
+    }
+
+    @GetMapping("/selectByNr")
+    @ApiOperation(value = "根据关键字查询地理要素")
+    @JwtSysUser
+    public ResponseResult<List<TbYsDlVo>> selectByNr(@RequestParam("keyword") String keyword) {
+        return ResponseResult.success(this.tbYsDlService.selectByNr(keyword));
+    }
+
+    @ApiOperation(value = "通过主键查询单条数据")
+    @GetMapping("{id}")
+    public ResponseResult<TbYsDlVo> queryById(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbYsDlService.queryById(id));
+    }
+
+    @ApiOperation(value = "新增地理要素数据")
+    @PostMapping
+    public ResponseResult<Void> add(@RequestBody TbYsDlDto dto) {
+        this.tbYsDlService.insert(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation(value = "编辑地理要素数据")
+    @PutMapping
+    @Log(title = "编辑地理要素数据", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> edit(@RequestBody TbYsDlDto dto) {
+        this.tbYsDlService.update(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation(value = "删除")
+    @DeleteMapping("{id}")
+    @Log(title = "删除地理要素数据", businessType = BusinessType.INSERT)
+    public ResponseResult<Void> deleteById(@PathVariable("id") String id) {
+        this.tbYsDlService.deleteById(id);
+        return ResponseResult.success();
+    }
+
+    @PostMapping("/selectVideoServo")
+    @ApiOperation(value = "大屏-巡组气泡框-视频随动")
+    @JwtSysUser
+    public ResponseResult<List<TbYsDl>> selectVideoServo(@RequestBody TbYsDl tbYsDl) {
+        return ResponseResult.success(this.tbYsDlService.selectVideoServo(tbYsDl));
+    }
+
+    @GetMapping("/selectDlys")
+    @ApiOperation(value = "根据名称查询地理要素")
+    @JwtSysUser
+    public ResponseResult<TbYsDl> selectDlys(@RequestParam String ysmc) {
+        return ResponseResult.success(this.tbYsDlService.selectDlys(ysmc));
+    }
+}
+
+
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsGajgController.java b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsGajgController.java
new file mode 100644
index 0000000..a37d172
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsGajgController.java
@@ -0,0 +1,132 @@
+package com.mosty.yszx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.TbYsGajgAndGlbmDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgByJwdDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgGlbmDto;
+import com.mosty.base.model.vo.yszx.TbYsGajgGlbmVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.core.business.entity.vo.Base64Str;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yszx.service.TbYsGajgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素中心--公安机关要素
+ **/
+@Api(tags = "要素中心--公安机关要素")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbYsGajg")
+public class TbYsGajgController {
+
+    private final TbYsGajgService tbYsGajgService;
+
+    @ApiOperation("公安机关要素新增")
+    @JwtSysUser
+    @Log(title = "公安机关要素新增", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public ResponseResult<Integer> insertEntity(@RequestBody TbYsGajgDto dto) {
+        return ResponseResult.success(this.tbYsGajgService.insertEntity(dto));
+    }
+
+    @ApiOperation("公安机关要素新增--添加关联部门")
+    @JwtSysUser
+    @Log(title = "公安机关要素新增--添加关联部门", businessType = BusinessType.INSERT)
+    @PostMapping("addGajg")
+    public ResponseResult<Integer> addGajg(@RequestBody TbYsGajgAndGlbmDto dto) {
+        return ResponseResult.success(this.tbYsGajgService.addGajg(dto));
+    }
+
+    @ApiOperation("公安机关要素修改--修改关联部门")
+    @JwtSysUser
+    @Log(title = "公安机关要素修改--修改关联部门", businessType = BusinessType.INSERT)
+    @PostMapping("editGajg")
+    public ResponseResult<Void> editGajg(@RequestBody TbYsGajgAndGlbmDto dto) {
+        this.tbYsGajgService.editGajg(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("公安机关要素修改")
+    @JwtSysUser
+    @Log(title = "公安机关要素修改", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResponseResult<Void> updateEntity(@RequestBody TbYsGajgDto dto) {
+        this.tbYsGajgService.updateEntity(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据来源id 和来源表名修改 公安机关要素")
+    @JwtSysUser
+    @Log(title = "根据来源id 和来源表名 修改 公安机关要素", businessType = BusinessType.UPDATE)
+    @PutMapping("update")
+    public ResponseResult<Void> updateEntityByLY(@RequestBody TbYsGajgDto dto) {
+        this.tbYsGajgService.updateEntityByLY(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("公安机关要素详情查询")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbYsGajgVo> getInfo(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbYsGajgService.getInfo(id));
+    }
+
+    @ApiOperation("公安机关要素查询列表，pageNum参数不传查询所有列表")
+    @JwtSysUser
+    @PostMapping("getList")
+    public ResponseResult<IPage<TbYsGajgVo>> getPageList(@RequestBody TbYsGajgQuery dto) {
+        return ResponseResult.success(this.tbYsGajgService.getPageList(dto));
+    }
+
+    @ApiOperation("查询公安机关列表（包含关联部门ID）")
+    @JwtSysUser
+    @PostMapping("getGajgList")
+    public ResponseResult<List<TbYsGajgGlbmVo>> getGajgList(@RequestBody TbYsGajgQuery dto) {
+        return ResponseResult.success(this.tbYsGajgService.getGajgList(dto));
+    }
+
+    @ApiOperation("删除公安机关要素")
+    @JwtSysUser
+    @DeleteMapping("{id}")
+    public ResponseResult<Void> delEntity(@PathVariable("id") String id) {
+        this.tbYsGajgService.delEntity(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据来源id 和来源表名 删除公安机关要素")
+    @JwtSysUser
+    @Log(title = "根据来源id 和来源表名 删除公安机关要素", businessType = BusinessType.DELETE)
+    @DeleteMapping
+    public ResponseResult<Void> delEntity(@RequestBody TbYsGajgDto dto) {
+        this.tbYsGajgService.delEntity(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("根据经纬度判断所属公安机关")
+    @JwtSysUser
+    @PostMapping("getGajgByJwd")
+    public ResponseResult<TbYsGajgVo> getGajgByJwd(@RequestBody TbYsGajgByJwdDto dto) {
+        return ResponseResult.success(this.tbYsGajgService.getGajgByJwd(dto));
+    }
+
+    @ApiOperation("查询关联部门")
+    @JwtSysUser
+    @PostMapping("getGlbmList/{id}")
+    public ResponseResult<List<TbYsGajgGlbmDto>> getGlbmList(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbYsGajgService.getGlbmList(id));
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsRyController.java b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsRyController.java
new file mode 100644
index 0000000..6445d48
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsRyController.java
@@ -0,0 +1,77 @@
+package com.mosty.yszx.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.TbYsAjDelDto;
+import com.mosty.base.model.dto.yszx.TbYsAjDto;
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.entity.yszx.TbYsRy;
+import com.mosty.base.model.query.yszx.TbYsAjNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsAjQuery;
+import com.mosty.base.model.vo.yszx.*;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.yszx.service.TbYsAjService;
+import com.mosty.yszx.service.TbYsRyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/11/28
+ * 要素中心-人员要素接口
+ **/
+@Api(tags = "要素中心-人员要素接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbYsRy")
+public class TbYsRyController {
+
+    private final TbYsRyService tbYsRyService;
+
+    @ApiOperation("查询人员详情")
+    @JwtSysUser
+    @GetMapping("getRyInfo")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sfzh", value = "身份证号", required = true)
+    })
+    public ResponseResult<TbYsRyVo> getRyInfo(String sfzh) {
+        return ResponseResult.success(this.tbYsRyService.getRyInfo(sfzh));
+    }
+
+    @ApiOperation("添加人员要素")
+    @PostMapping("addRyYs")
+    public ResponseResult<TbYsRyVo> addRyYs(@RequestBody TbYsRyDto dto) {
+        this.tbYsRyService.addRyYs(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改人员要素")
+    @PostMapping("updateRyYs")
+    public ResponseResult<TbYsRyVo> updateRyYs(@RequestBody TbYsRyDto dto) {
+        this.tbYsRyService.updateRyYs(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改人员标签要素")
+    @PostMapping("updateRyBqYs")
+    public ResponseResult<Void> updateRyBqYs(@RequestBody TbYsRyBqUpdateDto dto) {
+        this.tbYsRyService.updateRyBqYs(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("修改人员电话要素")
+    @PostMapping("updateRyDhys")
+    public ResponseResult<Void> updateRyDhys(@RequestBody TbYsRyDhUpdateDto dto) {
+        this.tbYsRyService.updateRyDhys(dto);
+        return ResponseResult.success();
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsSxtController.java b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsSxtController.java
new file mode 100644
index 0000000..79d127d
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/controller/TbYsSxtController.java
@@ -0,0 +1,221 @@
+package com.mosty.yszx.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.utils.CameraPreviewUtil;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.entity.log.BusinessType;
+import com.mosty.common.base.entity.log.Log;
+import com.mosty.common.token.JwtSysUser;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.yszx.TbYsSxt;
+import com.mosty.base.model.query.yszx.TbYsSxtNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtQuery;
+import com.mosty.yszx.service.TbYsSxtService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/18
+ * 要素中心-摄像头接口
+ **/
+@Api(tags = "要素中心-摄像头接口")
+@RestController
+@AllArgsConstructor
+@RequestMapping("/tbYsSxt")
+    public class TbYsSxtController {
+
+    private final TbYsSxtService tbYsSxtService;
+
+    @ApiOperation("摄像头新增")
+    @Log(title = "摄像头新增", businessType = BusinessType.INSERT)
+    @PostMapping("add")
+    public ResponseResult<Integer> insertEntity(@RequestBody TbYsSxtDto dto) {
+        return ResponseResult.success(this.tbYsSxtService.insertEntity(dto));
+    }
+
+    @ApiOperation("摄像头修改")
+    @JwtSysUser
+    @Log(title = "摄像头修改", businessType = BusinessType.UPDATE)
+    @PutMapping("update")
+    public ResponseResult<Void> updateEntity(@RequestBody TbYsSxtDto dto) {
+        this.tbYsSxtService.updateEntity(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询摄像头列表--分页")
+    @JwtSysUser
+    @GetMapping("getPageList")
+    public ResponseResult<IPage<TbYsSxt>> getPageList(TbYsSxtQuery dto) {
+        return ResponseResult.success(this.tbYsSxtService.getPageList(dto));
+    }
+
+    @ApiOperation("查询摄像头列表--不分页")
+    @JwtSysUser
+    @GetMapping("getList")
+    public ResponseResult<List<TbYsSxt>> getList(TbYsSxtNoPageQuery dto) {
+        return ResponseResult.success(this.tbYsSxtService.getList(dto));
+    }
+
+    @ApiOperation("查询摄像头详情")
+    @JwtSysUser
+    @GetMapping("{id}")
+    public ResponseResult<TbYsSxt> getList(@PathVariable("id") String id) {
+        return ResponseResult.success(this.tbYsSxtService.getInfo(id));
+    }
+
+    @ApiOperation("根据设备编号查询摄像头详情")
+    @JwtSysUser
+    @GetMapping("getInfoBySbbh/{sbbh}")
+    public ResponseResult<TbYsSxtDto> getInfoBySbbh(@PathVariable("sbbh") String sbbh) {
+        return ResponseResult.success(this.tbYsSxtService.getInfoBySbbh(sbbh));
+    }
+
+    @ApiOperation("删除摄像头信息")
+    @JwtSysUser
+    @DeleteMapping("{id}")
+    public ResponseResult<TbYsSxt> delEntity(@PathVariable("id") String id) {
+        this.tbYsSxtService.delEntity(id);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询摄像头-事件中心")
+    @JwtSysUser
+    @Log(title = "查询摄像头-事件中心", businessType = BusinessType.OTHER)
+    @GetMapping("getSjList")
+    public ResponseResult<List<TbYsSxt>> getSjList(String jd, String wd, String sjid) {
+        return ResponseResult.success(this.tbYsSxtService.getSjList(jd, wd, sjid));
+    }
+
+    @ApiOperation("获取所有的感知源的设备编号")
+    @JwtSysUser
+    @PostMapping("getSxtBhList")
+    public ResponseResult<List<String>> getSxtBhList(@RequestBody List<String> ids) {
+        return ResponseResult.success(this.tbYsSxtService.getSxtBhList(ids));
+    }
+
+    @ApiOperation("添加泸州感知源数据")
+    @JwtSysUser
+    @PostMapping("addLzGzy")
+    public ResponseResult<Void> addLzGzy(@RequestBody ZhjmxfXfqwXfqyGzdw dto) {
+        this.tbYsSxtService.addLzGzy(dto);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("查询感知源信息")
+    @JwtSysUser
+    @PostMapping("selectGzy")
+    public ResponseResult<TbYsSxtDto> selectGzy(@RequestBody TbYsSxtPageOneQuery dto) {
+        return ResponseResult.success(this.tbYsSxtService.selectGzy(dto));
+    }
+
+    @ApiOperation("摄像头更新经纬度")
+    @JwtSysUser
+    @GetMapping("updateJwd")
+    public ResponseResult<Void> updateJwd() {
+        this.tbYsSxtService.updateJwd();
+        return ResponseResult.success();
+    }
+
+
+
+    @ApiOperation("更新泸州感知源数据")
+    @Log(title = "更新泸州感知源数据", businessType = BusinessType.OTHER)
+    @GetMapping("updateLzGzy")
+    @JwtSysUser
+    public ResponseResult<String> updateLzGzy() {
+        this.tbYsSxtService.updateLzGzy();
+        return ResponseResult.success();
+    }
+
+
+    @ApiOperation("获取HLS地址")
+    @Log(title = "查询HLS地址", businessType = BusinessType.OTHER)
+    @GetMapping("previewURLs")
+    @JwtSysUser
+    @ApiImplicitParams({@ApiImplicitParam(name = "sbbh", value = "设备编号", dataType = "String"),
+            @ApiImplicitParam(name = "protocol", value = "协议类型( 0-udp，1-tcp),默认为tcp，在protocol设置为rtsp或者rtmp时有效", dataType = "String"),
+    })
+    public ResponseResult<String> previewURLs(String sbbh,String protocol) {
+        if(StringUtils.isBlank(protocol)){
+            protocol = "hls";
+        }
+        String getCamsApi = "/api/video/v1/cameras/previewURLs";
+        String result = "";
+        JSONObject jsonBody = new JSONObject();
+        jsonBody.put("cameraIndexCode", sbbh);
+        jsonBody.put("streamType", 0);
+        jsonBody.put("protocol", protocol);
+        jsonBody.put("transmode", 0);
+        jsonBody.put("expand", "transcode=0");
+        result = CameraPreviewUtil.getCameraPreviewURL(getCamsApi, jsonBody);
+        return ResponseResult.success(result);
+    }
+
+
+    @ApiOperation("获取监控点回放取流URL")
+    @Log(title = "获取监控点回放取流URL", businessType = BusinessType.OTHER)
+    @PatchMapping("playbackURLs")
+    @JwtSysUser
+    @ApiImplicitParams({@ApiImplicitParam(name = "sbbh", value = "设备编号", dataType = "String"),
+            @ApiImplicitParam(name = "beginTime", value = "开始查询时间（ISO8601格式yyyy-MM-dd'T'HH:mm:ss.SSSzzz，和结束时间相差不超过三天）", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束查询时间（ISO8601格式yyyy-MM-dd'T'HH:mm:ss.SSSzzz，和开始时间相差不超过三天）", dataType = "String"),
+            @ApiImplicitParam(name = "protocol", value = "协议类型( 0-udp，1-tcp),默认为tcp，在protocol设置为rtsp或者rtmp时有效", dataType = "String"),
+    })
+    public ResponseResult<String> playbackURLs(String sbbh,String beginTime,String endTime,String protocol) {
+        if(StringUtils.isBlank(protocol)){
+            protocol = "hls";
+        }
+        String getCamsApi = "/api/video/v1/cameras/playbackURLs";
+        String result = "";
+        JSONObject jsonBody = new JSONObject();
+        jsonBody.put("cameraIndexCode", sbbh);
+        jsonBody.put("beginTime",beginTime+"+08:00");
+        jsonBody.put("endTime",endTime+"+08:00");
+        jsonBody.put("recordLocation", 0);
+        jsonBody.put("protocol", protocol);
+        jsonBody.put("needReturnClipInfo", true);
+        jsonBody.put("expand", "transcode=0");
+        result = CameraPreviewUtil.getCameraPreviewURL(getCamsApi, jsonBody);
+        return ResponseResult.success(result);
+    }
+
+    @ApiOperation("根据监控点编号进行云台操作")
+    @Log(title = "根据监控点编号进行云台操作", businessType = BusinessType.OTHER)
+    @PatchMapping("controlling")
+    @JwtSysUser
+    @ApiImplicitParams({@ApiImplicitParam(name = "sbbh", value = "设备编号", dataType = "String"),
+            @ApiImplicitParam(name = "action", value = "开始或停止操作(0 开始 1 停止)", dataType = "Integer"),
+            @ApiImplicitParam(name = "command", value = "控制命令(不区分大小写) 说明： LEFT 左转 RIGHT 右转 UP 上转 DOWN 下转 ZOOM_IN 焦距变大 ZOOM_OUT 焦距变小 LEFT_UP 左上 LEFT_DOWN 左下 RIGHT_UP 右上 RIGHT_DOWN 右下 FOCUS_NEAR 焦点前移 FOCUS_FAR 焦点后移 IRIS_ENLARGE 光圈扩大 IRIS_REDUCE 光圈缩小 以下命令presetIndex不可为空： GOTO_PRESET到预置点", dataType = "String"),
+            @ApiImplicitParam(name = "speed", value = "云台速度(取值范围1-100,默认40)", dataType = "Integer"),
+            @ApiImplicitParam(name = "presetIndex", value = "预置点编号(取值范围为1-128)", dataType = "Integer"),
+    })
+    public ResponseResult<String> controlling(String sbbh,Integer action,String command,Integer speed,Integer presetIndex) {
+        String getCamsApi = "/api/video/v1/ptzs/controlling";
+        String result = "";
+        JSONObject jsonBody = new JSONObject();
+        jsonBody.put("cameraIndexCode", sbbh);
+        jsonBody.put("action", action);
+        jsonBody.put("command", command);
+        jsonBody.put("speed", speed);
+        jsonBody.put("presetIndex", presetIndex);
+        result = CameraPreviewUtil.getCameraPreviewURL(getCamsApi, jsonBody);
+        return ResponseResult.success(result);
+    }
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsDlMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsDlMapper.java
new file mode 100644
index 0000000..d305526
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsDlMapper.java
@@ -0,0 +1,39 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 要素-地理要素表(TbYsDl)表数据库访问层
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-12 10:08:34
+ */
+@Mapper
+public interface TbYsDlMapper extends BaseMapper<TbYsDl> {
+
+    @ApiOperation("查询列表分页")
+    List<TbYsDl> getPageList(Map<String, Object> map);
+
+    @ApiOperation("查询列表数据总和")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询所有数据不分页")
+    List<TbYsDl> getList(Map<String, Object> map);
+
+    @ApiOperation("查询地理要素详情")
+    TbYsDl getInfoById(String id);
+
+    @ApiOperation("添加地理要素数据")
+    void insertEntity(TbYsDl dl);
+
+    @ApiOperation("修改地理要素信息")
+    void updateEntity(TbYsDl dl);
+}
+
+
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgGlbmMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgGlbmMapper.java
new file mode 100644
index 0000000..a7ff161
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgGlbmMapper.java
@@ -0,0 +1,18 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author dw
+ * @since 2022/8/26
+ **/
+@Mapper
+public interface TbYsGajgGlbmMapper extends BaseMapper<TbYsGajgGlbm> {
+
+    @ApiOperation("删除关联部门")
+    void deleteGlbm(@Param("id") String id);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgMapper.java
new file mode 100644
index 0000000..05f91c7
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsGajgMapper.java
@@ -0,0 +1,35 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ **/
+@Mapper
+public interface TbYsGajgMapper extends BaseMapper<TbYsGajg> {
+
+    @ApiOperation("新增公安机关要素")
+    int insertEntity(TbYsGajg gajg);
+
+    @ApiOperation("获取公安机关详情")
+    TbYsGajg getInfoById(String id);
+
+    @ApiOperation("修改公安机关要素")
+    void updateEntity(TbYsGajg gajg);
+
+    @ApiOperation("查询公安机关总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询公安机关列表分页")
+    List<TbYsGajg> getListPage(Map<String, Object> map);
+
+    @ApiOperation("查询公安机关列表-不分页")
+    List<TbYsGajg> getList(Map<String, Object> map);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyBqMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyBqMapper.java
new file mode 100644
index 0000000..2ebfb88
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyBqMapper.java
@@ -0,0 +1,14 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsRyBq;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TbYsRyBqMapper extends BaseMapper<TbYsRyBq> {
+
+    @ApiOperation("删除人员标签")
+    void deleteByRyId(@Param("id") String id);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyDhMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyDhMapper.java
new file mode 100644
index 0000000..ad16dce
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyDhMapper.java
@@ -0,0 +1,13 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsRyDh;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbYsRyDhMapper extends BaseMapper<TbYsRyDh> {
+
+    @ApiOperation("删除人员电话")
+    void deleteByRyId(String id);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyMapper.java
new file mode 100644
index 0000000..2f71880
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsRyMapper.java
@@ -0,0 +1,10 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsRy;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbYsRyMapper extends BaseMapper<TbYsRy> {
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsSxtMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsSxtMapper.java
new file mode 100644
index 0000000..0dd59dc
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsSxtMapper.java
@@ -0,0 +1,46 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsSxt;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ **/
+@Mapper
+public interface TbYsSxtMapper extends BaseMapper<TbYsSxt> {
+
+    @ApiOperation("添加摄像头信息")
+    int insertEntity(TbYsSxt sxt);
+
+    @ApiOperation("修改摄像头信息")
+    void updateEntity(TbYsSxt sxt);
+
+    @ApiOperation("查询摄像头的详细信息")
+    TbYsSxt getInfoById(String id);
+
+    @ApiOperation("查询摄像头列表总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("查询摄像头列表--分页")
+    List<TbYsSxt> getPageList(Map<String, Object> map);
+
+    @ApiOperation("查询摄像头列表--不分页·")
+    List<TbYsSxt> getList(Map<String, Object> map);
+
+    @ApiOperation("查询摄像头-事件中心")
+    List<TbYsSxt> getSjList(Map<String, Object> map);
+
+    @ApiOperation("查询摄像头的详细信息")
+    TbYsSxt queryBySjlyid(String sjlyid);
+
+    @ApiOperation("清空摄像头数据")
+    void deleteAll();
+
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXsajMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXsajMapper.java
new file mode 100644
index 0000000..ea798b6
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXsajMapper.java
@@ -0,0 +1,27 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.entity.yszx.TbYsXsaj;
+import com.mosty.base.model.vo.yszx.TbYsAjVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ **/
+@Mapper
+public interface TbYsXsajMapper extends BaseMapper<TbYsXsaj> {
+
+    @ApiOperation("新增行事案件")
+    void insertXsaj(TbYsXsaj xs);
+
+    @ApiOperation("查询行事案件详情")
+    TbYsXsaj selectXsAjById(String id);
+
+    @ApiOperation("修改行事案件")
+    void updateXsEntity(TbYsXsaj xs);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXzajMapper.java b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXzajMapper.java
new file mode 100644
index 0000000..9c6e76b
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mapper/TbYsXzajMapper.java
@@ -0,0 +1,40 @@
+package com.mosty.yszx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mosty.base.model.dto.yszx.TbYsAjDelDto;
+import com.mosty.base.model.entity.yszx.TbYsXzaj;
+import com.mosty.base.model.vo.yszx.TbYsAjVo;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ **/
+@Mapper
+public interface TbYsXzajMapper extends BaseMapper<TbYsXzaj> {
+
+    @ApiOperation("新增行政案件")
+    void insertXzaj(TbYsXzaj xz);
+
+    @ApiOperation("查询行政案件详情")
+    TbYsXzaj selectXzAjById(String id);
+
+    @ApiOperation("修改行政案件")
+    void updateXzEntity(TbYsXzaj xz);
+
+    @ApiOperation("获取案件总数")
+    int getCount(Map<String, Object> map);
+
+    @ApiOperation("获取案件列表")
+    List<TbYsAjVo> getList(Map<String, Object> map);
+
+    @ApiOperation("查询案件不分页")
+    List<TbYsAjVo> getListAll(Map<String, Object> map);
+
+    @ApiOperation("删除案件信息")
+    void delAj(TbYsAjDelDto dto);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
new file mode 100644
index 0000000..8bb0119
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -0,0 +1,117 @@
+package com.mosty.yszx.mybatisplus;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.mosty.common.base.exception.BusinessException;
+import com.mosty.common.base.util.IpUtil;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * MybatisPlus注入处理器
+ *
+ * @author Lhh
+ * @date 2021/4/25
+ */
+public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtCjip")) {
+                if (metaObject.getValue("xtCjip") == null) {
+                    this.strictInsertFill(metaObject, "xtCjip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            //根据属性名字设置要填充的值
+            if (metaObject.hasGetter("xtSjzt")) {
+                if (metaObject.getValue("xtSjzt") == null) {
+                    this.strictInsertFill(metaObject, "xtSjzt", String.class, "1");
+                }
+            }
+            if (metaObject.hasGetter("xtScbz")) {
+                if (metaObject.getValue("xtScbz") == null) {
+                    this.strictInsertFill(metaObject, "xtScbz", String.class, "0");
+                }
+            }
+            if (metaObject.hasGetter("xtCjsj")) {
+                if (metaObject.getValue("xtCjsj") == null) {
+                    this.strictInsertFill(metaObject, "xtCjsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtCjrId")) {
+                    if (metaObject.getValue("xtCjrId") == null) {
+                        this.strictInsertFill(metaObject, "xtCjrId", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjr")) {
+                    if (metaObject.getValue("xtCjr") == null) {
+                        this.strictInsertFill(metaObject, "xtCjr", String.class, String.valueOf(userInfo.userName));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmdm")) {
+                    if (metaObject.getValue("xtCjbmdm") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtCjbmmc")) {
+                    if (metaObject.getValue("xtCjbmmc") == null) {
+                        this.strictInsertFill(metaObject, "xtCjbmmc", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            UserInfo userInfo = UserInfoManager.getUser();
+            if (metaObject.hasGetter("xtZhgxip")) {
+                if (metaObject.getValue("xtZhgxip") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxip", String.class, IpUtil.getIpAddress());
+                }
+            }
+            if (metaObject.hasGetter("xtZhgxsj")) {
+                if (metaObject.getValue("xtZhgxsj") == null) {
+                    this.strictUpdateFill(metaObject, "xtZhgxsj", Timestamp.class, new Timestamp(System.currentTimeMillis()));
+                }
+            }
+            if (Objects.nonNull(userInfo)) {
+                if (metaObject.hasGetter("xtZhgxrid")) {
+                    if (metaObject.getValue("xtZhgxrid") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxrid", String.class, String.valueOf(userInfo.userId));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxr")) {
+                    if (metaObject.getValue("xtZhgxr") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxr", String.class, userInfo.userName);
+                    }
+                }
+
+                if (metaObject.hasGetter("xtZhgxbmdm")) {
+                    if (metaObject.getValue("xtZhgxbmdm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbmdm", String.class, String.valueOf(userInfo.getDeptId()));
+                    }
+                }
+                if (metaObject.hasGetter("xtZhgxbm")) {
+                    if (metaObject.getValue("xtZhgxbm") == null) {
+                        this.strictUpdateFill(metaObject, "xtZhgxbm", String.class, userInfo.getDeptName());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/MybatisPlusConfig.java b/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/MybatisPlusConfig.java
new file mode 100644
index 0000000..34b4acf
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/mybatisplus/MybatisPlusConfig.java
@@ -0,0 +1,29 @@
+package com.mosty.yszx.mybatisplus;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类
+ *
+ * @author Lhh
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@Configuration
+@MapperScan("com.mosty.yszx.mapper")
+public class MybatisPlusConfig {
+
+	/**
+	 * 元对象字段填充控制器
+	 * https://baomidou.com/guide/auto-fill-metainfo.html
+	 */
+	@Bean
+	public MetaObjectHandler metaObjectHandler() {
+		return new CreateAndUpdateMetaObjectHandler();
+	}
+
+
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbBaseAdaptRemoteService.java b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbBaseAdaptRemoteService.java
new file mode 100644
index 0000000..79fd7fc
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbBaseAdaptRemoteService.java
@@ -0,0 +1,72 @@
+package com.mosty.yszx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.base.GetSsbmDto;
+import com.mosty.base.model.dto.base.SysDeptDTO;
+import com.mosty.base.feign.service.MostyBaseFeignService;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 调用部门信息远程适配层
+ *
+ * @author kevin
+ * @date 2022/7/6 10:37 上午
+ * @since 1.0.0
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbBaseAdaptRemoteService {
+
+    private final MostyBaseFeignService mostyBaseFeignService;
+
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByDeptId(String deptid) {
+        if (StringUtils.isBlank(deptid)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByDeptId(deptid);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据部门ID查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据部门ID查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 根据部门编码查询部门信息
+    public DeptInfoVo getOrgByOrgcode(String orgcode) {
+        if (StringUtils.isBlank(orgcode)) {
+            return null;
+        }
+        ResponseResult<DeptInfoVo> responseResult = mostyBaseFeignService.getOrgByOrgcode(orgcode);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("根据部门ID查询部门信息异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("根据部门ID查询部门信息异常");
+        }
+        return responseResult.getData();
+    }
+
+    // 获取权限查询条件
+    public String getSsbm(String ssbmdm, String isChild) {
+        GetSsbmDto dto = new GetSsbmDto(ssbmdm, isChild);
+        ResponseResult<String> responseResult = mostyBaseFeignService.getSsbm(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取权限查询条件异常 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("获取权限查询条件异常");
+        }
+        return responseResult.getData();
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbRwzxAdaptRemoteService.java b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbRwzxAdaptRemoteService.java
new file mode 100644
index 0000000..ffcb284
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbRwzxAdaptRemoteService.java
@@ -0,0 +1,56 @@
+package com.mosty.yszx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.feign.service.MostyRwzxFeignService;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.entity.yjzl.TbZlxx;
+import com.mosty.base.model.query.rwzx.TbRwTaskByYwidQuery;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author dw
+ * @since 2022/10/05
+ * 外部调用任务中心接口
+ **/
+@Service
+@Slf4j
+public class TbRwzxAdaptRemoteService {
+
+    @Resource
+    private MostyRwzxFeignService mostyRwzxFeignService;
+
+    // 发送任务给各个用户
+    public Integer addRw(TbRwTaskDto dto) {
+        ResponseResult<Integer> responseResult = mostyRwzxFeignService.addRw(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("任务下发失败 responseResult = {}", JSON.toJSONString(responseResult));
+            return 0;
+        }
+        return responseResult.getData();
+    }
+
+    // 获取任务信息
+    public TbRwTask getRwByYwid(TbRwTaskByYwidQuery dto) {
+        ResponseResult<TbRwTask> responseResult = mostyRwzxFeignService.getRwByYwid(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("获取任务信息失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("任务查询报错！！");
+        }
+        return responseResult.getData();
+    }
+
+    // 修改旧的指令任务状态为未读
+    public void changeTaskStateByZlid(TbZlxx zlxx) {
+        ResponseResult<Void> responseResult = mostyRwzxFeignService.changeTaskStateByZlid(zlxx);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("修改任务状态失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("修改任务状态失败！！");
+        }
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbSjzxAdaptRemoteService.java b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbSjzxAdaptRemoteService.java
new file mode 100644
index 0000000..e27ffa9
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/remote/TbSjzxAdaptRemoteService.java
@@ -0,0 +1,33 @@
+package com.mosty.yszx.remote;
+
+import com.alibaba.fastjson.JSON;
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.base.feign.service.MostySjzxFeignService;
+import com.mosty.common.base.domain.ResponseResult;
+import com.mosty.common.base.exception.BusinessException;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 事件中心远程调用
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+public class TbSjzxAdaptRemoteService {
+
+    private final MostySjzxFeignService mostySjzxFeignService;
+
+    // 保存视频播放日志
+    public void tbSjSpbfAdd(TbSjSpbfDTO dto) {
+        ResponseResult<Integer> responseResult = mostySjzxFeignService.tbSjSpbfAdd(dto);
+        if (responseResult == null || !responseResult.isSuccess()) {
+            log.error("保存视频播放日志失败 responseResult = {}", JSON.toJSONString(responseResult));
+            throw new BusinessException("保存视频播放日志失败");
+        }
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsAjService.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsAjService.java
new file mode 100644
index 0000000..ed92574
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsAjService.java
@@ -0,0 +1,40 @@
+package com.mosty.yszx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.TbYsAjDelDto;
+import com.mosty.base.model.dto.yszx.TbYsAjDto;
+import com.mosty.base.model.query.yszx.TbYsAjNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsAjQuery;
+import com.mosty.base.model.vo.yszx.TbYsAjVo;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ **/
+public interface TbYsAjService {
+
+    @ApiOperation("案件新增")
+    void addAj(TbYsAjDto dto);
+
+    @ApiOperation("案件修改")
+    void updateAj(TbYsAjDto dto);
+
+    @ApiOperation("分页获取案件列表")
+    IPage<TbYsAjVo> getPageList(TbYsAjQuery dto);
+
+    @ApiOperation("不分页获取案件列表")
+    List<TbYsAjVo> getList(TbYsAjNoPageQuery dto);
+
+    @ApiOperation("删除案件信息")
+    void delAj(TbYsAjDelDto dto);
+
+    @ApiOperation("获取案件数据--热力图")
+    List<Map<String,Object>> getAjHotMap(TbYsAjNoPageQuery dto);
+
+    @ApiOperation("获取案件详情")
+    TbYsAjVo getInfo(String id, String ajfl);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsDlService.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsDlService.java
new file mode 100644
index 0000000..584ac76
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsDlService.java
@@ -0,0 +1,45 @@
+package com.mosty.yszx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.base.model.vo.yszx.TbYsDlVo;
+import com.mosty.base.model.vo.yszx.TbYsDlDto;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * 
+要素-地理要素表(TbYsDl)表服务接口
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-12 10:08:38
+ */
+public interface TbYsDlService {
+
+    @ApiOperation("查询所有数据")
+    IPage<TbYsDlVo> queryAll(TbYsDlQuery dto);
+    
+    @ApiOperation("通过ID查询单条数据")
+    TbYsDlVo queryById(String id);
+
+    @ApiOperation("新增数据")
+    void insert(TbYsDlDto tbYsDl);
+
+    @ApiOperation("修改数据")
+    void update(TbYsDlDto tbYsDl);
+
+    @ApiOperation("通过主键删除数据")
+    void deleteById(String id);
+
+    @ApiOperation("大屏-巡组气泡框-视频随动")
+    List<TbYsDl> selectVideoServo(TbYsDl tbYsDl);
+
+    @ApiOperation("根据关键字查询")
+    List<TbYsDlVo> selectByNr(String keyword);
+
+    @ApiOperation("根据名称查询地理要素")
+    TbYsDl selectDlys(String ysmc);
+}
+
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsGajgService.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsGajgService.java
new file mode 100644
index 0000000..2d15979
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsGajgService.java
@@ -0,0 +1,58 @@
+package com.mosty.yszx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.TbYsGajgAndGlbmDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgByJwdDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgGlbmDto;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.vo.yszx.TbYsGajgGlbmVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.common.core.business.entity.vo.Base64Str;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ **/
+public interface TbYsGajgService {
+
+    @ApiOperation("公安机关要素新增")
+    int insertEntity(TbYsGajgDto dto);
+
+    @ApiOperation("公安机关要素修改")
+    void updateEntity(TbYsGajgDto dto);
+
+    @ApiOperation("根据来源修改公安机关要素")
+    void updateEntityByLY(TbYsGajgDto dto);
+
+    @ApiOperation("公安机关要素详情查询")
+    TbYsGajgVo getInfo(String id);
+
+    @ApiOperation("查询公安机关列表")
+    IPage<TbYsGajgVo> getPageList(TbYsGajgQuery dto);
+
+    @ApiOperation("删除公安机关要素")
+    void delEntity(String id);
+
+    @ApiOperation("删除公安机关要素")
+    void delEntity(TbYsGajgDto dto);
+
+    @ApiOperation("根据经纬度判断所属公安机关")
+    TbYsGajgVo getGajgByJwd(TbYsGajgByJwdDto dto);
+
+    @ApiOperation("公安机关要素新增--添加关联部门")
+    int addGajg(TbYsGajgAndGlbmDto dto);
+
+    @ApiOperation("公安机关要素修改--修改关联部门")
+    void editGajg(TbYsGajgAndGlbmDto dto);
+
+    @ApiOperation("查询公安机关关联部门")
+    List<TbYsGajgGlbmDto> getGlbmList(String id);
+
+    @ApiOperation("查询公安机关列表（包含关联部门ID）")
+    List<TbYsGajgGlbmVo> getGajgList(TbYsGajgQuery dto);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsRyService.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsRyService.java
new file mode 100644
index 0000000..fbaf553
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsRyService.java
@@ -0,0 +1,25 @@
+package com.mosty.yszx.service;
+
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.vo.yszx.TbYsRyBqUpdateDto;
+import com.mosty.base.model.vo.yszx.TbYsRyDhUpdateDto;
+import com.mosty.base.model.vo.yszx.TbYsRyVo;
+import io.swagger.annotations.ApiOperation;
+
+public interface TbYsRyService {
+
+    @ApiOperation("查询人员详情")
+    TbYsRyVo getRyInfo(String sfzh);
+
+    @ApiOperation("添加人员要素")
+    void addRyYs(TbYsRyDto dto);
+
+    @ApiOperation("修改人员要素")
+    void updateRyYs(TbYsRyDto dto);
+
+    @ApiOperation("修改人员标签要素")
+    void updateRyBqYs(TbYsRyBqUpdateDto dto);
+
+    @ApiOperation("修改人员电话要素")
+    void updateRyDhys(TbYsRyDhUpdateDto dto);
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsSxtService.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsSxtService.java
new file mode 100644
index 0000000..f71c655
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/TbYsSxtService.java
@@ -0,0 +1,64 @@
+package com.mosty.yszx.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.yszx.TbYsSxt;
+import com.mosty.base.model.query.yszx.TbYsSxtNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtQuery;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ **/
+public interface TbYsSxtService {
+
+    @ApiOperation("摄像头新增")
+    int insertEntity(TbYsSxtDto dto);
+
+    @ApiOperation("摄像头修改")
+    void updateEntity(TbYsSxtDto dto);
+
+    @ApiOperation("查询摄像头分页列表")
+    IPage<TbYsSxt> getPageList(TbYsSxtQuery dto);
+
+    @ApiOperation("查询摄像头列表---不分页")
+    List<TbYsSxt> getList(TbYsSxtNoPageQuery dto);
+
+    @ApiOperation("查询摄像头详情信息")
+    TbYsSxt getInfo(String id);
+
+    @ApiOperation("删除摄像头信息")
+    void delEntity(String id);
+
+    @ApiOperation("查询摄像头-事件中心")
+    List<TbYsSxt> getSjList(String jd ,String wd ,String sjid);
+
+    @ApiOperation("摄像头新增")
+    int insertEntity(TbYsSxt sxt);
+
+    @ApiOperation("查询摄像头详情信息")
+    TbYsSxt queryBySjlyid(String sjlyid);
+
+    @ApiOperation("根据设备编号查询摄像头详情")
+    TbYsSxtDto getInfoBySbbh(String sbbh);
+
+    @ApiOperation("获取所有的感知源的设备编号")
+    List<String> getSxtBhList(List<String> ids);
+
+    @ApiOperation("添加泸州感知源数据")
+    void addLzGzy(ZhjmxfXfqwXfqyGzdw dto);
+
+    @ApiOperation("查询感知源信息")
+    TbYsSxtDto selectGzy(TbYsSxtPageOneQuery dto);
+
+    @ApiOperation("摄像头更新经纬度")
+    void updateJwd();
+
+    @ApiOperation("更新泸州感知源数据")
+    void updateLzGzy();
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsAjServiceImpl.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsAjServiceImpl.java
new file mode 100644
index 0000000..c3f2cae
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsAjServiceImpl.java
@@ -0,0 +1,229 @@
+package com.mosty.yszx.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.common.base.util.StringUtils;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.dto.yszx.TbYsAjDelDto;
+import com.mosty.base.model.dto.yszx.TbYsAjDto;
+import com.mosty.base.model.entity.yszx.TbYsXsaj;
+import com.mosty.base.model.entity.yszx.TbYsXzaj;
+import com.mosty.base.model.query.yszx.TbYsAjNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsAjQuery;
+import com.mosty.base.model.vo.yszx.TbYsAjVo;
+import com.mosty.yszx.mapper.TbYsXsajMapper;
+import com.mosty.yszx.mapper.TbYsXzajMapper;
+import com.mosty.yszx.remote.TbBaseAdaptRemoteService;
+import com.mosty.yszx.service.TbYsAjService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @author dw
+ * @since 2022/7/21
+ **/
+@Service
+@AllArgsConstructor
+public class TbYsAjServiceImpl implements TbYsAjService {
+
+    private final TbYsXsajMapper tbYsXsajMapper;
+    private final TbYsXzajMapper tbYsXzajMapper;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public void addAj(TbYsAjDto dto) {
+        String id = UUIDGenerator.getUUID();
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+        if ("1".equals(dto.getAjfl())) {
+            TbYsXsaj xs = new TbYsXsaj();
+            BeanUtils.copyProperties(dto, xs);
+            if (dto.getJd() != null && dto.getWd() != null) {
+                xs.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+                xs.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+            }
+            xs.setJsnr(dto.getAjmc() + " " + dto.getAjbh() + " " + dto.getDzmc() +
+                    " " + dto.getAymc() + " " + dto.getAjnr());
+            xs.setId(id);
+            xs.setXtSjly("1");
+            if (dept != null) {
+                xs.setSsbm(dept.getDeptname());
+                xs.setSsbmid(dept.getDeptid());
+                xs.setSsbmdm(dept.getDeptcode());
+                xs.setSsxgajdm(dept.getFxjcode());
+                xs.setSsxgajid(dept.getFxjid());
+                xs.setSsxgaj(dept.getFxjname());
+                xs.setSssgaj(dept.getDszname());
+                xs.setSssgajdm(dept.getDszcode());
+                xs.setSssgajid(dept.getDszid());
+            }
+            this.tbYsXsajMapper.insertXsaj(xs);
+        } else if ("2".equals(dto.getAjfl())) {
+            TbYsXzaj xz = new TbYsXzaj();
+            BeanUtils.copyProperties(dto, xz);
+            if (dto.getJd() != null && dto.getWd() != null) {
+                xz.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+                xz.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+            }
+            xz.setJsnr(dto.getAjmc() + " " + dto.getAjbh() + " " + dto.getDzmc() +
+                    " " + dto.getAymc() + " " + dto.getAjnr());
+            xz.setId(id);
+            xz.setXtSjly("1");
+            if (dept != null) {
+                xz.setSsbm(dept.getDeptname());
+                xz.setSsbmid(dept.getDeptid());
+                xz.setSsbmdm(dept.getDeptcode());
+                xz.setSsxgajdm(dept.getFxjcode());
+                xz.setSsxgajid(dept.getFxjid());
+                xz.setSsxgaj(dept.getFxjname());
+                xz.setSssgaj(dept.getDszname());
+                xz.setSssgajdm(dept.getDszcode());
+                xz.setSssgajid(dept.getDszid());
+            }
+            this.tbYsXzajMapper.insertXzaj(xz);
+        }
+    }
+
+    @Override
+    public void updateAj(TbYsAjDto dto) {
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+        if ("1".equals(dto.getAjfl())) {
+            TbYsXsaj xs = new TbYsXsaj();
+            BeanUtils.copyProperties(dto, xs);
+            if (xs.getJd() != null && xs.getWd() != null) {
+                xs.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+                xs.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+            }
+            if (dept != null) {
+                xs.setSsbm(dept.getDeptname());
+                xs.setSsbmid(dept.getDeptid());
+                xs.setSsbmdm(dept.getDeptcode());
+                xs.setSsxgajdm(dept.getFxjcode());
+                xs.setSsxgajid(dept.getFxjid());
+                xs.setSsxgaj(dept.getFxjname());
+                xs.setSssgaj(dept.getDszname());
+                xs.setSssgajdm(dept.getDszcode());
+                xs.setSssgajid(dept.getDszid());
+            }this.tbYsXsajMapper.updateXsEntity(xs);
+            xs = this.tbYsXsajMapper.selectXsAjById(xs.getId());
+            xs.setJsnr(dto.getAjmc() + " " + dto.getAjbh() + " " + dto.getDzmc() +
+                    " " + dto.getAymc() + " " + dto.getAjnr());
+            this.tbYsXsajMapper.updateXsEntity(xs);
+        } else if ("2".equals(dto.getAjfl())) {
+            TbYsXzaj xz = new TbYsXzaj();
+            BeanUtils.copyProperties(dto, xz);
+            if (xz.getJd() != null && xz.getWd() != null) {
+                xz.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+                xz.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+            }
+            if (dept != null) {
+                xz.setSsbm(dept.getDeptname());
+                xz.setSsbmid(dept.getDeptid());
+                xz.setSsbmdm(dept.getDeptcode());
+                xz.setSsxgajdm(dept.getFxjcode());
+                xz.setSsxgajid(dept.getFxjid());
+                xz.setSsxgaj(dept.getFxjname());
+                xz.setSssgaj(dept.getDszname());
+                xz.setSssgajdm(dept.getDszcode());
+                xz.setSssgajid(dept.getDszid());
+            }
+            this.tbYsXzajMapper.updateXzEntity(xz);
+            xz = this.tbYsXzajMapper.selectXzAjById(xz.getId());
+            xz.setJsnr(dto.getAjmc() + " " + dto.getAjbh() + " " + dto.getDzmc() +
+                    " " + dto.getAymc() + " " + dto.getAjnr());
+            this.tbYsXzajMapper.updateXzEntity(xz);
+        }
+    }
+
+    @Override
+    public IPage<TbYsAjVo> getPageList(TbYsAjQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("", user);
+        map.put("useSql", useSql);
+        int count = this.tbYsXzajMapper.getCount(map);
+        List<TbYsAjVo> list = this.tbYsXzajMapper.getList(map);
+        IPage<TbYsAjVo> page = new Page<>();
+        page.setRecords(list);
+        page.setTotal(count);
+        return page;
+    }
+
+    @Override
+    public List<TbYsAjVo> getList(TbYsAjNoPageQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("", user);
+        map.put("useSql", useSql);
+        return this.tbYsXzajMapper.getListAll(map);
+    }
+
+    @Override
+    public void delAj(TbYsAjDelDto dto) {
+        this.tbYsXzajMapper.delAj(dto);
+    }
+
+    @Override
+    public List<Map<String, Object>> getAjHotMap(TbYsAjNoPageQuery dto) {
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            dto.setStartTime(dto.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            dto.setEndTime(dto.getEndTime() + " 23:59:59");
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        UserInfo user = UserInfoManager.get();
+        String useSql = PermissionsUtil.createSql("", user);
+        map.put("useSql", useSql);
+        List<TbYsAjVo> list = this.tbYsXzajMapper.getListAll(map);
+        List<Map<String, Object>> rList = new ArrayList<>();
+        list.forEach(item -> {
+            Map<String, Object> mp = new HashMap<>();
+            mp.put("lng", item.getJd());
+            mp.put("lat", item.getWd());
+            mp.put("count", 1);
+            rList.add(mp);
+        });
+        return rList;
+    }
+
+    @Override
+    public TbYsAjVo getInfo(String id, String ajfl) {
+        TbYsAjVo vo = new TbYsAjVo();
+        if ("1".equals(ajfl)) {
+            TbYsXsaj xs = this.tbYsXsajMapper.selectXsAjById(id);
+            BeanUtils.copyProperties(xs, vo);
+            return vo;
+        } else if ("2".equals(ajfl)) {
+            TbYsXzaj xz = this.tbYsXzajMapper.selectXzAjById(id);
+            BeanUtils.copyProperties(xz, vo);
+            return vo;
+        }
+        return null;
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsDlServiceImpl.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsDlServiceImpl.java
new file mode 100644
index 0000000..484c8dc
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsDlServiceImpl.java
@@ -0,0 +1,238 @@
+package com.mosty.yszx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.utils.GeoHashKit;
+import com.mosty.base.utils.JtsUtils;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yszx.TbYsDlQuery;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.vo.yszx.TbYsDlVo;
+import com.mosty.base.model.vo.yszx.TbYsDlDto;
+import com.mosty.base.model.entity.yszx.TbYsDl;
+import com.mosty.yszx.mapper.TbYsDlMapper;
+import com.mosty.yszx.remote.TbBaseAdaptRemoteService;
+import com.mosty.yszx.service.TbYsDlService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 要素-地理要素表(TbYsDl)表服务实现类
+ *
+ * @author zhangHaiJun
+ * @since 2022-07-12 10:08:40
+ */
+@Service("tbYsDlService")
+public class TbYsDlServiceImpl extends ServiceImpl<TbYsDlMapper, TbYsDl>
+        implements TbYsDlService {
+
+    @Resource
+    private TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+
+    @Override
+    public IPage<TbYsDlVo> queryAll(TbYsDlQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("dto", dto);
+        UserInfo user = UserInfoManager.getUser();
+        String useSql = user != null ? PermissionsUtil.createSql("", user) : "";
+        map.put("useSql", useSql);
+        IPage<TbYsDlVo> page;
+        if (dto.getPageNum() != null && dto.getPageSize() != null) {
+            page = new Page<>(dto.getPageNum(), dto.getPageSize());
+            map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+            map.put("pageSize", dto.getPageSize());
+            int count = this.baseMapper.getCount(map);
+            List<TbYsDl> list = this.baseMapper.getPageList(map);
+            List<TbYsDlVo> rList = new ArrayList<>();
+            list.forEach(item -> {
+                TbYsDlVo vo = new TbYsDlVo();
+                BeanUtils.copyProperties(item, vo);
+                rList.add(vo);
+            });
+            page.setRecords(rList);
+            page.setTotal(count);
+        } else {
+            page = new Page<>();
+            List<TbYsDl> list = this.baseMapper.getList(map);
+            List<TbYsDlVo> rList = new ArrayList<>();
+            list.forEach(item -> {
+                TbYsDlVo vo = new TbYsDlVo();
+                BeanUtils.copyProperties(item, vo);
+                rList.add(vo);
+            });
+            page.setRecords(rList);
+        }
+        return page;
+    }
+
+    @Override
+    public TbYsDlVo queryById(String id) {
+        TbYsDl item = this.baseMapper.getInfoById(id);
+        TbYsDlVo vo = null;
+        if (item != null) {
+            vo = new TbYsDlVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setDtm(JtsUtils.decodePolygon(item.getDtm()));
+            vo.setZb(new BigDecimal[]{item.getJd(), item.getWd()});
+        }
+        return vo;
+    }
+
+    @Override
+    public void insert(TbYsDlDto dto) {
+        TbYsDl dl = new TbYsDl();
+        BeanUtils.copyProperties(dto, dl);
+        dl.setId(UUIDGenerator.getUUID());
+        if (dto.getJd() != null && dto.getWd() != null) {
+            dl.setZb(JtsUtils.getPoint(dl.getJd(), dl.getWd()));
+            dl.setZbhash(GeoHashKit.encode(dl.getJd(), dl.getWd()));
+        }
+        if (dto.getQy() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy();
+            for (int i = 0; i < qw.size(); i++) {
+                if (i != qw.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw.get(i);
+                    des[1] = qw.get(i + 1);
+                    list.add(des);
+                }
+            }
+            if (list.size() > 0) {
+                dl.setDtm(JtsUtils.getPolygon(list));
+            }
+        }
+        dl.setJsnr(dto.getYsmc() + " " + dto.getYsjc() + " " + dto.getYswzXz()
+                + " " + dto.getYswzBc());
+        dl.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmid());
+        if (dept != null) {
+            dl.setSsbm(dept.getDeptname());
+            dl.setSsbmid(dept.getDeptid());
+            dl.setSsbmdm(dept.getDeptcode());
+            dl.setSsxgajdm(dept.getFxjcode());
+            dl.setSsxgajid(dept.getFxjid());
+            dl.setSsxgaj(dept.getFxjname());
+            dl.setSssgaj(dept.getDszname());
+            dl.setSssgajdm(dept.getDszcode());
+            dl.setSssgajid(dept.getDszid());
+        }
+        this.baseMapper.insertEntity(dl);
+    }
+
+    @Override
+    public void update(TbYsDlDto dto) {
+        TbYsDl dl = new TbYsDl();
+        BeanUtils.copyProperties(dto, dl);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            dl.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            dl.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        ArrayList<BigDecimal[]> list = new ArrayList<>();
+        List<BigDecimal> qw = dto.getQy();
+        if (qw != null) {
+            for (int i = 0; i < qw.size(); i++) {
+                if (i != qw.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw.get(i);
+                    des[1] = qw.get(i + 1);
+                    list.add(des);
+                }
+            }
+        }
+        if (list.size() > 0) {
+            dl.setDtm(JtsUtils.getPolygon(list));
+        }
+        this.baseMapper.updateEntity(dl);
+        dl = this.baseMapper.getInfoById(dl.getId());
+        dl.setJsnr(dl.getYsmc() + " " + dl.getYsjc() + " " + dl.getYswzXz() +
+                " " + dl.getYswzBc());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+        if (dept != null) {
+            dl.setSsbmdm(dept.getDeptid());
+            dl.setSsbm(dept.getDeptname());
+            dl.setSsxgaj(dept.getFxjname());
+            dl.setSsxgajdm(dept.getFxjid());
+            dl.setSssgaj(dept.getDszname());
+            dl.setSssgajdm(dept.getDszid());
+        }
+        this.baseMapper.updateEntity(dl);
+    }
+
+    @Override
+    public void deleteById(String id) {
+        this.baseMapper.deleteById(id);
+    }
+
+    @Override
+    public List<TbYsDl> selectVideoServo(TbYsDl tbYsDl) {
+        //地理位置
+        String dlsql = "( \n" +
+                "6371 * acos( \n" +
+                "cos(radians(jd))\n" +
+                "* cos( radians( " + tbYsDl.getJd() + ") )\n" +
+                "* cos(radians( " + tbYsDl.getWd() + " ) - radians(wd))\n" +
+                "+ sin( radians(jd) ) \n" +
+                "* sin( radians(" + tbYsDl.getJd() + ") ) \n" +
+                ") \n" +
+                ")";
+//        UserInfo userInfo = UserInfoManager.get();
+//        PermissionsUtil.queryWrapperUtil(queryWrapper, userInfo);
+        QueryWrapper<TbYsDl> queryWrapper = new QueryWrapper<>();
+        tbYsDl.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(tbYsDl.getSsbmdm(), null));
+
+        List<TbYsDl> tbYsDlList = baseMapper.selectList((Wrapper<TbYsDl>) queryWrapper
+                .like(StringUtils.isNotBlank(tbYsDl.getYsdl()), "ysdl", tbYsDl.getYsdl())
+                .like(StringUtils.isNotBlank(tbYsDl.getYszl()), "yszl", tbYsDl.getYszl())
+                .likeRight(StringUtils.isNotBlank(tbYsDl.getSsbmdm()), "ssbmdm", tbYsDl.getSsbmdm())
+                .like(StringUtils.isNotBlank(tbYsDl.getYsxl()), "ysxl", tbYsDl.getYsxl())
+                .le(StringUtils.isNotBlank(dlsql), dlsql, tbYsDl.getCxjl())
+                .eq("xt_sjzt", 1)
+        );
+        return tbYsDlList;
+    }
+
+    @Override
+    public List<TbYsDlVo> selectByNr(String keyword) {
+        List<TbYsDl> list = this.baseMapper.selectList(
+                new LambdaQueryWrapper<TbYsDl>()
+                        .like(TbYsDl::getJsnr, keyword)
+                        .eq(TbYsDl::getXtScbz, "0")
+        );
+        List<TbYsDlVo> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbYsDlVo vo = new TbYsDlVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setDtm(JtsUtils.decodePolygon(item.getDtm()));
+            vo.setZb(new BigDecimal[]{item.getJd(), item.getWd()});
+            rList.add(vo);
+        });
+        return rList;
+    }
+
+    @Override
+    public TbYsDl selectDlys(String ysmc) {
+        return this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsDl>()
+                        .eq(TbYsDl::getYsmc, ysmc)
+                        .eq(TbYsDl::getXtSjzt, "1")
+                        .last(" limit 1")
+        );
+    }
+}
+
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsGajgServiceImpl.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsGajgServiceImpl.java
new file mode 100644
index 0000000..bed981b
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsGajgServiceImpl.java
@@ -0,0 +1,675 @@
+package com.mosty.yszx.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.base.GetDeptListDTO;
+import com.mosty.base.model.dto.rwzx.TbRwTaskDto;
+import com.mosty.base.model.dto.rwzx.TbRwTaskUserDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgAndGlbmDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgByJwdDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgDto;
+import com.mosty.base.model.dto.yszx.TbYsGajgGlbmDto;
+import com.mosty.base.model.entity.rwzx.TbRwTask;
+import com.mosty.base.model.vo.yszx.TbYsGajgGlbmVo;
+import com.mosty.base.utils.*;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.common.core.business.entity.vo.Base64Str;
+import com.mosty.common.token.UserInfo;
+import com.mosty.common.token.UserInfoManager;
+import com.mosty.common.util.PermissionsUtil;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.entity.yszx.TbYsGajgGlbm;
+import com.mosty.base.model.vo.yszx.TbYsGajgVo;
+import com.mosty.yszx.mapper.TbYsGajgGlbmMapper;
+import com.mosty.yszx.mapper.TbYsGajgMapper;
+import com.mosty.yszx.remote.TbBaseAdaptRemoteService;
+import com.mosty.yszx.remote.TbRwzxAdaptRemoteService;
+import com.mosty.yszx.service.TbYsGajgService;
+import org.locationtech.jts.geom.Coordinate;
+import lombok.AllArgsConstructor;
+import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author dw
+ * @since 2022/7/20
+ **/
+@Service
+@AllArgsConstructor
+public class TbYsGajgServiceImpl extends ServiceImpl<TbYsGajgMapper, TbYsGajg> implements TbYsGajgService {
+
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYsGajgGlbmMapper tbYsGajgGlbmMapper;
+    private final TbRwzxAdaptRemoteService tbRwzxAdaptRemoteService;
+
+
+    @Override
+    public int addGajg(TbYsGajgAndGlbmDto dto) {
+        TbYsGajg gajg = new TbYsGajg();
+        BeanUtils.copyProperties(dto, gajg);
+        gajg.setId(UUIDGenerator.getUUID());
+        if (dto.getJd() != null && dto.getWd() != null) {
+            gajg.setZb(JtsUtils.getPoint(gajg.getJd(), gajg.getWd()));
+            gajg.setZbhash(GeoHashKit.encode(gajg.getJd(), gajg.getWd()));
+        }
+        if (dto.getQy() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+                if (list.size() > 0) {
+                    gajg.setDtm(JtsUtils.getPolygon(list));
+                }
+            }
+        }
+        if (dto.getQy1() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy1();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm1(JtsUtils.getPolygon(list));
+            }
+        }
+        if (dto.getQy2() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy2();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm2(JtsUtils.getPolygon(list));
+            }
+        }
+        gajg.setJsnr(dto.getGajgmc() + " " + dto.getGajgjc() + " " + dto.getWzXz() + " " + dto.getWzBc());
+        gajg.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            gajg.setSsbm(dept.getDeptname());
+            gajg.setSsbmid(dept.getDeptid());
+            gajg.setSsbmdm(dept.getDeptcode());
+            gajg.setSsxgajdm(dept.getFxjcode());
+            gajg.setSsxgajid(dept.getFxjid());
+            gajg.setSsxgaj(dept.getFxjname());
+            gajg.setSssgaj(dept.getDszname());
+            gajg.setSssgajdm(dept.getDszcode());
+            gajg.setSssgajid(dept.getDszid());
+        }
+        List<TbYsGajgGlbmDto> dtoList = dto.getGlbmDtoList();
+        dtoList.forEach(item -> {
+            TbYsGajgGlbm bm = new TbYsGajgGlbm();
+            bm.setId(UUIDGenerator.getUUID());
+            bm.setGajgId(gajg.getId());
+            DeptInfoVo vo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            if (vo != null) {
+                bm.setSsbmdm(vo.getDeptcode());
+                bm.setSsbm(vo.getDeptname());
+                bm.setSsbmid(vo.getDeptid());
+                bm.setSsxgaj(vo.getFxjname());
+                bm.setSsxgajid(vo.getFxjid());
+                bm.setSsxgajdm(vo.getFxjcode());
+                bm.setSssgaj(vo.getDszname());
+                bm.setSssgajdm(vo.getDszcode());
+                bm.setSssgajid(vo.getDszid());
+            }
+            bm.setXtSjly("1");
+            this.tbYsGajgGlbmMapper.insert(bm);
+        });
+        gajg.setXtSjly("1");
+        // 添加关联部门
+        return this.baseMapper.insertEntity(gajg);
+    }
+
+    @Override
+    @Transactional
+    public void editGajg(TbYsGajgAndGlbmDto dto) {
+        TbYsGajg gajg = new TbYsGajg();
+        BeanUtils.copyProperties(dto, gajg);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            gajg.setZb(JtsUtils.getPoint(gajg.getJd(), gajg.getWd()));
+            gajg.setZbhash(GeoHashKit.encode(gajg.getJd(), gajg.getWd()));
+        }
+        if (dto.getQy() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+                if (list.size() > 0) {
+                    gajg.setDtm(JtsUtils.getPolygon(list));
+                }
+            }
+        }
+        if (dto.getQy1() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy1();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm1(JtsUtils.getPolygon(list));
+            }
+        }
+        if (dto.getQy2() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy2();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm2(JtsUtils.getPolygon(list));
+            }
+        }
+        gajg.setJsnr(dto.getGajgmc() + " " + dto.getGajgjc() + " " + dto.getWzXz() + " " + dto.getWzBc());
+        gajg.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            gajg.setSsbm(dept.getDeptname());
+            gajg.setSsbmid(dept.getDeptid());
+            gajg.setSsbmdm(dept.getDeptcode());
+            gajg.setSsxgajdm(dept.getFxjcode());
+            gajg.setSsxgajid(dept.getFxjid());
+            gajg.setSsxgaj(dept.getFxjname());
+            gajg.setSssgaj(dept.getDszname());
+            gajg.setSssgajdm(dept.getDszcode());
+            gajg.setSssgajid(dept.getDszid());
+        }
+        List<TbYsGajgGlbmDto> dtoList = dto.getGlbmDtoList();
+        // 删除之前的配置
+        this.deleteGlbm(gajg.getId());
+        dtoList.forEach(item -> {
+            TbYsGajgGlbm bm = new TbYsGajgGlbm();
+            bm.setId(UUIDGenerator.getUUID());
+            bm.setGajgId(gajg.getId());
+            DeptInfoVo vo = this.tbBaseAdaptRemoteService.getOrgByOrgcode(item.getSsbmdm());
+            if (vo != null) {
+                bm.setSsbmdm(vo.getDeptcode());
+                bm.setSsbm(vo.getDeptname());
+                bm.setSsbmid(vo.getDeptid());
+                bm.setSsxgaj(vo.getFxjname());
+                bm.setSsxgajid(vo.getFxjid());
+                bm.setSsxgajdm(vo.getFxjcode());
+                bm.setSssgaj(vo.getDszname());
+                bm.setSssgajdm(vo.getDszcode());
+                bm.setSssgajid(vo.getDszid());
+            }
+            bm.setXtSjly("1");
+            this.tbYsGajgGlbmMapper.insert(bm);
+        });
+        gajg.setXtSjly("1");
+        // 添加关联部门
+        this.baseMapper.updateEntity(gajg);
+        // 添加任务提醒
+        UserInfo user = UserInfoManager.get();
+        this.addTask(gajg, user);
+    }
+
+    // 添加任务提醒功能
+    private void addTask(TbYsGajg gajg, UserInfo user) {
+        TbRwTaskDto dto = new TbRwTaskDto();
+        String rwmc = "公安机关位置变更提醒";
+        String rwnr = gajg.getGajgmc() + "信息发生变更，请知晓！！";
+        dto.setRwmc(rwmc).setRwnr(rwnr)
+                .setRwjsdx("02").setSfaqwc("0").setRwlx("1").setRwxl("06").setRwjjcd("3")
+                .setRwms("2").setSsbmdm(gajg.getSsbmdm()).setSsbm(gajg.getSsbm()).setRwxxlx("WZBG").setSsbmid(gajg.getSsbmid());
+        if (user != null) {
+            dto.setCjrid(String.valueOf(user.getUserId())).setCjrxm(user.getUserName())
+                    .setCjrsfzh(user.getIdEntityCard()).setSsbm(user.getDeptName()).setSsbmdm(String.valueOf(user.getDeptId()));
+        } else {
+            dto.setCjrid("-1").setCjrxm("系统").setCjrsfzh("000000");
+        }
+        // 添加执行人
+        List<TbRwTaskUserDto> userDtoList = new ArrayList<>();
+        TbRwTaskUserDto userDto = new TbRwTaskUserDto();
+        userDto.setRwzflx("02").setJsbmdm(gajg.getSssgajdm()).setJsbmmc(gajg.getSssgaj());
+        userDtoList.add(userDto);
+        dto.setUserDtoList(userDtoList);
+        this.tbRwzxAdaptRemoteService.addRw(dto);
+    }
+
+    @Override
+    public List<TbYsGajgGlbmDto> getGlbmList(String id) {
+        List<TbYsGajgGlbm> list = this.tbYsGajgGlbmMapper.selectList(
+                new LambdaQueryWrapper<TbYsGajgGlbm>()
+                        .eq(TbYsGajgGlbm::getXtSjzt, "1")
+                        .eq(TbYsGajgGlbm::getGajgId, id)
+        );
+        List<TbYsGajgGlbmDto> rList = new ArrayList<>();
+        list.forEach(item -> {
+            TbYsGajgGlbmDto dto = new TbYsGajgGlbmDto();
+            BeanUtils.copyProperties(item, dto);
+            rList.add(dto);
+        });
+        return rList;
+    }
+
+    @Override
+    public List<TbYsGajgGlbmVo> getGajgList(TbYsGajgQuery dto) {
+        List<String> ysxlList = StringUtils.isEmpty(dto.getYsxl()) ? null : Arrays.asList(dto.getYsxl().split(","));
+        Map<String, Object> map = new HashMap<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        map.put("dto", dto);
+//        UserInfo user = UserInfoManager.getUser();
+//        String useSql = user != null ? PermissionsUtil.createSql("", user) : "";
+//        map.put("useSql", useSql);
+        map.put("ysxlList", ysxlList);
+        List<TbYsGajg> list = this.baseMapper.getList(map);
+        List<TbYsGajgGlbmVo> voList = new ArrayList<>();
+        list.forEach(item -> {
+            TbYsGajgGlbmVo vo = new TbYsGajgGlbmVo();
+            BeanUtils.copyProperties(item, vo);
+            // 查询关联部门
+            List<TbYsGajgGlbmDto> glbmList = this.getGlbmList(item.getId());
+            List<String> glbms = (glbmList != null && glbmList.size() != 0) ?
+                    glbmList.stream().map(TbYsGajgGlbmDto::getSsbmid).collect(Collectors.toList()) : new ArrayList<>();
+            glbms.add(item.getSsbmid());
+            vo.setGlbmSsbmdmList(glbms);
+            voList.add(vo);
+        });
+        return voList;
+    }
+
+    private void deleteGlbm(String id) {
+        this.tbYsGajgGlbmMapper.deleteGlbm(id);
+    }
+
+    @Override
+    public int insertEntity(TbYsGajgDto dto) {
+        TbYsGajg gajg = new TbYsGajg();
+        BeanUtils.copyProperties(dto, gajg);
+        gajg.setId(UUIDGenerator.getUUID());
+        if (dto.getJd() != null && dto.getWd() != null) {
+            gajg.setZb(JtsUtils.getPoint(gajg.getJd(), gajg.getWd()));
+            gajg.setZbhash(GeoHashKit.encode(gajg.getJd(), gajg.getWd()));
+        }
+        if (dto.getQy() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+                if (list.size() > 0) {
+                    gajg.setDtm(JtsUtils.getPolygon(list));
+                }
+            }
+        }
+        if (dto.getQy1() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy1();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm1(JtsUtils.getPolygon(list));
+            }
+        }
+        if (dto.getQy2() != null) {
+            ArrayList<BigDecimal[]> list = new ArrayList<>();
+            List<BigDecimal> qw = dto.getQy2();
+            if (!CollectionUtils.isEmpty(qw)) {
+                for (int i = 0; i < qw.size(); i++) {
+                    if (i != qw.size() - 1 && i % 2 == 0) {
+                        BigDecimal[] des = new BigDecimal[2];
+                        des[0] = qw.get(i);
+                        des[1] = qw.get(i + 1);
+                        list.add(des);
+                    }
+                }
+            }
+            if (list.size() > 0) {
+                gajg.setDtm2(JtsUtils.getPolygon(list));
+            }
+        }
+        gajg.setJsnr(dto.getGajgmc() + " " + dto.getGajgjc() + " " + dto.getWzXz() + " " + dto.getWzBc());
+        gajg.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            gajg.setSsbm(dept.getDeptname());
+            gajg.setSsbmid(dept.getDeptid());
+            gajg.setSsbmdm(dept.getDeptcode());
+            gajg.setSsxgajdm(dept.getFxjcode());
+            gajg.setSsxgajid(dept.getFxjid());
+            gajg.setSsxgaj(dept.getFxjname());
+            gajg.setSssgaj(dept.getDszname());
+            gajg.setSssgajdm(dept.getDszcode());
+            gajg.setSssgajid(dept.getDszid());
+        }
+        return this.baseMapper.insertEntity(gajg);
+    }
+
+    @Override
+    public void updateEntity(TbYsGajgDto dto) {
+        TbYsGajg gajg = new TbYsGajg();
+        BeanUtils.copyProperties(dto, gajg);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            gajg.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            gajg.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        // 一分钟范围
+        ArrayList<BigDecimal[]> list = new ArrayList<>();
+        List<BigDecimal> qw = dto.getQy();
+        if (!CollectionUtils.isEmpty(qw)) {
+            for (int i = 0; i < qw.size(); i++) {
+                if (i != qw.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw.get(i);
+                    des[1] = qw.get(i + 1);
+                    list.add(des);
+                }
+            }
+        }
+        if (list.size() > 0) {
+            gajg.setDtm(JtsUtils.getPolygon(list));
+        }
+        // 三分钟范围
+        ArrayList<BigDecimal[]> list1 = new ArrayList<>();
+        List<BigDecimal> qw1 = dto.getQy1();
+        if (!CollectionUtils.isEmpty(qw1)) {
+            for (int i = 0; i < qw1.size(); i++) {
+                if (i != qw1.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw1.get(i);
+                    des[1] = qw1.get(i + 1);
+                    list1.add(des);
+                }
+            }
+        }
+        if (list1.size() > 0) {
+            gajg.setDtm1(JtsUtils.getPolygon(list1));
+        }
+        // 三分钟范围
+        ArrayList<BigDecimal[]> list2 = new ArrayList<>();
+        List<BigDecimal> qw2 = dto.getQy1();
+        if (!CollectionUtils.isEmpty(qw2)) {
+            for (int i = 0; i < qw2.size(); i++) {
+                if (i != qw2.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw2.get(i);
+                    des[1] = qw2.get(i + 1);
+                    list2.add(des);
+                }
+            }
+        }
+        if (list2.size() > 0) {
+            gajg.setDtm2(JtsUtils.getPolygon(list2));
+        }
+        this.baseMapper.updateEntity(gajg);
+        gajg = this.baseMapper.getInfoById(gajg.getId());
+        gajg.setJsnr(gajg.getGajgmc() + " " + gajg.getGajgjc() + " " + gajg.getWzXz() + " " + gajg.getWzBc());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByDeptId(dto.getSsbmid());
+        if (dept != null) {
+            gajg.setSsbm(dept.getDeptname());
+            gajg.setSsbmid(dept.getDeptid());
+            gajg.setSsbmdm(dept.getDeptcode());
+            gajg.setSsxgajdm(dept.getFxjcode());
+            gajg.setSsxgajid(dept.getFxjid());
+            gajg.setSsxgaj(dept.getFxjname());
+            gajg.setSssgaj(dept.getDszname());
+            gajg.setSssgajdm(dept.getDszcode());
+            gajg.setSssgajid(dept.getDszid());
+        }
+        this.baseMapper.updateEntity(gajg);
+    }
+
+    @Override
+    public void updateEntityByLY(TbYsGajgDto dto) {
+        TbYsGajg gajg = this.baseMapper.selectOne(new LambdaQueryWrapper<TbYsGajg>()
+                .eq(TbYsGajg::getLyid, dto.getLyid())
+                .eq(TbYsGajg::getLybm, dto.getLybm()));
+        dto.setId(gajg.getId());
+        BeanUtils.copyProperties(dto, gajg);
+        if (dto.getJd() != null && dto.getWd() != null) {
+            gajg.setZb(JtsUtils.getPoint(dto.getJd(), dto.getWd()));
+            gajg.setZbhash(GeoHashKit.encode(dto.getJd(), dto.getWd()));
+        }
+        // 一分钟圈层
+        ArrayList<BigDecimal[]> list = new ArrayList<>();
+        List<BigDecimal> qw = dto.getQy();
+        if (!CollectionUtils.isEmpty(qw)) {
+            for (int i = 0; i < qw.size(); i++) {
+                if (i != qw.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw.get(i);
+                    des[1] = qw.get(i + 1);
+                    list.add(des);
+                }
+            }
+        }
+        if (list.size() > 0) {
+            gajg.setDtm(JtsUtils.getPolygon(list));
+        }
+        // 三分钟圈层
+        ArrayList<BigDecimal[]> list1 = new ArrayList<>();
+        List<BigDecimal> qw1 = dto.getQy1();
+        if (!CollectionUtils.isEmpty(qw1)) {
+            for (int i = 0; i < qw1.size(); i++) {
+                if (i != qw1.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw1.get(i);
+                    des[1] = qw1.get(i + 1);
+                    list1.add(des);
+                }
+            }
+        }
+        if (list1.size() > 0) {
+            gajg.setDtm1(JtsUtils.getPolygon(list1));
+        }
+        // 五分钟圈层
+        ArrayList<BigDecimal[]> list2 = new ArrayList<>();
+        List<BigDecimal> qw2 = dto.getQy2();
+        if (!CollectionUtils.isEmpty(qw2)) {
+            for (int i = 0; i < qw2.size(); i++) {
+                if (i != qw2.size() - 1 && i % 2 == 0) {
+                    BigDecimal[] des = new BigDecimal[2];
+                    des[0] = qw2.get(i);
+                    des[1] = qw2.get(i + 1);
+                    list2.add(des);
+                }
+            }
+        }
+        if (list2.size() > 0) {
+            gajg.setDtm2(JtsUtils.getPolygon(list2));
+        }
+        this.baseMapper.updateEntity(gajg);
+        gajg = this.baseMapper.getInfoById(gajg.getId());
+        gajg.setJsnr(gajg.getGajgmc() + " " + gajg.getGajgjc() + " " + gajg.getWzXz() + " " + gajg.getWzBc());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            gajg.setSsbm(dept.getDeptname());
+            gajg.setSsbmid(dept.getDeptid());
+            gajg.setSsbmdm(dept.getDeptcode());
+            gajg.setSsxgajdm(dept.getFxjcode());
+            gajg.setSsxgajid(dept.getFxjid());
+            gajg.setSsxgaj(dept.getFxjname());
+            gajg.setSssgaj(dept.getDszname());
+            gajg.setSssgajdm(dept.getDszcode());
+            gajg.setSssgajid(dept.getDszid());
+        }
+        this.baseMapper.updateEntity(gajg);
+    }
+
+    @Override
+    public TbYsGajgVo getInfo(String id) {
+        TbYsGajg item = this.baseMapper.getInfoById(id);
+        TbYsGajgVo vo = null;
+        if (item != null) {
+            vo = new TbYsGajgVo();
+            BeanUtils.copyProperties(item, vo);
+            vo.setDtm(JtsUtils.decodePolygon(item.getDtm()));
+            vo.setDtm1(JtsUtils.decodePolygon(item.getDtm1()));
+            vo.setDtm2(JtsUtils.decodePolygon(item.getDtm2()));
+            vo.setZb(new BigDecimal[]{item.getJd(), item.getWd()});
+            vo.setGlbmDtoList(
+                    this.tbYsGajgGlbmMapper.selectList(
+                            new LambdaQueryWrapper<TbYsGajgGlbm>()
+                                    .eq(TbYsGajgGlbm::getGajgId, vo.getId())
+                                    .eq(TbYsGajgGlbm::getXtSjzt, "1")
+                    )
+            );
+        }
+        return vo;
+    }
+
+    @Override
+    public IPage<TbYsGajgVo> getPageList(TbYsGajgQuery dto) {
+        List<String> ysxlList = StringUtils.isEmpty(dto.getYsxl()) ? null : Arrays.asList(dto.getYsxl().split(","));
+        IPage<TbYsGajgVo> page;
+        Map<String, Object> map = new HashMap<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(), null));
+        map.put("dto", dto);
+//        UserInfo user = UserInfoManager.getUser();
+//        String useSql = user != null ? PermissionsUtil.createSql("", user) : "";
+//        map.put("useSql", useSql);
+        map.put("ysxlList", ysxlList);
+        if (dto.getPageNum() != null && dto.getPageSize() != null) {
+            page = new Page<>(dto.getPageNum(), dto.getPageSize());
+            map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+            map.put("pageSize", dto.getPageSize());
+            int count = this.baseMapper.getCount(map);
+            List<TbYsGajg> list = this.baseMapper.getListPage(map);
+            List<TbYsGajgVo> voList = new ArrayList<>();
+            list.forEach(item -> {
+                TbYsGajgVo vo = new TbYsGajgVo();
+                BeanUtils.copyProperties(item, vo);
+                vo.setDtm(JtsUtils.decodePolygon(item.getDtm()));
+                vo.setDtm1(JtsUtils.decodePolygon(item.getDtm1()));
+                vo.setDtm2(JtsUtils.decodePolygon(item.getDtm2()));
+                vo.setZb(new BigDecimal[]{item.getJd(), item.getWd()});
+                voList.add(vo);
+            });
+            page.setTotal(count);
+            page.setRecords(voList);
+        } else {
+            page = new Page<>();
+            List<TbYsGajg> list = this.baseMapper.getList(map);
+            List<TbYsGajgVo> voList = new ArrayList<>();
+            list.forEach(item -> {
+                TbYsGajgVo vo = new TbYsGajgVo();
+                BeanUtils.copyProperties(item, vo);
+                vo.setDtm(JtsUtils.decodePolygon(item.getDtm()));
+                vo.setDtm1(JtsUtils.decodePolygon(item.getDtm1()));
+                vo.setDtm2(JtsUtils.decodePolygon(item.getDtm2()));
+                vo.setZb(new BigDecimal[]{item.getJd(), item.getWd()});
+                voList.add(vo);
+            });
+            page.setRecords(voList);
+        }
+        return page;
+    }
+
+    @Override
+    public void delEntity(String id) {
+        TbYsGajg item = this.baseMapper.getInfoById(id);
+        if (item != null) {
+            item.setXtScbz("1");
+        }
+        this.baseMapper.updateEntity(item);
+    }
+
+    @Override
+    public void delEntity(TbYsGajgDto dto) {
+        TbYsGajg tbYsGajg = this.baseMapper.selectOne(new LambdaQueryWrapper<TbYsGajg>()
+                .eq(TbYsGajg::getLyid, dto.getLyid())
+                .eq(TbYsGajg::getLybm, dto.getLybm()));
+        if (tbYsGajg != null) {
+            tbYsGajg.setXtScbz("1");
+        }
+        this.baseMapper.updateEntity(tbYsGajg);
+    }
+
+    @Override
+    public TbYsGajgVo getGajgByJwd(TbYsGajgByJwdDto dto) {
+        Map<String, Object> map = new HashMap<>();
+        TbYsGajgQuery query = new TbYsGajgQuery();
+        query.setYsdl(dto.getYsdl());
+        query.setYszl(dto.getYszl());
+        query.setYsxl(dto.getYsxl());
+        map.put("dto", query);
+        List<TbYsGajg> list = this.baseMapper.getList(map);
+        for (TbYsGajg item : list) {
+            List<BigDecimal[]> jwdList = JtsUtils.decodePolygon(item.getDtm());
+            Coordinate[] coordinates = new Coordinate[jwdList.size()];
+            for (int i = 0; i < jwdList.size(); i++) {
+                BigDecimal[] jwd = jwdList.get(i);
+                Coordinate coor = new Coordinate();
+                coor.x = jwd[0].doubleValue();
+                coor.y = jwd[1].doubleValue();
+                coordinates[i] = coor;
+            }
+            boolean flag = Kit.isInGeometry(coordinates, dto.getJd() + "," + dto.getWd());
+            if (flag) {
+                TbYsGajgVo vo = new TbYsGajgVo();
+                BeanUtils.copyProperties(item, vo);
+                return vo;
+            }
+        }
+        return null;
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsRyServiceImpl.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsRyServiceImpl.java
new file mode 100644
index 0000000..6876a1f
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsRyServiceImpl.java
@@ -0,0 +1,134 @@
+package com.mosty.yszx.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mosty.base.model.dto.yszx.TbYsRyDto;
+import com.mosty.base.model.entity.yszx.TbYsRy;
+import com.mosty.base.model.entity.yszx.TbYsRyBq;
+import com.mosty.base.model.entity.yszx.TbYsRyDh;
+import com.mosty.base.model.vo.yszx.*;
+import com.mosty.yszx.mapper.TbYsRyBqMapper;
+import com.mosty.yszx.mapper.TbYsRyDhMapper;
+import com.mosty.yszx.mapper.TbYsRyMapper;
+import com.mosty.yszx.service.TbYsRyService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class TbYsRyServiceImpl extends ServiceImpl<TbYsRyMapper, TbYsRy>
+        implements TbYsRyService {
+
+    private final TbYsRyDhMapper tbYsRyDhMapper;
+    private final TbYsRyBqMapper tbYsRyBqMapper;
+
+    @Override
+    public TbYsRyVo getRyInfo(String sfzh) {
+        TbYsRy ry = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsRy>()
+                        .eq(TbYsRy::getZjhm, sfzh)
+                        .eq(TbYsRy::getXtSjzt, "1")
+        );
+        if (ry != null) {
+            TbYsRyVo vo = new TbYsRyVo();
+            BeanUtils.copyProperties(ry, vo);
+            // 查询人员电话
+            List<TbYsRyDh> dhList = this.tbYsRyDhMapper.selectList(
+                    new LambdaQueryWrapper<TbYsRyDh>()
+                            .eq(TbYsRyDh::getRyid, ry.getId())
+                            .eq(TbYsRyDh::getXtSjzt, "1")
+            );
+            List<TbYsRyDhVo> dhVos = new ArrayList<>();
+            dhList.forEach(dh -> {
+                TbYsRyDhVo dhVo = new TbYsRyDhVo();
+                BeanUtils.copyProperties(dh, dhVo);
+                dhVos.add(dhVo);
+            });
+            vo.setDhList(dhVos);
+            // 查询人员标签
+            List<TbYsRyBq> bqList = this.tbYsRyBqMapper.selectList(
+                    new LambdaQueryWrapper<TbYsRyBq>()
+                            .eq(TbYsRyBq::getRyid, ry.getId())
+                            .eq(TbYsRyBq::getXtSjzt, "1")
+            );
+            List<TbYsRyBqVo> bqVos = new ArrayList<>();
+            bqList.forEach(bq -> {
+                TbYsRyBqVo bqVo = new TbYsRyBqVo();
+                BeanUtils.copyProperties(bq, bqVo);
+                bqVos.add(bqVo);
+            });
+            vo.setBqList(bqVos);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public void addRyYs(TbYsRyDto dto) {
+        TbYsRy ry = new TbYsRy();
+        BeanUtils.copyProperties(dto, ry);
+        this.baseMapper.insert(ry);
+    }
+
+    @Override
+    public void updateRyYs(TbYsRyDto dto) {
+        TbYsRy ry = new TbYsRy();
+        BeanUtils.copyProperties(dto, ry);
+        this.baseMapper.updateById(ry);
+    }
+
+    @Override
+    public void updateRyBqYs(TbYsRyBqUpdateDto dto) {
+        TbYsRy ry = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsRy>()
+                        .eq(TbYsRy::getZjhm, dto.getSfzh())
+                        .eq(TbYsRy::getXtSjzt, "1")
+        );
+        if (ry != null) {
+            // 删除人员标签（新加的数据）
+            this.tbYsRyBqMapper.deleteByRyId(ry.getId());
+            // 新增人员标签
+            TbYsRyBq bq = new TbYsRyBq();
+            bq.setRyid(ry.getId());
+            bq.setZjzl("1");
+            bq.setZjhm(ry.getZjhm());
+            bq.setBqdm(dto.getBqdm());
+            bq.setBqmc(dto.getBqmc());
+            bq.setBqrq(new Date());
+            bq.setXtSjly("1");
+            this.tbYsRyBqMapper.insert(bq);
+        }
+    }
+
+    @Override
+    public void updateRyDhys(TbYsRyDhUpdateDto dto) {
+        TbYsRy ry = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsRy>()
+                        .eq(TbYsRy::getZjhm, dto.getSfzh())
+                        .eq(TbYsRy::getXtSjzt, "1")
+        );
+        if (ry != null) {
+            // 删除人员电话（新加的数据）
+            this.tbYsRyDhMapper.deleteByRyId(ry.getId());
+            for (int i = 0; i < dto.getList().size(); i++) {
+                Map<String, String> map = dto.getList().get(i);
+                // 新增人员电话
+                TbYsRyDh dh = new TbYsRyDh();
+                dh.setRyid(ry.getId());
+                dh.setZjzl("1");
+                dh.setXm(ry.getXm());
+                dh.setZjhm(ry.getZjhm());
+                dh.setLxdh(map.get("lxdh"));
+                dh.setImsi(map.get("imsi"));
+                dh.setXtSjly("1");
+                this.tbYsRyDhMapper.insert(dh);
+            }
+        }
+    }
+}
diff --git a/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsSxtServiceImpl.java b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsSxtServiceImpl.java
new file mode 100644
index 0000000..88a7e60
--- /dev/null
+++ b/mosty-yszx/src/main/java/com/mosty/yszx/service/impl/TbYsSxtServiceImpl.java
@@ -0,0 +1,370 @@
+package com.mosty.yszx.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hikvision.artemis.sdk.ArtemisHttpUtil;
+import com.mosty.base.model.dto.sjzx.TbSjSpbfDTO;
+import com.mosty.base.model.dto.yszx.Cameras;
+import com.mosty.base.model.dto.yszx.TbYsSxtDto;
+import com.mosty.base.model.entity.lzother.ZhjmxfXfqwXfqyGzdw;
+import com.mosty.base.model.entity.yszx.TbYsGajg;
+import com.mosty.base.model.entity.yszx.TbYsSxt;
+import com.mosty.base.model.query.yszx.TbYsSxtNoPageQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtPageOneQuery;
+import com.mosty.base.model.query.yszx.TbYsSxtQuery;
+import com.mosty.base.model.vo.base.DeptInfoVo;
+import com.mosty.base.model.vo.yszx.TbYsGajgQuery;
+import com.mosty.base.utils.CameraPreviewUtil;
+import com.mosty.base.utils.UUIDGenerator;
+import com.mosty.yszx.mapper.TbYsGajgMapper;
+import com.mosty.yszx.mapper.TbYsSxtMapper;
+import com.mosty.yszx.remote.TbBaseAdaptRemoteService;
+import com.mosty.yszx.remote.TbSjzxAdaptRemoteService;
+import com.mosty.yszx.service.TbYsSxtService;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+//import org.locationtech.jts.geom.Geometry;
+//import org.locationtech.jts.io.WKTReader;
+//import org.geotools.geometry.jts.JTSFactoryFinder;
+
+/**
+ * @author dw
+ * @since 2022/7/19
+ **/
+@Service
+@AllArgsConstructor
+public class TbYsSxtServiceImpl extends ServiceImpl<TbYsSxtMapper, TbYsSxt> implements TbYsSxtService {
+
+    private final TbSjzxAdaptRemoteService tbSjzxAdaptRemoteService;
+    private final TbBaseAdaptRemoteService tbBaseAdaptRemoteService;
+    private final TbYsGajgMapper tbYsGajgMapper;
+
+    @Override
+    public int insertEntity(TbYsSxtDto dto) {
+        TbYsSxt sxt = new TbYsSxt();
+        BeanUtils.copyProperties(dto, sxt);
+        sxt.setId(UUIDGenerator.getUUID());
+        sxt.setJsnr(sxt.getSbbh() + " " + sxt.getSbmc() + " " + sxt.getCsmc() + " " + sxt.getDzmc());
+        sxt.setXtSjly("1");
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            sxt.setSsbmdm(dept.getDeptcode());
+            sxt.setSsbmid(dept.getDeptid());
+            sxt.setSsbm(dept.getDeptname());
+            sxt.setSsxgaj(dept.getFxjname());
+            sxt.setSsxgajid(dept.getFxjid());
+            sxt.setSsxgajdm(dept.getFxjcode());
+            sxt.setSssgaj(dept.getDszname());
+            sxt.setSssgajid(dept.getDszid());
+            sxt.setSssgajdm(dept.getDszid());
+        }
+        return this.baseMapper.insertEntity(sxt);
+    }
+
+    @Override
+    public void updateEntity(TbYsSxtDto dto) {
+        TbYsSxt sxt = new TbYsSxt();
+        BeanUtils.copyProperties(dto, sxt);
+
+        this.baseMapper.updateEntity(sxt);
+        sxt = this.baseMapper.getInfoById(sxt.getId());
+        sxt.setJsnr(sxt.getSbbh() + " " + sxt.getSbmc() + " " + sxt.getCsmc() + " " + sxt.getDzmc());
+        DeptInfoVo dept = this.tbBaseAdaptRemoteService.getOrgByOrgcode(dto.getSsbmdm());
+        if (dept != null) {
+            sxt.setSsbmdm(dept.getDeptid());
+            sxt.setSsbm(dept.getDeptname());
+            sxt.setSsxgaj(dept.getFxjname());
+            sxt.setSsxgajdm(dept.getFxjid());
+            sxt.setSssgaj(dept.getDszname());
+            sxt.setSssgajdm(dept.getDszid());
+        }
+        this.baseMapper.updateEntity(sxt);
+    }
+
+    @Override
+    public IPage<TbYsSxt> getPageList(TbYsSxtQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(),null));
+        map.put("pageIndex", (dto.getPageNum() - 1) * dto.getPageSize());
+        map.put("pageSize", dto.getPageSize());
+        map.put("dto", dto);
+
+        int count = this.baseMapper.getCount(map);
+        List<TbYsSxt> list = this.baseMapper.getPageList(map);
+        IPage<TbYsSxt> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        page.setTotal(count);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public List<TbYsSxt> getList(TbYsSxtNoPageQuery dto) {
+        Map<String, Object> map = new HashMap<>();
+        dto.setSsbmdm(this.tbBaseAdaptRemoteService.getSsbm(dto.getSsbmdm(),null));
+        map.put("dto", dto);
+        return this.baseMapper.getList(map);
+    }
+
+    @Override
+    public TbYsSxt getInfo(String id) {
+        return this.baseMapper.getInfoById(id);
+    }
+
+    @Override
+    public void delEntity(String id) {
+        TbYsSxt sxt = this.baseMapper.getInfoById(id);
+        if (sxt != null) {
+            sxt.setXtScbz("1");
+            this.baseMapper.updateEntity(sxt);
+        }
+    }
+
+    @Override
+    public List<TbYsSxt> getSjList(String jd, String wd, String sjid) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("jd", jd);
+        map.put("wd", wd);
+        List<TbYsSxt> tbYsSxt = this.baseMapper.getSjList(map);
+        if (!CollectionUtils.isEmpty(tbYsSxt)) {
+            for (TbYsSxt tb : tbYsSxt) {
+                TbSjSpbfDTO tbSjSpbf = new TbSjSpbfDTO();
+                tbSjSpbf.setId(UUIDGenerator.getUUID());
+                tbSjSpbf.setSjId(sjid);
+                tbSjSpbf.setSxtId(tb.getId());
+                tbSjSpbf.setBfkssj(new Date());
+                tbSjSpbf.setSsbm(tb.getSsbm());
+                tbSjSpbf.setSsbmdm(tb.getSsbmdm());
+                tbSjSpbf.setSsxgaj(tb.getSsxgaj());
+                tbSjSpbf.setSsxgajdm(tb.getSsxgajdm());
+                tbSjSpbf.setSssgaj(tb.getSssgaj());
+                tbSjSpbf.setSssgajdm(tb.getSssgajdm());
+                tbSjzxAdaptRemoteService.tbSjSpbfAdd(tbSjSpbf);
+            }
+        }
+        return tbYsSxt;
+    }
+
+    @Override
+    public int insertEntity(TbYsSxt sxt) {
+        return this.baseMapper.insertEntity(sxt);
+    }
+
+    @Override
+    public TbYsSxt queryBySjlyid(String sjlyid) {
+        return this.baseMapper.queryBySjlyid(sjlyid);
+    }
+
+    @Override
+    public TbYsSxtDto getInfoBySbbh(String sbbh) {
+        TbYsSxt sxt = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsSxt>()
+                        .eq(TbYsSxt::getSbbh, sbbh)
+                        .last(" limit 1")
+        );
+        if (sxt != null) {
+            TbYsSxtDto dto = new TbYsSxtDto();
+            BeanUtils.copyProperties(sxt, dto);
+            return dto;
+        }
+        return null;
+    }
+
+    @Override
+    public List<String> getSxtBhList(List<String> ids) {
+        List<String> rList = new ArrayList<>();
+        ids.forEach(id -> {
+            TbYsSxt sxt = this.baseMapper.selectOne(
+                    new LambdaQueryWrapper<TbYsSxt>()
+                            .eq(TbYsSxt::getXtSjzt, "1")
+                            .eq(TbYsSxt::getSbbh, id)
+                            .last("limit 1")
+            );
+            if (sxt == null) {
+                rList.add(id);
+            }
+        });
+        return rList;
+    }
+
+    @Override
+    public void addLzGzy(ZhjmxfXfqwXfqyGzdw dto) {
+        TbYsSxt sxt = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsSxt>()
+                        .eq(TbYsSxt::getXtSjzt, "1")
+                        .eq(TbYsSxt::getSbbh, dto.getSbbh())
+                        .last(" limit 1")
+        );
+        if (sxt != null) return;
+        sxt = new TbYsSxt();
+        sxt.setSjlyid(dto.getId());
+        sxt.setJkdbgbh(dto.getSbbh());
+        sxt.setSbbh(dto.getSbbh());
+        sxt.setSbmc(dto.getSbmc());
+        sxt.setCsmc(dto.getCsmc());
+        sxt.setIpdz(dto.getIpdz());
+        sxt.setIpv6dz(dto.getIpv6dz());
+        sxt.setJd(dto.getDqjd());
+        sxt.setWd(dto.getDqwd());
+        sxt.setXzqhdm(dto.getAzddXzqhdm());
+        sxt.setDzmc(StringUtils.isEmpty(dto.getAzddDzmc()) ? dto.getSbmc() : dto.getAzddDzmc());
+        sxt.setSblxdm(dto.getGzsblxdm());
+        sxt.setJsfxdm(dto.getJsfxdm());
+        sxt.setJsqysm(dto.getJsqysm());
+        sxt.setSxjwzlxdm(dto.getSxjwzlxdm());
+        sxt.setSxjytdm(dto.getSxjytdm());
+        sxt.setSbzt("1");
+        sxt.setXtSjly("1");
+        sxt.setSblx("01");
+        sxt.setJsnr(sxt.getSbbh() + " " + sxt.getSbmc() + " " + sxt.getCsmc() + " " + sxt.getDzmc());
+        sxt.setSsxgaj(dto.getSsfxjmc());
+        sxt.setSsxgajdm(dto.getSsfxjdm());
+        sxt.setSssgaj(dto.getSsdszmc());
+        sxt.setSssgajdm(dto.getSsdszdm());
+        // TODO　计算所属辖区位置
+        this.baseMapper.insertEntity(sxt);
+    }
+
+    @Override
+    public TbYsSxtDto selectGzy(TbYsSxtPageOneQuery dto) {
+        TbYsSxt sxt = this.baseMapper.selectOne(
+                new LambdaQueryWrapper<TbYsSxt>()
+                        .eq(TbYsSxt::getSbmc, dto.getSbmc())
+                        .eq(TbYsSxt::getJd, dto.getJd())
+                        .eq(TbYsSxt::getWd, dto.getWd())
+                        .eq(TbYsSxt::getXtSjzt, "1")
+                        .last(" limit 1")
+        );
+        if (sxt != null) {
+            TbYsSxtDto vo = new TbYsSxtDto();
+            BeanUtils.copyProperties(sxt, vo);
+            return vo;
+        }
+        return null;
+    }
+
+    @Override
+    public void updateJwd() {
+        //获取经纬度为空为0数据
+        LambdaQueryWrapper<TbYsSxt> wp = new LambdaQueryWrapper<>();
+        wp.ne(TbYsSxt::getJd, 0).ne(TbYsSxt::getWd, 0);
+        wp.notLike(TbYsSxt::getSsbm, "派出所").or(w -> w.isNull(TbYsSxt::getSsbm));
+        List<TbYsSxt> tbYsSxts = this.baseMapper.selectList(wp);
+        if (!CollectionUtils.isEmpty(tbYsSxts)) {
+            Map<String, Object> map = new HashMap<>();
+            TbYsGajgQuery query = new TbYsGajgQuery();
+            query.setGajgmc("派出所");
+            map.put("dto", query);
+            List<String> ysxlList = new ArrayList<String>() {{
+                this.add("001001004");
+            }};
+            map.put("ysxlList", ysxlList);
+            List<TbYsGajg> tbYsGajgs = this.tbYsGajgMapper.getList(map);
+//            if (!CollectionUtils.isEmpty(tbYsGajgs)) {
+//                for (TbYsSxt tb : tbYsSxts) {
+//                    if (tb.getJd() != null || tb.getWd() != null) {
+//                        for (TbYsGajg tbYsGajg : tbYsGajgs) {
+//                            if (!StringUtils.isEmpty(tbYsGajg.getDtm())) {
+//                                String wktPoly = tbYsGajg.getDtm().toString();
+//                                WKTReader reader = new WKTReader(JTSFactoryFinder.getGeometryFactory());
+//                                Geometry geometry;
+//                                try {
+//                                    geometry = reader.read(wktPoly);
+//                                    Geometry geometryOut = reader.read("POINT(" + tb.getJd() + " " + tb.getWd() + ")");
+//                                    boolean isSsd = geometry.contains(geometryOut);
+//                                    if (isSsd) {
+//                                        tb.setSsbm(tbYsGajg.getGajgjc());
+//                                        tb.setSsbmdm(tbYsGajg.getSsbmdm());
+//                                        tb.setSsbmid(tbYsGajg.getSsbmid());
+//                                        TbYsSxtDto dto = new TbYsSxtDto();
+//                                        BeanUtils.copyProperties(tb, dto);
+//                                        this.updateEntity(dto);
+//                                        break;
+//                                    }
+//                                } catch (Exception e) {
+//                                    e.printStackTrace();
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+        }
+    }
+
+
+    @Override
+    public void updateLzGzy() {
+        this.baseMapper.deleteAll();
+        saveGzy(1);
+
+    }
+
+    public void saveGzy(Integer pageNo) {
+        final String getCamsApi = "/api/resource/v1/cameras";
+        JSONObject jsonBody = new JSONObject();
+        jsonBody.put("pageNo", pageNo);
+        jsonBody.put("pageSize", 1000);
+        jsonBody.put("treeCode", 0);
+        String result = CameraPreviewUtil.getCameraPreviewURL(getCamsApi, jsonBody);// post请求application/json类型参数
+        if (!StringUtils.isEmpty(result)) {
+            Cameras cameras = JSONObject.parseObject(result, Cameras.class);
+            if (cameras.getCode().equals("0") && cameras.getData() != null) {
+                List<Cameras.listInfo> list = cameras.getData().getList();
+                if (!CollectionUtils.isEmpty(list)) {
+                    list.forEach(v -> {
+                                if (!StringUtils.isEmpty(v.getCapabilitySetName()) && v.getCapabilitySetName().indexOf("Face") < 0) {
+//                        if (v.getStatus() == 1) {
+                                    ZhjmxfXfqwXfqyGzdw entity = new ZhjmxfXfqwXfqyGzdw();
+                                    entity.setId(UUIDGenerator.getUUID());
+                                    entity.setSbbh(v.getGbIndexCode());
+                                    entity.setSbmc(v.getName());
+                                    entity.setCsmc("海康威视");
+                                    entity.setDqjd(StringUtils.isEmpty(v.getLongitude()) ? null : new BigDecimal(v.getLongitude()));
+                                    entity.setDqwd(StringUtils.isEmpty(v.getLatitude()) ? null : new BigDecimal(v.getLatitude()));
+//                        entity.setAzddDzmc(v.getName());
+                                    entity.setGzsblxdm("01");
+                                    entity.setCjsjlxdm("01");
+                                    entity.setSxjytdm("1");
+                                    entity.setSsdszmc("四川省雅安市公安局");
+                                    entity.setSsdszdm("511800000000");
+                                    entity.setSsstmc("四川省公安厅");
+                                    entity.setSsstdm("510000000000");
+                                    if (!StringUtils.isEmpty(v.getGbIndexCode()) && v.getGbIndexCode().length() >= 6) {
+                                        String xzqh = v.getGbIndexCode().substring(0, 6);
+                                        entity.setAzddXzqhdm(xzqh);
+                                        switch (xzqh) {
+                                            case "511825":
+                                                entity.setSsfxjmc("四川省雅安市天全县公安局");
+                                                entity.setSsfxjdm(xzqh + "000000");
+                                                break;
+                                        }
+                                    }
+                                    if (!StringUtils.isEmpty(entity.getSsfxjmc())) {
+                                        this.addLzGzy(entity);
+                                    }
+//                        }
+                                }
+                            }
+                    );
+
+                }
+            }
+            Integer page = (int) Math.ceil((double) cameras.getData().getTotal() / (double) cameras.getData().getPageSize());
+            System.out.println(pageNo);
+            if (page > pageNo) {
+                this.saveGzy(pageNo + 1);
+            }
+        }
+    }
+
+}
diff --git a/mosty-yszx/src/main/resources/application.yml b/mosty-yszx/src/main/resources/application.yml
new file mode 100644
index 0000000..8368f4c
--- /dev/null
+++ b/mosty-yszx/src/main/resources/application.yml
@@ -0,0 +1,75 @@
+ribbon:
+  ReadTimeout: 600000
+  ConnectTimeout: 600000
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    serialization:
+      write-dates-as-timestamps: false
+    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.200.131:3306/mosty_yszx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: mosty888
+    hikari:
+      minimum-idle: 10      # ??????????10???0???maximum-pool-size??????maximum-pool-size
+      maximum-pool-size: 20 # ??????????0????????10??????1?????minimum-idle??
+      idle-timeout: 500000  # ????????????600000?10????????max-lifetime?max-lifetime>0??????0????0???10???????10??
+      max-lifetime: 540000  # ????????????0???30??????????30??.?????mysql????????
+      connection-timeout: 60000 # ????????????250????????????30?
+      connection-test-query: SELECT 1 # ???????????????
+  # Redis数据库索引（默认为0）
+  redis:
+    database: 8
+    # Redis服务器地址
+    host: 192.168.200.131
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password: mosty888
+    # 连接超时时间（毫秒）
+    timeout: 2000
+    jedis:
+      pool:
+        max-active: 50
+
+swagger:
+  host: 80.155.0.84
+  port: 8018
+
+mybatis-plus:
+  global-config:
+    db-config:
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+magic-api:
+  web: /magic/web
+  #配置文件存储位置。当以classpath开头时，为只读模式
+  resource:
+    #    location: /data/magic-api
+    type: database
+    table-name: magic_api  # 数据库中的表名
+    prefix: /magic-api  # 前缀
+    datasource:
+  response-code:
+    success: 10000
+exclude:
+  pathPatterns:
+    swagger:
+      - /swagger-resources/**
+      - /webjars/**
+      - /v2/**
+      - /swagger-ui.html/**
+      - /docs.html/**
+
+config:
+  orgCode: 510600000000
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/bootstrap.yml b/mosty-yszx/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..42a7f06
--- /dev/null
+++ b/mosty-yszx/src/main/resources/bootstrap.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8018
+  servlet:
+    context-path: /mosty-yszx/
+spring:
+  application:
+    name: mosty-yszx
+  cloud:
+    nacos:
+      discovery:
+        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
+        server-addr: 192.168.200.131:8848
+        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+
+
+# 开启健康监控
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    auditevents:
+      enabled: true
+
+#swagger:
+#  enable: true
+#  title: 基础微服务
+#  version: 1.0.0
+#  name: 基础微服务
+#  url: ''
+#  email: ''
+
+# 日志
+#logging:
+#  file: /application/applogs/admin.log
+
diff --git a/mosty-yszx/src/main/resources/logback-spring.xml b/mosty-yszx/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..3658ef5
--- /dev/null
+++ b/mosty-yszx/src/main/resources/logback-spring.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <jmxConfigurator/>
+    <property name="PROJECT_NAME" value="msxf-retail-sort" />
+    <property name="LOG_FILE_INFO" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-info.log" />
+    <property name="LOG_FILE_WARN" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-warn.log" />
+    <property name="LOG_FILE_ERR" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/msxf-retail-sort-error.log" />
+    <property name="LOG_BUSINESS" value="${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/business/business-2de.log"/>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <contextName>${PROJECT_NAME}</contextName>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="LOG_FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_INFO}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_INFO}-7de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_WARN"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>WARN</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_WARN}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_WARN}-30de.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>1024MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <appender name="LOG_FILE_ERROR"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}</pattern>
+        </encoder>
+        <file>${LOG_FILE_ERR}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_ERR}.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>512MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+
+    <!--添加监控日志 -->
+    <appender name="business-log-appender"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <file>${LOG_BUSINESS}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_BUSINESS}.%d{yyyy-MM-dd}.%i
+            </fileNamePattern>
+            <maxFileSize>1024MB</maxFileSize>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="business-log" additivity="false" level="info">
+        <appender-ref ref="business-log-appender"/>
+        <appender-ref ref="CONSOLE" />
+    </logger>
+    <!-- show parameters for hibernate sql 专为 Hibernate 定制 -->
+    <logger name="logging.level.jdbc" level="INFO" />
+    <logger name="logging.level.jdbc.sqlonly" level="INFO" />
+    <logger name="org.springframework" level="INFO" additivity="true" />
+    <Logger name="jdbc.sqlonly" level="info" />
+    <Logger name="jdbc.sqltiming" level="warn" />
+    <Logger name="jdbc.audit" level="warn" />
+    <Logger name="jdbc.resultset" level="warn" />
+    <Logger name="jdbc.resultsettable" level="warn" />
+    <logger name="jdbc.connection" level="warn" />
+    <Logger name="log4jdbc.debug" level="warn" />
+    <Logger name="org.apache.kafka.clients.NetworkClient" level="ERROR" />
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+<!--        <appender-ref ref="LOG_FILE_INFO" />-->
+        <appender-ref ref="LOG_FILE_WARN" />
+        <appender-ref ref="LOG_FILE_ERROR" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsDlMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsDlMapper.xml
new file mode 100644
index 0000000..7d72de0
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsDlMapper.xml
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yszx.mapper.TbYsDlMapper">
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsDl" id="TbYsDlMap">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ysdl" column="ysdl" jdbcType="VARCHAR"/>
+        <result property="yszl" column="yszl" jdbcType="VARCHAR"/>
+        <result property="ysxl" column="ysxl" jdbcType="VARCHAR"/>
+        <result property="ysmc" column="ysmc" jdbcType="VARCHAR"/>
+        <result property="ysjc" column="ysjc" jdbcType="VARCHAR"/>
+        <result property="yswzXzqh" column="yswz_xzqh" jdbcType="VARCHAR"/>
+        <result property="yswzXz" column="yswz_xz" jdbcType="VARCHAR"/>
+        <result property="yswzBc" column="yswz_bc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="dtm" column="dtm" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="znsbbs" column="znsbbs" jdbcType="VARCHAR"/>
+        <result property="lybm" column="lybm" jdbcType="VARCHAR"/>
+        <result property="lyid" column="lyid" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        ,ysdl,yszl,ysxl,ysmc,ysjc,yswz_xzqh,yswz_xz,yswz_bc,jd,wd,zbhash,znsbbs,ssbmid,ssxgajid,sssgajid,
+        lybm,lyid,jsnr,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="zb_sql">
+        ST_ASWKT
+                (zb)
+                as zb,ST_ASWKT(dtm) as dtm
+    </sql>
+
+    <!--修改公安机关要素-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsDl">
+        update tb_ys_dl
+        <set>
+            <if test="ysdl != null and ysdl != ''">
+                ysdl = #{ysdl},
+            </if>
+            <if test="yszl != null and yszl != ''">
+                yszl = #{yszl},
+            </if>
+            <if test="ysxl != null and ysxl != ''">
+                ysxl = #{ysxl},
+            </if>
+            <if test="ysmc != null and ysmc != ''">
+                ysmc = #{ysmc},
+            </if>
+            <if test="ysjc != null and ysjc != ''">
+                ysjc = #{ysjc},
+            </if>
+            <if test="yswzXzqh != null and yswzXzqh != ''">
+                yswz_xzqh = #{yswzXzqh},
+            </if>
+            <if test="yswzXz != null and yswzXz != ''">
+                yswz_xz = #{yswzXz},
+            </if>
+            <if test="yswzBc != null and yswzBc != ''">
+                yswz_bc = #{yswzBc},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="dtm != null">
+                dtm = ST_GEOMFROMTEXT(#{dtm,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="znsbbs != null and znsbbs != ''">
+                znsbbs = #{znsbbs},
+            </if>
+            <if test="lybm != null and lybm != ''">
+                lybm = #{lybm},
+            </if>
+            <if test="lyid != null and lyid != ''">
+                lyid = #{lyid},
+            </if>
+            <if test="jsnr != null and jsnr != ''">
+                jsnr = #{jsnr},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--新增地理要素-->
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsDl">
+        insert into tb_ys_dl
+                (id, ysdl, yszl, ysxl, ysmc, ysjc, yswz_xzqh, yswz_xz, yswz_bc, jd, wd, zb, ssbmid, ssxgajid, sssgajid,
+                 zbhash, dtm, znsbbs, lybm, lyid, jsnr, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,
+                 xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id,
+                 xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                 xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{ysdl}, #{yszl}, #{ysxl}, #{ysmc}, #{ysjc}, #{yswzXzqh}, #{yswzXz}, #{yswzBc}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}), #{ssbmid},
+                #{ssxgajid}, #{sssgajid},
+                #{zbhash},
+                ST_GEOMFROMTEXT(#{dtm,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                #{znsbbs}, #{lybm}, #{lyid}, #{jsnr}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm},
+                #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid},
+                #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--获取地理要素详情-->
+    <select id="getInfoById" resultMap="TbYsDlMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_ys_dl where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_ys_dl where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="dto.ysxl != null and dto.ysxl != ''">
+            and ysxl = #{dto.ysxl}
+        </if>
+        <if test="dto.ysmc != null and dto.ysmc != ''">
+            and ysmc like concat('%',#{dto.ysmc},'%')
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+    </select>
+
+    <!--查询分页-->
+    <select id="getPageList" parameterType="Map" resultMap="TbYsDlMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_dl where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="dto.ysxl != null and dto.ysxl != ''">
+            and ysxl = #{dto.ysxl}
+        </if>
+        <if test="dto.ysmc != null and dto.ysmc != ''">
+            and ysmc like concat('%',#{dto.ysmc},'%')
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询不分页-->
+    <select id="getList" parameterType="Map" resultMap="TbYsDlMap">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_dl where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="dto.ysxl != null and dto.ysxl != ''">
+            and ysxl = #{dto.ysxl}
+        </if>
+        <if test="dto.ysmc != null and dto.ysmc != ''">
+            and ysmc like concat('%',#{dto.ysmc},'%')
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+        order by xt_cjsj desc
+    </select>
+</mapper>
+
+
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsGajgGlbmMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsGajgGlbmMapper.xml
new file mode 100644
index 0000000..d0f5480
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsGajgGlbmMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yszx.mapper.TbYsGajgGlbmMapper">
+
+    <delete id="deleteGlbm">
+        delete from tb_ys_gajg_glbm where gajg_id = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsGajgMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsGajgMapper.xml
new file mode 100644
index 0000000..5e05e12
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsGajgMapper.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yszx.mapper.TbYsGajgMapper">
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsGajg" id="tbYsGajg">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="ysdl" column="ysdl" jdbcType="VARCHAR"/>
+        <result property="yszl" column="yszl" jdbcType="VARCHAR"/>
+        <result property="ysxl" column="ysxl" jdbcType="VARCHAR"/>
+        <result property="gajgmc" column="gajgmc" jdbcType="VARCHAR"/>
+        <result property="gajgjc" column="gajgjc" jdbcType="VARCHAR"/>
+        <result property="wzXzqh" column="wz_xzqh" jdbcType="VARCHAR"/>
+        <result property="wzXz" column="wz_xz" jdbcType="VARCHAR"/>
+        <result property="wzBc" column="wz_bc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="dtm" column="dtm" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dtm1" column="dtm1" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="dtm2" column="dtm2" typeHandler="com.mosty.base.feign.handle.PolygonTypeHandler"/>
+        <result property="lybm" column="lybm" jdbcType="VARCHAR"/>
+        <result property="lyid" column="lyid" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="color" column="color" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+
+
+                        id
+                        ,ysdl,yszl,ysxl,gajgmc,gajgjc,wz_xzqh,wz_xz,wz_bc,jd,wd,ssbmid,ssxgajid,sssgajid,
+                        zbhash,lybm,lyid,jsnr,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                        xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                        xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz, color
+
+
+    </sql>
+
+    <sql id="zb_sql">
+
+
+                        ST_ASWKT
+                                (zb)
+                                as zb,
+                        ST_ASWKT(dtm) as dtm,
+                        ST_ASWKT(dtm1) as dtm1,
+                        ST_ASWKT(dtm2) as dtm2
+
+
+    </sql>
+
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_ys_gajg where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="ysxlList != null and ysxlList.size() != 0">
+            and ysxl in
+            <foreach collection="ysxlList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.gajgmc != null and dto.gajgmc != ''">
+            and gajgmc like concat('%',#{dto.gajgmc},'%')
+        </if>
+
+        <if test="dto.bz != null and dto.bz != ''">
+            and bz like concat('%',#{dto.bz},'%')
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        <!--        ${useSql}-->
+    </select>
+
+    <!--查询分页-->
+    <select id="getListPage" parameterType="Map" resultMap="tbYsGajg">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_gajg where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="ysxlList != null and ysxlList.size() != 0">
+            and ysxl in
+            <foreach collection="ysxlList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.gajgmc != null and dto.gajgmc != ''">
+            and gajgmc like concat('%',#{dto.gajgmc},'%')
+        </if>
+        <if test="dto.bz != null and dto.bz != ''">
+            and bz like concat('%',#{dto.bz},'%')
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <!--        ${useSql}-->
+        order by ysxl desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询不分页-->
+    <select id="getList" parameterType="Map" resultMap="tbYsGajg">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_gajg where xt_sjzt = '1' and xt_scbz = '0'
+        <if test="dto.ysdl != null and dto.ysdl != ''">
+            and ysdl = #{dto.ysdl}
+        </if>
+        <if test="dto.yszl != null and dto.yszl != ''">
+            and yszl = #{dto.yszl}
+        </if>
+        <if test="ysxlList != null and ysxlList.size() != 0">
+            and ysxl in
+            <foreach collection="ysxlList" open="(" separator="," close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%',#{dto.jsnr},'%')
+        </if>
+        <if test="dto.gajgmc != null and dto.gajgmc != ''">
+            and gajgmc like concat('%',#{dto.gajgmc},'%')
+        </if>
+        <if test="dto.bz != null and dto.bz != ''">
+            and bz like concat('%',#{dto.bz},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <!--        ${useSql}-->
+        order by ssbmdm asc
+    </select>
+
+    <!--修改公安机关要素-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsGajg">
+        update tb_ys_gajg
+        <set>
+            <if test="ysdl != null and ysdl != ''">
+                ysdl = #{ysdl},
+            </if>
+            <if test="yszl != null and yszl != ''">
+                yszl = #{yszl},
+            </if>
+            <if test="ysxl != null and ysxl != ''">
+                ysxl = #{ysxl},
+            </if>
+            <if test="gajgmc != null and gajgmc != ''">
+                gajgmc = #{gajgmc},
+            </if>
+            <if test="gajgjc != null and gajgjc != ''">
+                gajgjc = #{gajgjc},
+            </if>
+            <if test="wzXzqh != null and wzXzqh != ''">
+                wz_xzqh = #{wzXzqh},
+            </if>
+            <if test="wzXz != null and wzXz != ''">
+                wz_xz = #{wzXz},
+            </if>
+            <if test="wzBc != null and wzBc != ''">
+                wz_bc = #{wzBc},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="dtm != null">
+                dtm = ST_GEOMFROMTEXT(#{dtm,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="dtm1 != null">
+                dtm1 = ST_GEOMFROMTEXT(#{dtm1,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="dtm2 != null">
+                dtm2 = ST_GEOMFROMTEXT(#{dtm2,typeHandler=com.mosty.base.feign.handle.PolygonTypeHandler}),
+            </if>
+            <if test="lybm != null and lybm != ''">
+                lybm = #{lybm},
+            </if>
+            <if test="lyid != null and lyid != ''">
+                lyid = #{lyid},
+            </if>
+            <if test="jsnr != null and jsnr != ''">
+                jsnr = #{jsnr},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="color != null and color != ''">
+                color = #{color},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--获取公安机关详情-->
+    <select id="getInfoById" resultMap="tbYsGajg">
+        select
+        <include refid="base_column_list"/>,
+        <include refid="zb_sql"/>
+        from tb_ys_gajg where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsGajg">
+
+
+                        insert into tb_ys_gajg
+                                (id, ysdl, yszl, ysxl, gajgmc, gajgjc, wz_xzqh, ssbmid, ssxgajid, sssgajid,
+                                 wz_xz, wz_bc, jd, wd, zb, zbhash, dtm, dtm1, dtm2, lybm, lyid,
+                                 jsnr, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm,
+                                 xt_sjly, xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id,
+                                 xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                                 xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz,color)
+                        values (#{id}, #{ysdl}, #{yszl}, #{ysxl}, #{gajgmc}, #{gajgjc}, #{wzXzqh}, #{ssbmid}, #{ssxgajid}, #{sssgajid},
+                                #{wzXz}, #{wzBc}, #{jd}, #{wd},
+                                ST_GEOMFROMTEXT(#{zb,typeHandler = com.mosty.base.feign.handle.PointTypeHandler}),
+                                #{zbhash},
+                                ST_GEOMFROMTEXT(#{dtm,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                                ST_GEOMFROMTEXT(#{dtm1,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                                ST_GEOMFROMTEXT(#{dtm2,typeHandler = com.mosty.base.feign.handle.PolygonTypeHandler}),
+                                #{lybm}, #{lyid},
+                                #{jsnr}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm},
+                                #{xtSjly}, #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId},
+                                #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid},
+                                #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz}, #{color})
+
+
+    </insert>
+</mapper>
+
+
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsRyBqMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsRyBqMapper.xml
new file mode 100644
index 0000000..f9fdae4
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsRyBqMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yszx.mapper.TbYsRyBqMapper">
+
+    <delete id="deleteByRyId">
+        delete from tb_ys_ry_bq where ryid = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsRyDhMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsRyDhMapper.xml
new file mode 100644
index 0000000..cabd100
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsRyDhMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yszx.mapper.TbYsRyDhMapper">
+    <delete id="deleteByRyId">
+        delete
+        from tb_ys_ry_dh
+        where ryid = #{id}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsRyMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsRyMapper.xml
new file mode 100644
index 0000000..3be1d15
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsRyMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mosty.yszx.mapper.TbYsRyMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsSxtMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsSxtMapper.xml
new file mode 100644
index 0000000..1ab77a1
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsSxtMapper.xml
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yszx.mapper.TbYsSxtMapper">
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsSxt" id="tbYsSxt">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjlyid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="jkdbgbh" column="jkdbgbh" jdbcType="VARCHAR"/>
+        <result property="sbbh" column="sbbh" jdbcType="VARCHAR"/>
+        <result property="sbmc" column="sbmc" jdbcType="VARCHAR"/>
+        <result property="csmc" column="csmc" jdbcType="VARCHAR"/>
+        <result property="ipdz" column="ipdz" jdbcType="VARCHAR"/>
+        <result property="ipv6dz" column="ipv6dz" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="dzmc" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="sblxdm" column="sblxdm" jdbcType="VARCHAR"/>
+        <result property="sjlxdm" column="sjlxdm" jdbcType="VARCHAR"/>
+        <result property="jsfxdm" column="jsfxdm" jdbcType="VARCHAR"/>
+        <result property="jsqysm" column="jsqysm" jdbcType="VARCHAR"/>
+        <result property="sxjwzlxdm" column="sxjwzlxdm" jdbcType="VARCHAR"/>
+        <result property="sxjytdm" column="sxjytdm" jdbcType="VARCHAR"/>
+        <result property="sbzt" column="sbzt" jdbcType="VARCHAR"/>
+        <result property="sblx" column="sblx" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+
+                id
+                ,sjlyid, jkdbgbh,sbbh,sbmc,csmc,ipdz,ipv6dz,jd,wd,xzqhdm,dzmc,sblxdm,sjlxdm,jsfxdm,jsqysm,sxjwzlxdm,sxjytdm,
+                sbzt,sblx,jsnr,ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt, xt_scbz,
+                xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+                xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz,ssbmid,ssxgajid,sssgajid
+
+    </sql>
+
+
+    <!--查询摄像头列表总数-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        and jd is not null and wd is not null
+        <if test="dto.sbbh != null and dto.sbbh != ''">
+            and sbbh like concat('%',#{dto.sbbh},'%')
+        </if>
+        <if test="dto.sbmc != null and dto.sbmc != ''">
+            and sbmc like concat('%',#{dto.sbmc},'%')
+        </if>
+        <if test="dto.sblxdm != null and dto.sblxdm != ''">
+            and sblxdm = #{dto.sblxdm}
+        </if>
+        <if test="dto.sbzt != null and dto.sbzt != ''">
+            and sbzt = #{dto.sbzt}
+        </if>
+        <if test="dto.sblx != null and dto.sblx != ''">
+            and sblx = #{dto.sblx}
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%', #{dto.jsnr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+    </select>
+
+    <!--查询分页-->
+    <select id="getPageList" parameterType="Map" resultMap="tbYsSxt">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        and jd is not null and wd is not null
+        <if test="dto.sbbh != null and dto.sbbh != ''">
+            and sbbh like concat('%',#{dto.sbbh},'%')
+        </if>
+        <if test="dto.sbmc != null and dto.sbmc != ''">
+            and sbmc like concat('%',#{dto.sbmc},'%')
+        </if>
+        <if test="dto.sblxdm != null and dto.sblxdm != ''">
+            and sblxdm = #{dto.sblxdm}
+        </if>
+        <if test="dto.sbzt != null and dto.sbzt != ''">
+            and sbzt = #{dto.sbzt}
+        </if>
+        <if test="dto.sblx != null and dto.sblx != ''">
+            and sblx = #{dto.sblx}
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%', #{dto.jsnr},'%')
+        </if>
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <if test="dto.jd != null and dto.wd != null ">
+            order by distance asc
+        </if>
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询不分页-->
+    <select id="getList" parameterType="Map" resultMap="tbYsSxt">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+        </if>
+        from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        and jd is not null and wd is not null
+        <if test="dto.sbbh != null and dto.sbbh != ''">
+            and sbbh like concat('%',#{dto.sbbh},'%')
+        </if>
+        <if test="dto.sbmc != null and dto.sbmc != ''">
+            and sbmc like concat('%',#{dto.sbmc},'%')
+        </if>
+        <if test="dto.sblxdm != null and dto.sblxdm != ''">
+            and sblxdm = #{dto.sblxdm}
+        </if>
+        <if test="dto.sbzt != null and dto.sbzt != ''">
+            and sbzt = #{dto.sbzt}
+        </if>
+        <if test="dto.sblx != null and dto.sblx != ''">
+            and sblx = #{dto.sblx}
+        </if>
+        <if test="dto.jsnr != null and dto.jsnr != ''">
+            and jsnr like concat('%', #{dto.jsnr},'%')
+        </if>
+
+        <if test="dto.ssbmdm != null and dto.ssbmdm != ''">
+            and ssbmdm like concat(#{dto.ssbmdm},'%')
+        </if>
+
+
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[having distance <= #{dto.radius}]]>
+        </if>
+        <if test="dto.jd != null and dto.wd != null">
+            order by distance asc
+        </if>
+    </select>
+
+    <!--获取公安机关详情-->
+    <select id="getInfoById" resultMap="tbYsSxt">
+        select
+        <include refid="base_column_list"/>
+        from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        and id = #{id}
+    </select>
+
+    <select id="queryBySjlyid" resultMap="tbYsSxt">
+        select
+        <include refid="base_column_list"/>
+        from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        and sjlyid = #{sjlyid} limit 0,1
+    </select>
+
+    <insert id="insertEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsSxt">
+
+                insert into tb_ys_sxt(id, sjlyid, jkdbgbh, sbbh, sbmc, csmc, ipdz, ipv6dz, jd, wd,
+                                    xzqhdm, dzmc, sblxdm, sjlxdm, jsfxdm, jsqysm, sxjwzlxdm, sxjytdm, sbzt, sblx,
+                                      jsnr, ssbm, ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly, xt_sjzt,
+                                      xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr, xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj,
+                                      xt_zhgxrid, xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm,
+                                      bz,ssbmid,ssxgajid,sssgajid)
+                values (#{id}, #{sjlyid}, #{jkdbgbh}, #{sbbh}, #{sbmc}, #{csmc}, #{ipdz}, #{ipv6dz}, #{jd}, #{wd},
+                        #{xzqhdm},
+                        #{dzmc}, #{sblxdm}, #{sjlxdm}, #{jsfxdm}, #{jsqysm}, #{sxjwzlxdm}, #{sxjytdm}, #{sbzt}, #{sblx},
+                        #{jsnr}, #{ssbm}, #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly}, #{xtSjzt},
+                        #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr}, #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip},
+                        #{xtZhgxsj},
+                        #{xtZhgxrid}, #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz},#{ssbmid},#{ssxgajid},#{sssgajid})
+
+    </insert>
+
+    <!--修改公安机关要素-->
+    <update id="updateEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsSxt">
+        update tb_ys_sxt
+        <set>
+            <if test="sjlyid != null and sjlyid != ''">
+                sjlyid = #{sjlyid},
+            </if>
+            <if test="jkdbgbh != null and jkdbgbh != ''">
+                jkdbgbh = #{jkdbgbh},
+            </if>
+            <if test="sbbh != null and sbbh != ''">
+                sbbh = #{sbbh},
+            </if>
+            <if test="sbmc != null and sbmc != ''">
+                sbmc = #{sbmc},
+            </if>
+            <if test="csmc != null and csmc != ''">
+                csmc = #{csmc},
+            </if>
+            <if test="ipdz != null and ipdz != ''">
+                ipdz = #{ipdz},
+            </if>
+            <if test="ipv6dz != null and ipv6dz != ''">
+                ipv6dz = #{ipv6dz},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="dzmc != null and dzmc != ''">
+                dzmc = #{dzmc},
+            </if>
+            <if test="sblxdm != null and sblxdm != ''">
+                sblxdm = #{sblxdm},
+            </if>
+            <if test="sjlxdm != null and sjlxdm != ''">
+                sjlxdm = #{sjlxdm},
+            </if>
+            <if test="jsfxdm != null and jsfxdm != ''">
+                jsfxdm = #{jsfxdm},
+            </if>
+            <if test="jsqysm != null and jsqysm != ''">
+                jsqysm = #{jsqysm},
+            </if>
+            <if test="sxjwzlxdm != null and sxjwzlxdm != ''">
+                sxjwzlxdm = #{sxjwzlxdm},
+            </if>
+            <if test="sxjytdm != null and sxjytdm != ''">
+                sxjytdm = #{sxjytdm},
+            </if>
+            <if test="sbzt != null and sbzt != ''">
+                sbzt = #{sbzt},
+            </if>
+            <if test="sblx != null and sblx != ''">
+                sblx = #{sblx},
+            </if>
+            <if test="jsnr != null and jsnr != ''">
+                jsnr = #{jsnr},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getSjList" parameterType="Map" resultMap="tbYsSxt">
+        select
+        <include refid="base_column_list"/>
+        <if test="jd != null and wd != null ">
+            ,st_distance_sphere(POINT(jd,wd),POINT(#{jd},#{wd})) as distance
+        </if>
+        from tb_ys_sxt where xt_sjzt = '1' and xt_scbz = '0'
+        order by distance asc
+        limit 0,3
+    </select>
+
+    <delete id="deleteAll">
+            delete from tb_ys_sxt
+    </delete>
+</mapper>
+
+
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsXsajMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsXsajMapper.xml
new file mode 100644
index 0000000..e354b69
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsXsajMapper.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yszx.mapper.TbYsXsajMapper">
+
+    <resultMap type="com.mosty.base.model.vo.yszx.TbYsAjVo" id="tbYsAjVo">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjlyid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="ajbh" column="ajbh" jdbcType="VARCHAR"/>
+        <result property="ajmc" column="ajmc" jdbcType="VARCHAR"/>
+        <result property="ajnr" column="ajnr" jdbcType="VARCHAR"/>
+        <result property="farq" column="farq" jdbcType="TIMESTAMP"/>
+        <result property="fasj" column="fasj" jdbcType="TIMESTAMP"/>
+        <result property="ajlb" column="ajlb" jdbcType="VARCHAR"/>
+        <result property="aymc" column="aymc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="dzmc" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+    </resultMap>
+
+    <!--行事案件-->
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsXsaj" id="tbYsXsaj">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjlyid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="ajbh" column="ajbh" jdbcType="VARCHAR"/>
+        <result property="ajmc" column="ajmc" jdbcType="VARCHAR"/>
+        <result property="ajnr" column="ajnr" jdbcType="VARCHAR"/>
+        <result property="farq" column="farq" jdbcType="TIMESTAMP"/>
+        <result property="fasj" column="fasj" jdbcType="TIMESTAMP"/>
+        <result property="ajlb" column="ajlb" jdbcType="VARCHAR"/>
+        <result property="aymc" column="aymc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="dzmc" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        , ajfl, sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="base_column">
+        id
+        , sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="blob_column_List">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+
+    <!--新增行事案件-->
+    <insert id="insertXsaj" parameterType="com.mosty.base.model.entity.yszx.TbYsXsaj">
+        insert into tb_ys_xsaj
+        (id, sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zb, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{sjlyid}, #{ajbh}, #{ajmc}, #{ajnr}, #{farq}, #{fasj},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{ajlb}, #{aymc}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{xzqhdm}, #{dzmc}, #{jsnr}, #{ssbm},
+                #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly},
+                #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid},
+                #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+
+    <!--查询刑事案件详情-->
+    <select id="selectXsAjById" resultMap="tbYsXsaj">
+        select
+        <include refid="base_column"/>
+        from tb_ys_xsaj
+        where id = #{id}
+    </select>
+
+
+    <!--修改行事案件-->
+    <update id="updateXsEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsXsaj">
+        update tb_ys_xsaj
+        <set>
+            <if test="sjlyid != null and sjlyid != ''">
+                sjlyid = #{sjlyid},
+            </if>
+            <if test="ajbh != null and ajbh != ''">
+                ajbh = #{ajbh},
+            </if>
+            <if test="ajmc != null and ajmc != ''">
+                ajmc = #{ajmc},
+            </if>
+            <if test="ajnr != null and ajnr != ''">
+                ajnr = #{ajnr},
+            </if>
+            <if test="farq != null">
+                farq = #{farq},
+            </if>
+            <if test="fasj != null">
+                fasj = #{fasj},
+            </if>
+            <if test="ajlb != null and ajlb != ''">
+                ajlb = #{ajlb},
+            </if>
+            <if test="aymc != null and aymc != ''">
+                aymc = #{aymc},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="dzmc != null and dzmc != ''">
+                dzmc = #{dzmc},
+            </if>
+            <if test="jsnr != null and jsnr != ''">
+                jsnr = #{jsnr},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>
+
+
diff --git a/mosty-yszx/src/main/resources/mapper/TbYsXzajMapper.xml b/mosty-yszx/src/main/resources/mapper/TbYsXzajMapper.xml
new file mode 100644
index 0000000..ab8bcba
--- /dev/null
+++ b/mosty-yszx/src/main/resources/mapper/TbYsXzajMapper.xml
@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mosty.yszx.mapper.TbYsXzajMapper">
+
+    <resultMap type="com.mosty.base.model.vo.yszx.TbYsAjVo" id="tbYsAjVo">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjlyid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="ajbh" column="ajbh" jdbcType="VARCHAR"/>
+        <result property="ajmc" column="ajmc" jdbcType="VARCHAR"/>
+        <result property="ajnr" column="ajnr" jdbcType="VARCHAR"/>
+        <result property="farq" column="farq" jdbcType="TIMESTAMP"/>
+        <result property="fasj" column="fasj" jdbcType="TIMESTAMP"/>
+        <result property="ajlb" column="ajlb" jdbcType="VARCHAR"/>
+        <result property="aymc" column="aymc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="dzmc" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!--行政案件-->
+    <resultMap type="com.mosty.base.model.entity.yszx.TbYsXzaj" id="tbYsXzaj">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="sjlyid" column="sjlyid" jdbcType="VARCHAR"/>
+        <result property="ajbh" column="ajbh" jdbcType="VARCHAR"/>
+        <result property="ajmc" column="ajmc" jdbcType="VARCHAR"/>
+        <result property="ajnr" column="ajnr" jdbcType="VARCHAR"/>
+        <result property="farq" column="farq" jdbcType="TIMESTAMP"/>
+        <result property="fasj" column="fasj" jdbcType="TIMESTAMP"/>
+        <result property="ajlb" column="ajlb" jdbcType="VARCHAR"/>
+        <result property="aymc" column="aymc" jdbcType="VARCHAR"/>
+        <result property="jd" column="jd" jdbcType="NUMERIC"/>
+        <result property="wd" column="wd" jdbcType="NUMERIC"/>
+        <result property="zb" column="zb" typeHandler="com.mosty.base.feign.handle.PointTypeHandler"/>
+        <result property="zbhash" column="zbhash" jdbcType="VARCHAR"/>
+        <result property="xzqhdm" column="xzqhdm" jdbcType="VARCHAR"/>
+        <result property="dzmc" column="dzmc" jdbcType="VARCHAR"/>
+        <result property="jsnr" column="jsnr" jdbcType="VARCHAR"/>
+        <result property="ssbm" column="ssbm" jdbcType="VARCHAR"/>
+        <result property="ssbmdm" column="ssbmdm" jdbcType="VARCHAR"/>
+        <result property="ssxgaj" column="ssxgaj" jdbcType="VARCHAR"/>
+        <result property="ssxgajdm" column="ssxgajdm" jdbcType="VARCHAR"/>
+        <result property="sssgaj" column="sssgaj" jdbcType="VARCHAR"/>
+        <result property="sssgajdm" column="sssgajdm" jdbcType="VARCHAR"/>
+        <result property="xtSjly" column="xt_sjly" jdbcType="VARCHAR"/>
+        <result property="xtSjzt" column="xt_sjzt" jdbcType="VARCHAR"/>
+        <result property="xtScbz" column="xt_scbz" jdbcType="VARCHAR"/>
+        <result property="xtCjip" column="xt_cjip" jdbcType="VARCHAR"/>
+        <result property="xtCjsj" column="xt_cjsj" jdbcType="VARCHAR"/>
+        <result property="xtCjrId" column="xt_cjr_id" jdbcType="VARCHAR"/>
+        <result property="xtCjr" column="xt_cjr" jdbcType="VARCHAR"/>
+        <result property="xtCjbmdm" column="xt_cjbmdm" jdbcType="VARCHAR"/>
+        <result property="xtCjbmmc" column="xt_cjbmmc" jdbcType="VARCHAR"/>
+        <result property="xtZhgxip" column="xt_zhgxip" jdbcType="VARCHAR"/>
+        <result property="xtZhgxsj" column="xt_zhgxsj" jdbcType="VARCHAR"/>
+        <result property="xtZhgxrid" column="xt_zhgxrid" jdbcType="VARCHAR"/>
+        <result property="xtZhgxr" column="xt_zhgxr" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbmdm" column="xt_zhgxbmdm" jdbcType="VARCHAR"/>
+        <result property="xtZhgxbm" column="xt_zhgxbm" jdbcType="VARCHAR"/>
+        <result property="bz" column="bz" jdbcType="VARCHAR"/>
+        <result property="distance" column="distance" jdbcType="NUMERIC"/>
+        <result property="sssgajid" column="sssgajid" jdbcType="VARCHAR"/>
+        <result property="ssxgajid" column="ssxgajid" jdbcType="VARCHAR"/>
+        <result property="ssbmid" column="ssbmid" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="base_column_list">
+        id
+        , ajfl, sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="base_column">
+        id
+        , sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz
+    </sql>
+
+    <sql id="blob_column_List">
+        ST_ASWKT
+        (zb) as zb
+    </sql>
+
+
+    <!--新增行政案件-->
+    <insert id="insertXzaj" parameterType="com.mosty.base.model.entity.yszx.TbYsXzaj">
+        insert into tb_ys_xzaj
+        (id, sjlyid, ajbh, ajmc, ajnr, farq, fasj,ssbmid,ssxgajid,sssgajid,
+         ajlb, aymc, jd, wd, zb, zbhash, xzqhdm, dzmc, jsnr, ssbm,
+         ssbmdm, ssxgaj, ssxgajdm, sssgaj, sssgajdm, xt_sjly,
+         xt_sjzt, xt_scbz, xt_cjip, xt_cjsj, xt_cjr_id, xt_cjr,
+         xt_cjbmdm, xt_cjbmmc, xt_zhgxip, xt_zhgxsj, xt_zhgxrid,
+         xt_zhgxr, xt_zhgxbmdm, xt_zhgxbm, bz)
+        values (#{id}, #{sjlyid}, #{ajbh}, #{ajmc}, #{ajnr}, #{farq}, #{fasj},#{ssbmid},#{ssxgajid},#{sssgajid},
+                #{ajlb}, #{aymc}, #{jd}, #{wd},
+                ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+                #{zbhash}, #{xzqhdm}, #{dzmc}, #{jsnr}, #{ssbm},
+                #{ssbmdm}, #{ssxgaj}, #{ssxgajdm}, #{sssgaj}, #{sssgajdm}, #{xtSjly},
+                #{xtSjzt}, #{xtScbz}, #{xtCjip}, #{xtCjsj}, #{xtCjrId}, #{xtCjr},
+                #{xtCjbmdm}, #{xtCjbmmc}, #{xtZhgxip}, #{xtZhgxsj}, #{xtZhgxrid},
+                #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{bz})
+    </insert>
+
+    <!--查询行政案件详情-->
+    <select id="selectXzAjById" resultMap="tbYsXzaj">
+        select
+        <include refid="base_column"/>
+        from tb_ys_xzaj
+        where id = #{id}
+    </select>
+
+    <!--修改行政案件-->
+    <update id="updateXzEntity" parameterType="com.mosty.base.model.entity.yszx.TbYsXzaj">
+        update tb_ys_xzaj
+        <set>
+            <if test="sjlyid != null and sjlyid != ''">
+                sjlyid = #{sjlyid},
+            </if>
+            <if test="ajbh != null and ajbh != ''">
+                ajbh = #{ajbh},
+            </if>
+            <if test="ajmc != null and ajmc != ''">
+                ajmc = #{ajmc},
+            </if>
+            <if test="ajnr != null and ajnr != ''">
+                ajnr = #{ajnr},
+            </if>
+            <if test="farq != null">
+                farq = #{farq},
+            </if>
+            <if test="fasj != null">
+                fasj = #{fasj},
+            </if>
+            <if test="ajlb != null and ajlb != ''">
+                ajlb = #{ajlb},
+            </if>
+            <if test="aymc != null and aymc != ''">
+                aymc = #{aymc},
+            </if>
+            <if test="jd != null">
+                jd = #{jd},
+            </if>
+            <if test="wd != null">
+                wd = #{wd},
+            </if>
+            <if test="zb != null">
+                zb = ST_GEOMFROMTEXT(#{zb,typeHandler=com.mosty.base.feign.handle.PointTypeHandler}),
+            </if>
+            <if test="zbhash != null and zbhash != ''">
+                zbhash = #{zbhash},
+            </if>
+            <if test="xzqhdm != null and xzqhdm != ''">
+                xzqhdm = #{xzqhdm},
+            </if>
+            <if test="dzmc != null and dzmc != ''">
+                dzmc = #{dzmc},
+            </if>
+            <if test="jsnr != null and jsnr != ''">
+                jsnr = #{jsnr},
+            </if>
+            <if test="ssbm != null and ssbm != ''">
+                ssbm = #{ssbm},
+            </if>
+            <if test="ssbmdm != null and ssbmdm != ''">
+                ssbmdm = #{ssbmdm},
+            </if>
+            <if test="ssxgaj != null and ssxgaj != ''">
+                ssxgaj = #{ssxgaj},
+            </if>
+            <if test="ssxgajdm != null and ssxgajdm != ''">
+                ssxgajdm = #{ssxgajdm},
+            </if>
+            <if test="sssgaj != null and sssgaj != ''">
+                sssgaj = #{sssgaj},
+            </if>
+            <if test="sssgajdm != null and sssgajdm != ''">
+                sssgajdm = #{sssgajdm},
+            </if>
+            <if test="xtSjly != null and xtSjly != ''">
+                xt_sjly = #{xtSjly},
+            </if>
+            <if test="xtSjzt != null and xtSjzt != ''">
+                xt_sjzt = #{xtSjzt},
+            </if>
+            <if test="xtScbz != null and xtScbz != ''">
+                xt_scbz = #{xtScbz},
+            </if>
+            <if test="xtCjip != null and xtCjip != ''">
+                xt_cjip = #{xtCjip},
+            </if>
+            <if test="xtCjsj != null">
+                xt_cjsj = #{xtCjsj},
+            </if>
+            <if test="xtCjrId != null and xtCjrId != ''">
+                xt_cjr_id = #{xtCjrId},
+            </if>
+            <if test="xtCjr != null and xtCjr != ''">
+                xt_cjr = #{xtCjr},
+            </if>
+            <if test="xtCjbmdm != null and xtCjbmdm != ''">
+                xt_cjbmdm = #{xtCjbmdm},
+            </if>
+            <if test="xtCjbmmc != null and xtCjbmmc != ''">
+                xt_cjbmmc = #{xtCjbmmc},
+            </if>
+            <if test="xtZhgxip != null and xtZhgxip != ''">
+                xt_zhgxip = #{xtZhgxip},
+            </if>
+            <if test="xtZhgxsj != null">
+                xt_zhgxsj = #{xtZhgxsj},
+            </if>
+            <if test="xtZhgxrid != null and xtZhgxrid != ''">
+                xt_zhgxrid = #{xtZhgxrid},
+            </if>
+            <if test="xtZhgxr != null and xtZhgxr != ''">
+                xt_zhgxr = #{xtZhgxr},
+            </if>
+            <if test="xtZhgxbmdm != null and xtZhgxbmdm != ''">
+                xt_zhgxbmdm = #{xtZhgxbmdm},
+            </if>
+            <if test="xtZhgxbm != null and xtZhgxbm != ''">
+                xt_zhgxbm = #{xtZhgxbm},
+            </if>
+            <if test="bz != null and bz != ''">
+                bz = #{bz}
+            </if>
+            <if test="ssbmid != null and ssbmid != ''">
+                ssbmid = #{ssbmid},
+            </if>
+            <if test="ssxgajid != null and ssxgajid != ''">
+                ssxgajid = #{ssxgajid},
+            </if>
+            <if test="sssgajid != null and sssgajid != ''">
+                sssgajid = #{sssgajid},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--获取案件总数-->
+    <select id="getCount" resultType="Integer" parameterType="Map">
+        select count(1) from
+        <if test='dto.ajfl == "0"'>
+            (
+            select * from tb_ys_xsaj union all
+            select * from tb_ys_xzaj
+            ) as tb
+        </if>
+        <if test='dto.ajfl == "1"'>
+            tb_ys_xsaj
+        </if>
+        <if test='dto.ajfl == "2"'>
+            tb_ys_xzaj
+        </if>
+        where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.ajmc != null and dto.ajmc != ''">
+            and ajmc like concat('%',#{dto.ajmc},'%')
+        </if>
+        <if test="dto.ajnr != null and dto.ajnr != ''">
+            and ajnr like concat('%',#{dto.ajnr},'%')
+        </if>
+        <if test="dto.ajlb != null and dto.ajlb != ''">
+            and ajlb = #{dto.ajlb}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and endTime != null and endTime != ''">
+            and fasj between #{dto.startTime} and #{endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+    </select>
+
+    <!--分页获取案件列表-->
+    <select id="getList" resultMap="tbYsAjVo" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,distance
+        </if>
+        <if test='dto.ajfl == "0"'>
+            from (
+            select *,1 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xsaj union all
+            select *,2 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xzaj
+            ) as tb
+        </if>
+        <if test='dto.ajfl == "1"'>
+            from (select * ,1 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xsaj) as tb
+        </if>
+        <if test='dto.ajfl == "2"'>
+            from (select * ,2 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xzaj) as tb
+        </if>
+        where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.ajmc != null and dto.ajmc != ''">
+            and ajmc like concat('%',#{dto.ajmc},'%')
+        </if>
+        <if test="dto.ajnr != null and dto.ajnr != ''">
+            and dto.ajnr like concat('%',#{dto.ajnr},'%')
+        </if>
+        <if test="dto.ajlb != null and dto.ajlb != ''">
+            and ajlb = #{dto.ajlb}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and endTime != null and endTime != ''">
+            and fasj between #{dto.startTime} and #{endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+        order by fasj desc
+        limit #{pageIndex},#{pageSize}
+    </select>
+
+    <!--查询案件列表不分页-->
+    <select id="getListAll" resultMap="tbYsAjVo" parameterType="Map">
+        select
+        <include refid="base_column_list"/>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            ,distance
+        </if>
+        <if test='dto.ajfl == "0"'>
+            from (
+            select *,1 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xsaj union all
+            select *,2 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xzaj
+            ) as tb
+        </if>
+        <if test='dto.ajfl == "1"'>
+            from (select * ,1 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xsaj) as tb
+        </if>
+        <if test='dto.ajfl == "2"'>
+            from (select * ,2 as ajfl
+            <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+                ,st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) as distance
+            </if>
+            from tb_ys_xzaj) as tb
+        </if>
+        where xt_scbz = '0' and xt_sjzt = '1'
+        <if test="dto.ajmc != null and dto.ajmc != ''">
+            and ajmc like concat('%',#{dto.ajmc},'%')
+        </if>
+        <if test="dto.ajnr != null and dto.ajnr != ''">
+            and ajnr like concat('%',#{dto.ajnr},'%')
+        </if>
+        <if test="dto.ajlb != null and dto.ajlb != ''">
+            and ajlb = #{dto.ajlb}
+        </if>
+        <if test="dto.startTime != null and dto.startTime != '' and endTime != null and endTime != ''">
+            and fasj between #{dto.startTime} and #{endTime}
+        </if>
+        <if test="dto.jd != null and dto.wd != null and dto.radius != null">
+            <![CDATA[and st_distance_sphere(POINT(jd,wd),POINT(#{dto.jd},#{dto.wd})) <= #{dto.radius}]]>
+        </if>
+        ${useSql}
+        order by fasj desc
+    </select>
+
+    <!--删除案件信息-->
+    <update id="delAj" parameterType="com.mosty.base.model.dto.yszx.TbYsAjDelDto">
+        update
+        <if test='ajfl == "1"'>
+            tb_ys_xsaj
+        </if>
+        <if test='ajfl == "2"'>
+            tb_ys_xzaj
+        </if>
+        set xt_scbz = '1'
+        where id = #{id}
+    </update>
+</mapper>
+
+
diff --git a/mosty-yszx/src/main/resources/rebel.xml b/mosty-yszx/src/main/resources/rebel.xml
new file mode 100644
index 0000000..249551d
--- /dev/null
+++ b/mosty-yszx/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>mosty-yszx</id>
+
+	<classpath>
+		<dir name="E:/project/rs/mosty-dyga-cloud/mosty-yszx/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3a89d2e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.4.RELEASE</version>
+	</parent>
+
+	<groupId>com.mosty</groupId>
+	<artifactId>mosty-dyga-cloud</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0-SNAPSHOT</version>
+	<modules>
+		<module>mosty-base</module>
+		<module>mosty-bkzx</module>
+		<module>mosty-hczx</module>
+		<module>mosty-gateway</module>
+		<module>feign-client-api</module>
+		<module>mosty-jcgl</module>
+		<module>mosty-qwzx</module>
+		<module>mosty-rzzx</module>
+		<module>mosty-sjzx</module>
+		<module>mosty-spxl</module>
+		<module>mosty-wzzx</module>
+		<module>mosty-yjzl</module>
+		<module>mosty-yszx</module>
+		<module>mosty-rwzx</module>
+		<module>mosty-other</module>
+		<module>mosty-websocket</module>
+    </modules>
+	<name>mosty-cloud</name>
+	<description>智羽项目为服务基础框架</description>
+	<properties>
+		<java.version>1.8</java.version>
+		<spring-boot-admin.version>2.2.0</spring-boot-admin.version>
+		<spring-cloud-dependencies.version>Hoxton.SR8</spring-cloud-dependencies.version>
+		<spring-boot-dependencies.version>2.3.2.RELEASE</spring-boot-dependencies.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>de.codecentric</groupId>
+				<artifactId>spring-boot-admin-dependencies</artifactId>
+				<version>${spring-boot-admin.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<!--子项目依赖-->
+			<dependency>
+				<groupId>com.mosty</groupId>
+				<artifactId>mosty-yjzl</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.mosty</groupId>
+				<artifactId>mosty-jcgl</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.mosty</groupId>
+				<artifactId>mosty-base-feign-sdk</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring-boot-dependencies.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud-dependencies.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+</project>